diff options
| -rw-r--r-- | .gitignore | 11 | ||||
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | servo/models/common.py | 2 | ||||
| -rw-r--r-- | settings.py | 16 |
4 files changed, 19 insertions, 15 deletions
@@ -1,9 +1,12 @@ *.log *.pot *.pyc -uploads -docs +src +uploads/attachments/* +uploads/devices/* +uploads/return_labels/* +uploads/settings/* +uploads/products/* +backups/* local_settings.py local_rules.json -backups/* -src
\ No newline at end of file @@ -55,3 +55,8 @@ For testing, you can run Servo without any extra setup: cd my_servo_folder python ./manage.py runserver + + +Documentation +============= +End-user documentation for the system is available [here](https://docs.servoapp.com). diff --git a/servo/models/common.py b/servo/models/common.py index 4338405..76d9ffd 100644 --- a/servo/models/common.py +++ b/servo/models/common.py @@ -171,7 +171,7 @@ class Event(BaseItem): def save(self, *args, **kwargs): saved = super(Event, self).save(*args, **kwargs) - if settings.ENABLE_RULES: + if settings.ENABLE_RULES is True: from servo.tasks import apply_rules apply_rules.delay(self) diff --git a/settings.py b/settings.py index 71a3cea..ae1aa80 100644 --- a/settings.py +++ b/settings.py @@ -80,12 +80,6 @@ MEDIA_URL = '/files/' # Don't put anything in this directory yourself; store your static files # in apps' "static/" subdirectories and in STATICFILES_DIRS. # Example: "/home/media/media.lawrence.com/static/" -#STATIC_ROOT = os.path.join(PROJECT_DIR, 'static') - -# URL prefix for static files. -# Example: "http://media.lawrence.com/static/" -STATIC_URL = '/static/' - STATIC_ROOT = os.path.dirname(os.path.join(BASE_DIR, 'static')) # Additional locations of static files @@ -93,6 +87,10 @@ STATICFILES_DIRS = ( 'static', ) +# URL prefix for static files. +# Example: "http://media.lawrence.com/static/" +STATIC_URL = '/static/' + MESSAGE_STORAGE = 'django.contrib.messages.storage.fallback.FallbackStorage' # List of finder classes that know how to find static files in @@ -108,7 +106,6 @@ STATICFILES_FINDERS = ( TEMPLATE_LOADERS = ( 'django.template.loaders.app_directories.Loader', 'django.template.loaders.filesystem.Loader', - #'django.template.loaders.eggs.Loader', ) MIDDLEWARE_CLASSES = ( @@ -120,12 +117,12 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.messages.middleware.MessageMiddleware', 'servo.lib.middleware.LoginRequiredMiddleware', 'servo.lib.middleware.TimezoneMiddleware', - # Uncomment the next line for simple clickjacking protection: 'django.middleware.common.BrokenLinkEmailsMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) ROOT_URLCONF = 'servo.urls.default' +SESSION_SERIALIZER = 'servo.lib.utils.SessionSerializer' # Python dotted path to the WSGI application used by Django's runserver. WSGI_APPLICATION = 'wsgi.application' @@ -239,9 +236,8 @@ REST_FRAMEWORK = { ) } -ENABLE_RULES = True +ENABLE_RULES = False TIMEZONE = 'Europe/Helsinki' -SESSION_SERIALIZER = 'servo.lib.utils.SessionSerializer' from local_settings import * |