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 | 2b9de1308724bf0138e783b8c90fd01229d438be (patch) | |
| tree | 9f3126f1d8b5d72ea4892b797017971c01afb89e /ishtar_common | |
| parent | 1b6ea1c1a10b10351351f061b050626a231b128d (diff) | |
| download | Ishtar-2b9de1308724bf0138e783b8c90fd01229d438be.tar.bz2 Ishtar-2b9de1308724bf0138e783b8c90fd01229d438be.zip | |
Search action everywhere (refs #2281)
Diffstat (limited to 'ishtar_common')
| -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 |
3 files changed, 21 insertions, 0 deletions
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)], |