diff options
| -rw-r--r-- | archaeological_context_records/ishtar_menu.py | 7 | ||||
| -rw-r--r-- | archaeological_context_records/urls.py | 4 | ||||
| -rw-r--r-- | archaeological_context_records/views.py | 5 | ||||
| -rw-r--r-- | archaeological_finds/ishtar_menu.py | 5 | ||||
| -rw-r--r-- | archaeological_finds/urls.py | 4 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 4 |
6 files changed, 28 insertions, 1 deletions
diff --git a/archaeological_context_records/ishtar_menu.py b/archaeological_context_records/ishtar_menu.py index 8e8f32218..f8e33d44b 100644 --- a/archaeological_context_records/ishtar_menu.py +++ b/archaeological_context_records/ishtar_menu.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -46,6 +46,11 @@ MENU_SECTIONS = [ 'delete_own_contextrecord']), SectionItem('record_source', _(u"Documentation"), childs=[ + MenuItem('record_source_search', + _(u"Search"), + model=models.ContextRecordSource, + access_controls=['view_contextrecord', + 'view_own_contextrecord']), MenuItem('record_source_creation', _(u"Add"), model=models.ContextRecordSource, diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py index 84560da67..8e218102d 100644 --- a/archaeological_context_records/urls.py +++ b/archaeological_context_records/urls.py @@ -43,6 +43,10 @@ urlpatterns = patterns( url(r'record_deletion/(?P<step>.+)?$', check_rights(['change_contextrecord', 'change_own_contextrecord'])( views.record_deletion_wizard), name='record_deletion'), + url(r'record_source_search/(?P<step>.+)?$', + check_rights(['view_contextrecord', 'view_own_contextrecord'])( + views.record_source_search_wizard), + name='record_source_search'), url(r'record_source_creation/(?P<step>.+)?$', check_rights(['change_contextrecord', 'change_own_contextrecord'])( views.record_source_creation_wizard), diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 4e3dcf7fe..c07dad1df 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -151,6 +151,11 @@ record_deletion_wizard = RecordDeletionWizard.as_view([ label=_(u"Context record deletion"), url_name='record_deletion',) +record_source_search_wizard = SearchWizard.as_view([ + ('selec-record_source_search', RecordSourceFormSelection)], + label=_(u"Context record: source search"), + url_name='record_source_search',) + record_source_creation_wizard = RecordSourceWizard.as_view([ ('selec-record_source_creation', SourceRecordFormSelection), ('source-record_source_creation', SourceForm), diff --git a/archaeological_finds/ishtar_menu.py b/archaeological_finds/ishtar_menu.py index e31db1bc1..f638a60b2 100644 --- a/archaeological_finds/ishtar_menu.py +++ b/archaeological_finds/ishtar_menu.py @@ -79,6 +79,11 @@ MENU_SECTIONS = [ SectionItem( 'find_source', _(u"Documentation"), childs=[ + MenuItem('find_source_search', + _(u"Search"), + model=models.FindSource, + access_controls=['view_find', + 'view_own_find']), MenuItem('find_source_creation', _(u"Creation"), model=models.FindSource, diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py index 4b28b0b2b..300694268 100644 --- a/archaeological_finds/urls.py +++ b/archaeological_finds/urls.py @@ -43,6 +43,10 @@ urlpatterns = patterns( views.find_deletion_wizard), name='find_deletion'), url(r'find_modify/(?P<pk>.+)/$', views.find_modify, name='find_modify'), + url(r'find_source_search/(?P<step>.+)?$', + check_rights(['view_find', 'view_own_find'])( + views.find_source_search_wizard), + name='find_source_search'), url(r'find_source_creation/(?P<step>.+)?$', check_rights(['change_find', 'change_own_find'])( views.find_source_creation_wizard), diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 20f73c321..2d03f6eba 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -143,6 +143,10 @@ find_deletion_wizard = FindDeletionWizard.as_view([ label=_(u"Find deletion"), url_name='find_deletion',) +find_source_search_wizard = SearchWizard.as_view([ + ('selec-find_source_search', FindSourceFormSelection)], + label=_(u"Find: source search"), + url_name='find_source_search',) find_source_creation_wizard = FindSourceWizard.as_view([ ('selec-find_source_creation', SourceFindFormSelection), |