diff options
| -rw-r--r-- | archaeological_files/ishtar_menu.py | 6 | ||||
| -rw-r--r-- | archaeological_files/urls.py | 3 | ||||
| -rw-r--r-- | archaeological_files/views.py | 6 | ||||
| -rw-r--r-- | archaeological_operations/ishtar_menu.py | 10 | ||||
| -rw-r--r-- | archaeological_operations/urls.py | 6 | ||||
| -rw-r--r-- | archaeological_operations/views.py | 11 | ||||
| -rw-r--r-- | ishtar_common/ishtar_menu.py | 7 | ||||
| -rw-r--r-- | ishtar_common/urls.py | 4 | ||||
| -rw-r--r-- | ishtar_common/views.py | 10 |
9 files changed, 62 insertions, 1 deletions
diff --git a/archaeological_files/ishtar_menu.py b/archaeological_files/ishtar_menu.py index fc0401115..df4946330 100644 --- a/archaeological_files/ishtar_menu.py +++ b/archaeological_files/ishtar_menu.py @@ -46,9 +46,13 @@ MENU_SECTIONS = [ access_controls=['delete_file', 'delete_own_file']), SectionItem('admin_act_files', _(u"Administrative act"), childs=[ + MenuItem('file_administrativeactfile_search', + _(u"Search"), + model=AdministrativeAct, + access_controls=['change_file', 'change_own_file']), MenuItem('file_administrativeactfile', _(u"Add"), - model=Operation, + model=AdministrativeAct, access_controls=['change_file', 'change_own_file']), MenuItem('file_administrativeactfile_modification', _(u"Modification"), diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py index 694cb1791..f7f5cc7d5 100644 --- a/archaeological_files/urls.py +++ b/archaeological_files/urls.py @@ -23,6 +23,9 @@ import views # forms: urlpatterns = patterns('', + url(r'file_administrativeactfile_search/(?P<step>.+)?$', + views.file_administrativeactfile_search_wizard, + name='file_administrativeactfile_search'), url(r'file_administrativeactfile/(?P<step>.+)?$', views.file_administrativeactfile_wizard, name='file_administrativeactfile'), diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 180e8211a..942ee6ae3 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -188,6 +188,12 @@ file_deletion_wizard = FileDeletionWizard.as_view([ label=_(u"File deletion"), url_name='file_deletion',) +file_administrativeactfile_search_wizard = SearchWizard.as_view([ + ('selec-file_administrativeactfile_search', + AdministrativeActFileFormSelection)], + label=_(u"File: search administrative act"), + url_name='file_administrativeactfile_search',) + file_administrativeactfile_wizard = FileAdministrativeActWizard.as_view([ ('selec-file_administrativeactfile', FileFormSelection), ('administrativeact-file_administrativeactfile', diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py index 237cc84cc..249c86185 100644 --- a/archaeological_operations/ishtar_menu.py +++ b/archaeological_operations/ishtar_menu.py @@ -50,6 +50,11 @@ MENU_SECTIONS = [ 'change_own_operation']), SectionItem('operation_source', _(u"Documentation"), childs=[ + MenuItem('operation_source_search', + _(u"Search"), + model=models.OperationSource, + access_controls=['change_operation', + 'change_own_operation']), MenuItem('operation_source_creation', _(u"Add"), model=models.OperationSource, @@ -96,6 +101,11 @@ if FILES_AVAILABLE: SectionItem('admin_act_operations', _(u"Administrative act"), childs=[ + MenuItem('operation_administrativeactop_search', + _(u"Search"), + model=models.Operation, + access_controls=['change_operation', + 'change_own_operation']), MenuItem('operation_administrativeactop', _(u"Add"), model=models.Operation, diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py index 7a6c3ecbf..f448fd6a7 100644 --- a/archaeological_operations/urls.py +++ b/archaeological_operations/urls.py @@ -23,6 +23,9 @@ import views # forms urlpatterns = patterns('', + url(r'operation_administrativeactop_search/(?P<step>.+)?$', + views.operation_administrativeactop_search_wizard, + name='operation_administrativeactop_search'), url(r'operation_administrativeactop/(?P<step>.+)?$', views.operation_administrativeactop_wizard, name='operation_administrativeactop'), @@ -32,6 +35,9 @@ urlpatterns = patterns('', url(r'operation_administrativeactop_deletion/(?P<step>.+)?$', views.operation_administrativeactop_deletion_wizard, name='operation_administrativeactop_deletion'), + url(r'operation_source_search/(?P<step>.+)?$', + views.operation_source_search_wizard, + name='operation_source_search'), url(r'operation_source_creation/(?P<step>.+)?$', views.operation_source_creation_wizard, name='operation_source_creation'), diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 0a161947b..a8ded32cf 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -276,6 +276,11 @@ operation_deletion_wizard = OperationDeletionWizard.as_view([ label=_(u"Operation deletion"), url_name='operation_deletion',) +operation_source_search_wizard = SearchWizard.as_view([ + ('selec-operation_source_search', OperationSourceFormSelection)], + label=_(u"Operation: source search"), + url_name='operation_source_search',) + operation_source_creation_wizard = OperationSourceWizard.as_view([ ('selec-operation_source_creation', SourceOperationFormSelection), ('source-operation_source_creation',OperationSourceForm), @@ -298,6 +303,12 @@ operation_source_deletion_wizard = OperationSourceDeletionWizard.as_view([ label=_(u"Operation: source deletion"), url_name='operation_source_deletion',) +operation_administrativeactop_search_wizard = SearchWizard.as_view([ + ('general-operation_administrativeactop_search', + AdministrativeActOpeFormSelection)], + label=_(u"Administrative act search"), + url_name='operation_administrativeactop_search',) + operation_administrativeactop_wizard = \ OperationAdministrativeActWizard.as_view([ ('selec-operation_administrativeactop', OperationFormSelection), diff --git a/ishtar_common/ishtar_menu.py b/ishtar_common/ishtar_menu.py index fdfe60448..a26234265 100644 --- a/ishtar_common/ishtar_menu.py +++ b/ishtar_common/ishtar_menu.py @@ -39,6 +39,9 @@ MENU_SECTIONS = [ childs=[ SectionItem('person', _(u"Person"), childs=[ + MenuItem('person_search', _(u"Search"), + model=models.Person, + access_controls=['add_person', 'add_own_person']), MenuItem('person_creation', _(u"Creation"), model=models.Person, access_controls=['add_person', 'add_own_person']), @@ -54,6 +57,10 @@ MENU_SECTIONS = [ ]), SectionItem('organization', _(u"Organization"), childs=[ + MenuItem('organization_search', _(u"Search"), + model=models.Organization, + access_controls=['add_organization', + 'add_own_organization']), MenuItem('organization_creation', _(u"Creation"), model=models.Organization, access_controls=['add_organization', diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index 10a397fe0..13c19096e 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -33,6 +33,8 @@ 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>.+)?$', @@ -43,6 +45,8 @@ urlpatterns = patterns('', 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>.+)?$', diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 7b2fffcef..519332222 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -75,6 +75,11 @@ def index(request): return render_to_response('index.html', dct, context_instance=RequestContext(request)) +person_search_wizard = wizards.SearchWizard.as_view([ + ('general-person_search', forms.PersonFormSelection)], + label=_(u"Person search"), + url_name='person_search',) + person_creation_wizard = wizards.PersonWizard.as_view([ ('identity-person_creation', forms.SimplePersonForm), ('person_type-person_creation', forms.PersonTypeForm), @@ -96,6 +101,11 @@ person_deletion_wizard = wizards.PersonDeletionWizard.as_view([ label=_(u"Person deletion"), url_name='person_deletion',) +organization_search_wizard = wizards.SearchWizard.as_view([ + ('general-organization_search', forms.OrganizationFormSelection)], + label=_(u"Organization search"), + url_name='organization_search',) + organization_creation_wizard = wizards.OrganizationWizard.as_view([ ('identity-organization_creation', forms.OrganizationForm), ('final-organization_creation', FinalForm)], |