diff options
| author | Dhiru <dhirusingh11@gmail.com> | 2015-03-15 02:36:20 +0530 |
|---|---|---|
| committer | Dhiru <dhirusingh11@gmail.com> | 2015-03-15 02:36:20 +0530 |
| commit | ad36b7572e213b7697b0b41ee9745e7aa2eb2c39 (patch) | |
| tree | f01e220025ba659e718004ae191fc6675dc53839 /gnowsys-ndf/gnowsys_ndf/ndf/urls | |
| parent | 15c7b03111eb506133f4fd57aa94088b3b1fc86b (diff) | |
| download | gnowsys-ad36b7572e213b7697b0b41ee9745e7aa2eb2c39.tar.gz | |
bug fixed on url redirection and horizontal scrolling
Diffstat (limited to 'gnowsys-ndf/gnowsys_ndf/ndf/urls')
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py | 6 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDashboard.py | 2 | ||||
| -rw-r--r-- | gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDesignerDashboard.py | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py index 44c0ef2..17b4cd3 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/__init__.py @@ -23,8 +23,8 @@ admin.autodiscover() urlpatterns = patterns('', (r'^i18n/', include('django.conf.urls.i18n')), (r'^pref_lang/$', include('gnowsys_ndf.ndf.urls.languagepref')), - (r'^admin/data/', include('gnowsys_ndf.ndf.urls.adminDashboard')), - (r'^admin/designer/', include('gnowsys_ndf.ndf.urls.adminDesignerDashboard')), + (r'^admin/data', include('gnowsys_ndf.ndf.urls.adminDashboard')), + (r'^admin/designer', include('gnowsys_ndf.ndf.urls.adminDesignerDashboard')), # --mobwrite-- commented for time being # (r'^raw/(?P<name>.+)/', 'gnowsys_ndf.mobwrite.views.raw'), @@ -36,6 +36,8 @@ urlpatterns = patterns('', # --end of mobwrite (r'^admin/', include(admin.site.urls)), + (r'^admin/data/', include('gnowsys_ndf.ndf.urls.adminDashboard')), + (r'^admin/designer/', include('gnowsys_ndf.ndf.urls.adminDesignerDashboard')), (r'^$', HomeRedirectView.as_view()), (r'^(?P<group_id>[^/]+)/file', include('gnowsys_ndf.ndf.urls.file')), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDashboard.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDashboard.py index 1f92647..6f5869b 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDashboard.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDashboard.py @@ -2,7 +2,7 @@ from django.conf.urls import patterns, url from django.views.generic.base import RedirectView urlpatterns = patterns('gnowsys_ndf.ndf.views.adminDashboard', - url(r'^$', RedirectView.as_view(url='GSystem'), name='adminClass'), + url(r'^$', 'adminDashboardClass', name='adminClass'), url(r'^edit', 'adminDashboardEdit', name='adminDashboardEdit'), url(r'^delete', 'adminDashboardDelete', name='adminDashboardDelete'), url(r'^(?P<class_name>[^/]+)', 'adminDashboardClass', name='adminDashboardClass'), diff --git a/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDesignerDashboard.py b/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDesignerDashboard.py index 236dc73..d7ad646 100644 --- a/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDesignerDashboard.py +++ b/gnowsys-ndf/gnowsys_ndf/ndf/urls/adminDesignerDashboard.py @@ -2,7 +2,7 @@ from django.conf.urls import patterns, url from django.views.generic.base import RedirectView urlpatterns = patterns('gnowsys_ndf.ndf.views.adminDesignerDashboard', - url(r'^$', RedirectView.as_view(url='GSystemType'), name='adminDesigner'), + url(r'^$', 'adminDesignerDashboardClass', name='adminDesigner'), url(r'^(?P<class_name>[^/]+)$', 'adminDesignerDashboardClass', name='adminDesignerDashboardClass'), url(r'(?P<class_name>[^/]+)/create/', 'adminDesignerDashboardClassCreate', name='adminDesignerDashboardClassCreate'), url(r'(?P<class_name>[^/]+)/edit/(?P<node_id>[\w-]+)$', 'adminDesignerDashboardClassCreate', name='adminDesignerDashboardClassEdit'), |