Archaeological files: change planning service management

1 files changed, 98 insertions, 90 deletions

diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index bce968b51..eb0fe7ac2 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -18,7 +18,7 @@
 # See the file COPYING for details.
 
 from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import patterns, include, url
 from django.conf.urls.static import static
 
 from menus import menu
@@ -29,53 +29,54 @@ urlpatterns, actions = [], []
 
 
 # forms
-urlpatterns = patterns('',
-       # internationalization
-       url(r'^i18n/', include('django.conf.urls.i18n')),
-       # General
-       url(r'person_search/(?P<step>.+)?$',
-           views.person_search_wizard, name='person_search'),
-       url(r'person_creation/(?P<step>.+)?$',
-           views.person_creation_wizard, name='person_creation'),
-       url(r'person_modification/(?P<step>.+)?$',
-           views.person_modification_wizard, name='person_modification'),
-       url(r'person_deletion/(?P<step>.+)?$',
-           views.person_deletion_wizard, name='person_deletion'),
-       url(r'^person-edit/$',
-           views.PersonCreate.as_view(), name='person_create'),
-       url(r'^person-edit/(?P<pk>\d+)$',
-           views.PersonEdit.as_view(), name='person_edit'),
-       url(r'organization_search/(?P<step>.+)?$',
-           views.organization_search_wizard, name='organization_search'),
-       url(r'organization_creation/(?P<step>.+)?$',
-           views.organization_creation_wizard, name='organization_creation'),
-       url(r'organization_modification/(?P<step>.+)?$',
-           views.organization_modification_wizard,
-           name='organization_modification'),
-       url(r'organization_deletion/(?P<step>.+)?$',
-           views.organization_deletion_wizard, name='organization_deletion'),
-       url(r'organization-edit/$',
-           views.OrganizationCreate.as_view(), name='organization_create'),
-       url(r'organization-edit/(?P<pk>\d+)$',
-           views.OrganizationEdit.as_view(), name='organization_edit'),
-       url(r'organization-person-edit/$',
-           views.OrganizationPersonCreate.as_view(),
-           name='organization_person_create'),
-       url(r'organization-person-edit/(?P<pk>\d+)$',
-           views.OrganizationPersonEdit.as_view(),
-           name='organization_person_edit'),
-       url(r'account_management/(?P<step>.+)?$',
-           views.account_management_wizard, name='account_management'),
-       url(r'^import-new/$', views.NewImportView.as_view(), name='new_import'),
-       url(r'^import-list/$', views.ImportListView.as_view(),
-           name='current_imports'),
-       url(r'^import-list-old/$', views.ImportOldListView.as_view(),
-           name='old_imports'),
-       url(r'^import-delete/(?P<pk>[0-9]+)/$',
-           views.ImportDeleteView.as_view(), name='import_delete'),
-       url(r'^import-link-unmatched/(?P<pk>[0-9]+)/$',
-           views.ImportLinkView.as_view(), name='import_link_unmatched'),
-       )
+urlpatterns = patterns(
+    '',
+    # internationalization
+    url(r'^i18n/', include('django.conf.urls.i18n')),
+    # General
+    url(r'person_search/(?P<step>.+)?$',
+        views.person_search_wizard, name='person_search'),
+    url(r'person_creation/(?P<step>.+)?$',
+        views.person_creation_wizard, name='person_creation'),
+    url(r'person_modification/(?P<step>.+)?$',
+        views.person_modification_wizard, name='person_modification'),
+    url(r'person_deletion/(?P<step>.+)?$',
+        views.person_deletion_wizard, name='person_deletion'),
+    url(r'^person-edit/$',
+        views.PersonCreate.as_view(), name='person_create'),
+    url(r'^person-edit/(?P<pk>\d+)$',
+        views.PersonEdit.as_view(), name='person_edit'),
+    url(r'organization_search/(?P<step>.+)?$',
+        views.organization_search_wizard, name='organization_search'),
+    url(r'organization_creation/(?P<step>.+)?$',
+        views.organization_creation_wizard, name='organization_creation'),
+    url(r'organization_modification/(?P<step>.+)?$',
+        views.organization_modification_wizard,
+        name='organization_modification'),
+    url(r'organization_deletion/(?P<step>.+)?$',
+        views.organization_deletion_wizard, name='organization_deletion'),
+    url(r'organization-edit/$',
+        views.OrganizationCreate.as_view(), name='organization_create'),
+    url(r'organization-edit/(?P<pk>\d+)$',
+        views.OrganizationEdit.as_view(), name='organization_edit'),
+    url(r'organization-person-edit/$',
+        views.OrganizationPersonCreate.as_view(),
+        name='organization_person_create'),
+    url(r'organization-person-edit/(?P<pk>\d+)$',
+        views.OrganizationPersonEdit.as_view(),
+        name='organization_person_edit'),
+    url(r'account_management/(?P<step>.+)?$',
+        views.account_management_wizard, name='account_management'),
+    url(r'^import-new/$', views.NewImportView.as_view(), name='new_import'),
+    url(r'^import-list/$', views.ImportListView.as_view(),
+        name='current_imports'),
+    url(r'^import-list-old/$', views.ImportOldListView.as_view(),
+        name='old_imports'),
+    url(r'^import-delete/(?P<pk>[0-9]+)/$',
+        views.ImportDeleteView.as_view(), name='import_delete'),
+    url(r'^import-link-unmatched/(?P<pk>[0-9]+)/$',
+        views.ImportLinkView.as_view(), name='import_link_unmatched'),
+)
 for section in menu.childs:
     for menu_item in section.childs:
         if hasattr(menu_item, 'childs'):
