From 17a4b798fac6df1a4c2189044c8265683dbbce9c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 16 Feb 2015 03:28:27 +0100 Subject: Search action everywhere (refs #2281) --- archaeological_operations/ishtar_menu.py | 10 ++++++++++ archaeological_operations/urls.py | 6 ++++++ archaeological_operations/views.py | 11 +++++++++++ 3 files changed, 27 insertions(+) (limited to 'archaeological_operations') 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.+)?$', + views.operation_administrativeactop_search_wizard, + name='operation_administrativeactop_search'), url(r'operation_administrativeactop/(?P.+)?$', views.operation_administrativeactop_wizard, name='operation_administrativeactop'), @@ -32,6 +35,9 @@ urlpatterns = patterns('', url(r'operation_administrativeactop_deletion/(?P.+)?$', views.operation_administrativeactop_deletion_wizard, name='operation_administrativeactop_deletion'), + url(r'operation_source_search/(?P.+)?$', + views.operation_source_search_wizard, + name='operation_source_search'), url(r'operation_source_creation/(?P.+)?$', 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), -- cgit v1.2.3