summaryrefslogtreecommitdiff
path: root/ishtar_common/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/urls.py')
-rw-r--r--ishtar_common/urls.py23
1 files changed, 23 insertions, 0 deletions
diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py
index 5e6cfce73..ac3e0c248 100644
--- a/ishtar_common/urls.py
+++ b/ishtar_common/urls.py
@@ -33,12 +33,20 @@ 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>.+)?$',
@@ -46,6 +54,16 @@ urlpatterns = patterns('',
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/$', views.NewImportView.as_view(), name='new_import'),
@@ -84,8 +102,12 @@ urlpatterns += patterns('ishtar_common.views',
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>[^/]+)/)?$',
@@ -105,6 +127,7 @@ urlpatterns += patterns('ishtar_common.views',
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'),
)