@@ -86,50 +87,57 @@ for section in menu.childs:
 actions = r"|".join(actions)
 
 # other views
-urlpatterns += patterns('ishtar_common.views',
-     # General
-     url(r'dashboard-main/$', 'dashboard_main',
-           name='dashboard-main'),
-     url(r'dashboard-main/(?P<item_name>[a-z-]+)/$', 'dashboard_main_detail',
-           name='dashboard-main-detail'),
-     url(r'update-current-item/$', 'update_current_item',
-           name='update-current-item'),
-     url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
-           'new_person', name='new-person'),
-     url(r'autocomplete-person(?:/([0-9_]+))?/(user)?$', 'autocomplete_person',
-           name='autocomplete-person'),
-     url(r'get-person/(?P<type>.+)?$', 'get_person',
-           name='get-person'),
-     url(r'show-person(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-           'show_person', name='show-person'),
-     url(r'department-by-state/(?P<state_id>.+)?$', 'department_by_state',
-           name='department-by-state'),
-     url(r'autocomplete-town/?$', 'autocomplete_town',
-           name='autocomplete-town'),
-     url(r'autocomplete-advanced-town/(?P<department_id>[0-9]+[ABab]?)?$',
+urlpatterns += patterns(
+    'ishtar_common.views',
+    # General
+    url(r'dashboard-main/$', 'dashboard_main',
+        name='dashboard-main'),
+    url(r'dashboard-main/(?P<item_name>[a-z-]+)/$', 'dashboard_main_detail',
+        name='dashboard-main-detail'),
+    url(r'update-current-item/$', 'update_current_item',
+        name='update-current-item'),
+    url(r'new-person/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
+        'new_person', name='new-person'),
+    url(r'new-person-noorga/'
+        r'(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
+        'new_person_noorga', name='new-person-noorga'),
+    url(r'autocomplete-person(?:/([0-9_]+))?(?:/([0-9_]*))?/(user)?$',
+        'autocomplete_person', name='autocomplete-person'),
+    url(r'get-person/(?P<type>.+)?$', 'get_person',
+        name='get-person'),
+    url(r'show-person(?:/(?P<pk>.+))?/(?P<type>.+)?$',
+        'show_person', name='show-person'),
+    url(r'department-by-state/(?P<state_id>.+)?$', 'department_by_state',
+        name='department-by-state'),
+    url(r'autocomplete-town/?$', 'autocomplete_town',
+        name='autocomplete-town'),
+    url(r'autocomplete-advanced-town/(?P<department_id>[0-9]+[ABab]?)?$',
         'autocomplete_advanced_town', name='autocomplete-advanced-town'),
-     url(r'autocomplete-department/?$', 'autocomplete_department',
-           name='autocomplete-department'),
-     url(r'new-author/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
-           'new_author', name='new-author'),
-     url(r'autocomplete-author/$', 'autocomplete_author',
-           name='autocomplete-author'),
-     url(r'new-organization/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
-           'new_organization', name='new-organization'),
-     url(r'get-organization/(?P<type>.+)?$', 'get_organization',
-           name='get-organization'),
-     url(r'show-organization(?:/(?P<pk>.+))?/(?P<type>.+)?$',
-           'show_organization', name='show-organization'),
-     url(r'autocomplete-organization/([0-9_]+)?$',
-           'autocomplete_organization', name='autocomplete-organization'),
-     url(r'admin-globalvar/', views.GlobalVarEdit.as_view(),
+    url(r'autocomplete-department/?$', 'autocomplete_department',
+        name='autocomplete-department'),
+    url(r'new-author/(?:(?P<parent_name>[^/]+)/)?(?:(?P<limits>[^/]+)/)?$',
+        'new_author', name='new-author'),
+    url(r'autocomplete-author/$', 'autocomplete_author',
+        name='autocomplete-author'),
+    url(r'new-organization/(?:(?P<parent_name>[^/]+)/)?'
+        r'(?:(?P<limits>[^/]+)/)?$',
+        'new_organization', name='new-organization'),
+    url(r'get-organization/(?P<type>.+)?$', 'get_organization',
+        name='get-organization'),
+    url(r'show-organization(?:/(?P<pk>.+))?/(?P<type>.+)?$',
+        'show_organization', name='show-organization'),
+    url(r'autocomplete-organization/([0-9_]+)?$',
+        'autocomplete_organization', name='autocomplete-organization'),
+    url(r'admin-globalvar/', views.GlobalVarEdit.as_view(),
         name='admin-globalvar'),
-     url(r'person_merge/(?:(?P<page>\d+)/)?$', 'person_merge', name='person_merge'),
-     url(r'organization_merge/(?:(?P<page>\d+)/)?$', 'organization_merge',
-         name='organization_merge'),
-     url(r'reset/$', 'reset_wizards', name='reset_wizards'),
-     url(r'(?P<action_slug>' + actions + r')/$', 'action', name='action'),
+    url(r'person_merge/(?:(?P<page>\d+)/)?$', 'person_merge',
+        name='person_merge'),
+    url(r'organization_merge/(?:(?P<page>\d+)/)?$', 'organization_merge',
+        name='organization_merge'),
+    url(r'reset/$', 'reset_wizards', name='reset_wizards'),
+    url(r'(?P<action_slug>' + actions + r')/$', 'action', name='action'),
 )
 
 if settings.DEBUG:
-    urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+    urlpatterns += static(settings.STATIC_URL,
+                          document_root=settings.STATIC_ROOT)