diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-16 03:28:27 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-06 15:48:16 +0200 |
| commit | 17a4b798fac6df1a4c2189044c8265683dbbce9c (patch) | |
| tree | 9f3126f1d8b5d72ea4892b797017971c01afb89e /archaeological_files | |
| parent | d962cfc4de09e28f77433386b98fedfdc258495e (diff) | |
| download | Ishtar-17a4b798fac6df1a4c2189044c8265683dbbce9c.tar.bz2 Ishtar-17a4b798fac6df1a4c2189044c8265683dbbce9c.zip | |
Search action everywhere (refs #2281)
Diffstat (limited to 'archaeological_files')
| -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 |
3 files changed, 14 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', |