diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-03-10 00:56:54 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-03-10 00:56:54 +0100 |
| commit | 0162c3264015286b3d8972df066f5f8eb9431a86 (patch) | |
| tree | 3d2af439443c53306720a1853d7ebc26c8dd57d6 | |
| parent | 4bb1c7af22c2d4a1fde430f7cda5ad75e193b9dc (diff) | |
| download | Chimère-0162c3264015286b3d8972df066f5f8eb9431a86.tar.bz2 Chimère-0162c3264015286b3d8972df066f5f8eb9431a86.zip | |
Correct bad init
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 2 | ||||
| -rw-r--r-- | docs/install.rst | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index abcb149..1389532 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -97,6 +97,8 @@ def map_params(context): context_data = {'p_checked_categories': settings.CHIMERE_DEFAULT_CATEGORIES} context_data['dynamic_categories'] = 'true' \ if settings.CHIMERE_DYNAMIC_CATEGORIES else 'false' + if 'request' not in context: + return context_data request = context['request'] # Default values if request.GET: diff --git a/docs/install.rst b/docs/install.rst index 05909e7..3bc4b31 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -196,7 +196,7 @@ You will be prompted for the creation of an administrator account (administration can be found at: http://where_is_chimere/admin). Then you have to create tables managed with south:: - ./manage.py migrate -a + ./manage.py migrate The database is set, congratulations! @@ -213,9 +213,9 @@ Install mod_wsgi for apache:: Create and edit a configuration for Chimère:: - sudo mkdir /var/local/django/chimere/apache - sudo cp /var/local/django/chimere/docs/conf/django.wsgi /var/local/django/chimere/apache/django.wsgi - sudo cp /var/local/django/chimere/docs/conf/apache-wsgi.conf /etc/apache2/sites-available/chimere + sudo vim $INSTALL_PATH/chimere/apache/django.wsgi + sudo vim $INSTALL_PATH/chimere/apache/apache-wsgi.conf + sudo cp $INSTALL_PATH/chimere/apache/apache-wsgi.conf /etc/apache2/sites-available/chimere Adapt the files django.wsgi (with the correct sys path) and chimere. |