Permalink
Browse files

added temlatefiles folder in the media upload folder so that the inst…

…allation script works find. adjusted some settings for the new filebrowser
  • Loading branch information...
1 parent 984a98f commit bab84896fff8fac2212651f4e8f1e4fc984d15db @scaphilo committed Oct 2, 2011
Showing with 6 additions and 2 deletions.
  1. +3 −0 media/uploads/temlatefiles/.directory
  2. +1 −1 settings.py
  3. +2 −1 urls.py
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2010,2,1,16,34,8
+ViewMode=1
View
@@ -90,6 +90,7 @@
INSTALLED_APPS = (
'grappelli.dashboard',
'grappelli',
+ 'filebrowser',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
@@ -100,7 +101,6 @@
'djangoUserExtension',
'crm',
'subscriptions',
- 'filebrowser',
'django.contrib.admin',
'south'
)
View
@@ -3,13 +3,14 @@
from django.conf.urls.defaults import *
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.contrib import admin
+from filebrowser.sites import site
admin.autodiscover()
urlpatterns = patterns('',
(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': '/var/www/koalixcrm/media'}),
(r'^$', 'django.views.generic.simple.redirect_to', {'url': '/admin'}),
(r'^grappelli/', include('grappelli.urls')),
- (r'^admin/filebrowser/', include('filebrowser.urls')),
+ (r'^admin/filebrowser/', include(site.urls)),
(r'^export/quote/(?P<quoteid>\d+)/$', 'crm.views.createQuotePDF'),
(r'^export/purchaseconfirmation/(?P<quoteid>\d+)/$', 'crm.views.createPurchaseConfirmationPDF'),
(r'^export/invoice/(?P<invoiceid>\d+)/$', 'crm.views.createInvoicePDF'),

0 comments on commit bab8489

Please sign in to comment.