diff options
Diffstat (limited to 'ishtar/ishtar_base/urls.py')
| -rw-r--r-- | ishtar/ishtar_base/urls.py | 159 |
1 files changed, 82 insertions, 77 deletions
diff --git a/ishtar/ishtar_base/urls.py b/ishtar/ishtar_base/urls.py index 8f511cf39..a5b1f5efa 100644 --- a/ishtar/ishtar_base/urls.py +++ b/ishtar/ishtar_base/urls.py @@ -19,9 +19,10 @@ from django.conf.urls.defaults import * -from ishtar.urls import BASE_URL from menus import menu -import forms_main as ishtar_forms +#import forms_main as ishtar_forms + +import views urlpatterns, actions = [], [] @@ -29,102 +30,106 @@ urlpatterns, actions = [], [] # forms urlpatterns = patterns('', # General - url(BASE_URL + r'person_creation/(?P<step>.+)$', - ishtar_forms.person_creation_wizard, name='person_creation'), - url(BASE_URL + r'person_modification/(?P<step>.+)$', + url(r'person_creation/(?P<step>.+)$', + views.person_creation_wizard, name='person_creation_step'), + url(r'person_creation/$', + views.person_creation_wizard, name='person_creation'), + ) +""" + url(r'person_modification/(?P<step>.+)$', ishtar_forms.person_modification_wizard, name='person_modification'), - url(BASE_URL + r'account_management/(?P<step>.+)$', + url(r'account_management/(?P<step>.+)$', ishtar_forms.account_management_wizard, name='account_management'), # Archaelogical files - url(BASE_URL + r'file_search/(?P<step>.+)$', + url(r'file_search/(?P<step>.+)$', ishtar_forms.file_search_wizard, name='file_search'), - url(BASE_URL + r'file_creation/(?P<step>.+)$', + url(r'file_creation/(?P<step>.+)$', ishtar_forms.file_creation_wizard, name='file_creation'), - url(BASE_URL + r'file_modification/(?P<step>.+)$', + url(r'file_modification/(?P<step>.+)$', ishtar_forms.file_modification_wizard, name='file_modification'), - url(BASE_URL + r'file_closing/(?P<step>.+)$', + url(r'file_closing/(?P<step>.+)$', ishtar_forms.file_closing_wizard, name='file_closing'), - url(BASE_URL + r'file_deletion/(?P<step>.+)$', + url(r'file_deletion/(?P<step>.+)$', ishtar_forms.file_deletion_wizard, name='file_deletion'), - url(BASE_URL + r'file_administrativeactfile/(?P<step>.+)$', + url(r'file_administrativeactfile/(?P<step>.+)$', ishtar_forms.file_administrativeactfile_wizard, name='file_administrativeactfile'), - url(BASE_URL + r'file_administrativeactfile_modification/(?P<step>.+)$', + url(r'file_administrativeactfile_modification/(?P<step>.+)$', ishtar_forms.file_administrativeactfile_modification_wizard, name='file_administrativeactfile_modification'), - url(BASE_URL + r'file_administrativeactfile_deletion/(?P<step>.+)$', + url(r'file_administrativeactfile_deletion/(?P<step>.+)$', ishtar_forms.file_administrativeactfile_deletion_wizard, name='file_administrativeactfile_deletion'), # Operations - url(BASE_URL + r'operation_search/(?P<step>.+)$', + url(r'operation_search/(?P<step>.+)$', ishtar_forms.operation_search_wizard, name='operation_search'), - url(BASE_URL + r'operation_creation/(?P<step>.+)$', + url(r'operation_creation/(?P<step>.+)$', ishtar_forms.operation_creation_wizard, name='operation_creation'), - url(BASE_URL + r'operation_modification/(?P<step>.+)$', + url(r'operation_modification/(?P<step>.+)$', ishtar_forms.operation_modification_wizard, name='operation_modification'), - url(BASE_URL + r'operation_closing/(?P<step>.+)$', + url(r'operation_closing/(?P<step>.+)$', ishtar_forms.operation_closing_wizard, name='operation_closing'), - url(BASE_URL + r'operation_deletion/(?P<step>.+)$', + url(r'operation_deletion/(?P<step>.+)$', ishtar_forms.operation_deletion_wizard, name='operation_deletion'), - url(BASE_URL + r'operation_administrativeactop/(?P<step>.+)$', + url(r'operation_administrativeactop/(?P<step>.+)$', ishtar_forms.operation_administrativeactop_wizard, name='operation_administrativeactop'), - url(BASE_URL + r'operation_administrativeactop_modification/(?P<step>.+)$', + url(r'operation_administrativeactop_modification/(?P<step>.+)$', ishtar_forms.operation_administrativeactop_modification_wizard, name='operation_administrativeactop_modification'), - url(BASE_URL + r'operation_administrativeactop_deletion/(?P<step>.+)$', + url(r'operation_administrativeactop_deletion/(?P<step>.+)$', ishtar_forms.operation_administrativeactop_deletion_wizard, name='operation_administrativeactop_deletion'), - url(BASE_URL + r'operation_source_creation/(?P<step>.+)$', + url(r'operation_source_creation/(?P<step>.+)$', ishtar_forms.operation_source_creation_wizard, name='operation_source_creation'), - url(BASE_URL + r'operation_source_modification/(?P<step>.+)$', + url(r'operation_source_modification/(?P<step>.+)$', ishtar_forms.operation_source_modification_wizard, name='operation_source_modification'), - url(BASE_URL + r'operation_source_deletion/(?P<step>.+)$', + url(r'operation_source_deletion/(?P<step>.+)$', ishtar_forms.operation_source_deletion_wizard, name='operation_source_deletion'), # Context records - url(BASE_URL + r'record_search/(?P<step>.+)$', + url(r'record_search/(?P<step>.+)$', ishtar_forms.record_search_wizard, name='record_search'), - url(BASE_URL + r'record_creation/(?P<step>.+)$', + url(r'record_creation/(?P<step>.+)$', ishtar_forms.record_creation_wizard, name='record_creation'), - url(BASE_URL + r'record_modification/(?P<step>.+)$', + url(r'record_modification/(?P<step>.+)$', ishtar_forms.record_modification_wizard, name='record_modification'), - url(BASE_URL + r'record_deletion/(?P<step>.+)$', + url(r'record_deletion/(?P<step>.+)$', ishtar_forms.record_deletion_wizard, name='record_deletion'), - url(BASE_URL + r'record_source_creation/(?P<step>.+)$', + url(r'record_source_creation/(?P<step>.+)$', ishtar_forms.record_source_creation_wizard, name='record_source_creation'), - url(BASE_URL + r'record_source_modification/(?P<step>.+)$', + url(r'record_source_modification/(?P<step>.+)$', ishtar_forms.record_source_modification_wizard, name='record_source_modification'), - url(BASE_URL + r'record_source_deletion/(?P<step>.+)$', + url(r'record_source_deletion/(?P<step>.+)$', ishtar_forms.record_source_deletion_wizard, name='record_source_deletion'), # Finds - url(BASE_URL + r'item_search/(?P<step>.+)$', + url(r'item_search/(?P<step>.+)$', ishtar_forms.item_search_wizard, name='item_search'), - url(BASE_URL + r'item_creation/(?P<step>.+)$', + url(r'item_creation/(?P<step>.+)$', ishtar_forms.item_creation_wizard, name='item_creation'), - url(BASE_URL + r'item_modification/(?P<step>.+)$', + url(r'item_modification/(?P<step>.+)$', ishtar_forms.item_modification_wizard, name='item_modification'), - url(BASE_URL + r'item_source_creation/(?P<step>.+)$', + url(r'item_source_creation/(?P<step>.+)$', ishtar_forms.item_source_creation_wizard, name='item_source_creation'), - url(BASE_URL + r'item_source_modification/(?P<step>.+)$', + url(r'item_source_modification/(?P<step>.+)$', ishtar_forms.item_source_modification_wizard, name='item_source_modification'), - url(BASE_URL + r'item_source_deletion/(?P<step>.+)$', + url(r'item_source_deletion/(?P<step>.+)$', ishtar_forms.item_source_deletion_wizard, name='item_source_deletion'), # Treatments - url(BASE_URL + r'treatment_creation/(?P<step>.+)$', + url(r'treatment_creation/(?P<step>.+)$', ishtar_forms.treatment_creation_wizard, name='treatment_creation'), - url(BASE_URL + r'warehouse_packaging/(?P<step>.+)$', + url(r'warehouse_packaging/(?P<step>.+)$', ishtar_forms.warehouse_packaging_wizard, name='warehouse_packaging'), - ) + )""" for section in menu.childs: for menu_item in section.childs: if hasattr(menu_item, 'childs'): @@ -137,82 +142,82 @@ actions = r"|".join(actions) # other views urlpatterns += patterns('ishtar.ishtar_base.views', # General - url(BASE_URL + r'(?P<action_slug>' + actions + r')/$', 'action', + url(r'(?P<action_slug>' + actions + r')/$', 'action', name='action'), - url(BASE_URL + r'new-person/(?P<parent_name>.+)?/$', + url(r'new-person/(?P<parent_name>.+)?/$', 'new_person', name='new-person'), - url(BASE_URL + r'autocomplete-person/([0-9_]+)?$', 'autocomplete_person', + url(r'autocomplete-person/([0-9_]+)?$', 'autocomplete_person', name='autocomplete-person'), - url(BASE_URL + r'autocomplete-town/$', 'autocomplete_town', + url(r'autocomplete-town/$', 'autocomplete_town', name='autocomplete-town'), - url(BASE_URL + r'new-author/(?P<parent_name>.+)?/$', + url(r'new-author/(?P<parent_name>.+)?/$', 'new_author', name='new-author'), - url(BASE_URL + r'autocomplete-author/$', 'autocomplete_author', + url(r'autocomplete-author/$', 'autocomplete_author', name='autocomplete-author'), - url(BASE_URL + r'new-organization/(?P<parent_name>.+)?/$', + url(r'new-organization/(?P<parent_name>.+)?/$', 'new_organization', name='new-organization'), - url(BASE_URL + r'autocomplete-organization/([0-9_]+)?$', + url(r'autocomplete-organization/([0-9_]+)?$', 'autocomplete_organization', name='autocomplete-organization'), - url(BASE_URL + r'new-warehouse/(?P<parent_name>.+)?/$', + url(r'new-warehouse/(?P<parent_name>.+)?/$', 'new_warehouse', name='new-warehouse'), - url(BASE_URL + r'autocomplete-warehouse/$', 'autocomplete_warehouse', + url(r'autocomplete-warehouse/$', 'autocomplete_warehouse', name='autocomplete-warehouse'), # Archaelogical files - url(BASE_URL + r'autocomplete-file/$', 'autocomplete_file', + url(r'autocomplete-file/$', 'autocomplete_file', name='autocomplete-file'), - url(BASE_URL + r'get-file/(?P<type>.+)?$', 'get_file', + url(r'get-file/(?P<type>.+)?$', 'get_file', name='get-file'), - url(BASE_URL + r'get-file-full/(?P<type>.+)?$', 'get_file', + url(r'get-file-full/(?P<type>.+)?$', 'get_file', name='get-file-full', kwargs={'full':True}), - url(BASE_URL + r'get-administrativeactfile/(?P<type>.+)?$', + url(r'get-administrativeactfile/(?P<type>.+)?$', 'get_administrativeactfile', name='get-administrativeactfile'), - url(BASE_URL + r'show-file/(?P<pk>.+)?/(?P<type>.+)?$', 'show_file', + url(r'show-file/(?P<pk>.+)?/(?P<type>.+)?$', 'show_file', name='show-file'), - url(BASE_URL + r'show-historized-file/(?P<pk>.+)?/(?P<date>.+)?$', + url(r'show-historized-file/(?P<pk>.+)?/(?P<date>.+)?$', 'show_file', name='show-historized-file'), - url(BASE_URL + r'revert-file/(?P<pk>.+)/(?P<date>.+)$', + url(r'revert-file/(?P<pk>.+)/(?P<date>.+)$', 'revert_file', name='revert-file'), # Operations - url(BASE_URL + r'autocomplete-operation/$', 'autocomplete_operation', + url(r'autocomplete-operation/$', 'autocomplete_operation', name='autocomplete-operation'), - url(BASE_URL + r'get-operation/(?P<type>.+)?$', 'get_operation', + url(r'get-operation/(?P<type>.+)?$', 'get_operation', name='get-operation'), - url(BASE_URL + r'get-operation-full/(?P<type>.+)?$', 'get_operation', + url(r'get-operation-full/(?P<type>.+)?$', 'get_operation', name='get-operation-full', kwargs={'full':True}), - url(BASE_URL + r'get-available-operation-code/(?P<year>.+)?$', + url(r'get-available-operation-code/(?P<year>.+)?$', 'get_available_operation_code', name='get_available_operation_code'), - url(BASE_URL + r'revert-operation/(?P<pk>.+)/(?P<date>.+)$', + url(r'revert-operation/(?P<pk>.+)/(?P<date>.+)$', 'revert_operation', name='revert-operation'), - url(BASE_URL + r'show-operation/(?P<pk>.+)?/(?P<type>.+)?$', + url(r'show-operation/(?P<pk>.+)?/(?P<type>.+)?$', 'show_operation', name='show-operation'), - url(BASE_URL + r'get-administrativeactop/(?P<type>.+)?$', + url(r'get-administrativeactop/(?P<type>.+)?$', 'get_administrativeactop', name='get-administrativeactop'), - url(BASE_URL + r'get-operationsource/(?P<type>.+)?$', + url(r'get-operationsource/(?P<type>.+)?$', 'get_operationsource', name='get-operationsource'), # Context records - url(BASE_URL + r'show-contextrecord/(?P<pk>.+)?/(?P<type>.+)?$', + url(r'show-contextrecord/(?P<pk>.+)?/(?P<type>.+)?$', 'show_contextrecord', name='show-contextrecord'), - url(BASE_URL + r'get-contextrecord/(?P<type>.+)?$', 'get_contextrecord', + url(r'get-contextrecord/(?P<type>.+)?$', 'get_contextrecord', name='get-contextrecord'), - url(BASE_URL + r'get-contextrecord-full/(?P<type>.+)?$', + url(r'get-contextrecord-full/(?P<type>.+)?$', 'get_contextrecord', name='get-contextrecord-full', kwargs={'full':True}), - url(BASE_URL + r'get-contexrecordsource/(?P<type>.+)?$', + url(r'get-contexrecordsource/(?P<type>.+)?$', 'get_contextrecordsource', name='get-contextrecordsource'), # Finds - url(BASE_URL + r'update-current-item/$', 'update_current_item', + url(r'update-current-item/$', 'update_current_item', name='update-current-item'), - url(BASE_URL + r'get-item/(?P<type>.+)?$', 'get_archaeologicalitem', + url(r'get-item/(?P<type>.+)?$', 'get_archaeologicalitem', name='get-item'), - url(BASE_URL + r'get-item-full/(?P<type>.+)?$', 'get_archaeologicalitem', + url(r'get-item-full/(?P<type>.+)?$', 'get_archaeologicalitem', name='get-item-full', kwargs={'full':True}), - url(BASE_URL + r'get-itemsource/(?P<type>.+)?$', + url(r'get-itemsource/(?P<type>.+)?$', 'get_itemsource', name='get-itemsource'), - url(BASE_URL + r'get-container/$', 'get_container', + url(r'get-container/$', 'get_container', name='get-container'), # Treatments - url(BASE_URL + r'autocomplete-container/?$', + url(r'autocomplete-container/?$', 'autocomplete_container', name='autocomplete-container'), - url(BASE_URL + r'new-container/(?P<parent_name>.+)?/$', + url(r'new-container/(?P<parent_name>.+)?/$', 'new_container', name='new-container'), ) |