More fixes in Filebrowser.

[redakcja.git] / platforma / settings.py

diff --git a/platforma/settings.py b/platforma/settings.py
index 11c2de3..2faab1b 100755 (executable)
--- a/platforma/settings.py
+++ b/platforma/settings.py
@@ -107,6 +107,7 @@ TEMPLATE_DIRS = (
 # 
 # COMPRESS_CSS_FILTERS = None
 
+
 INSTALLED_APPS = (
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -115,18 +116,30 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'django.contrib.admindocs',
 
+    'django_nose',
+
     'wiki',
-    'piston',
     'sorl.thumbnail',
     'filebrowser',
     'toolbar',
 )
 
+TEST_RUNNER = 'django_nose.run_tests'
+TEST_MODULES = ('wiki', 'toolbar', 'vstorage')
+NOSE_ARGS = (
+    '--tests=' + ','.join(TEST_MODULES),
+    '--cover-package=' + ','.join(TEST_MODULES),
+    '-d',
+    '--with-coverage',
+    '--with-doctest'
+)
+
 
 FILEBROWSER_URL_FILEBROWSER_MEDIA = STATIC_URL + 'filebrowser/'
 FILEBROWSER_DIRECTORY = 'images/'
 FILEBROWSER_ADMIN_VERSIONS = []
 FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'
+FILEBROWSER_DEFAULT_ORDER = "path_relative"
 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
 IMAGE_DIR = 'images'
@@ -145,7 +158,9 @@ log.addHandler(ch)
 
 # Import localsettings file, which may override settings defined here
 try:
+    EXTRA_INSTALLED_APPS = tuple()
     from localsettings import *
+    INSTALLED_APPS += EXTRA_INSTALLED_APPS
 except ImportError:
     pass