diff options
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/ishtar_menu.py | 14 | ||||
| -rw-r--r-- | archaeological_warehouse/urls.py | 37 |
2 files changed, 28 insertions, 23 deletions
diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py index 7cb287d63..3551fab00 100644 --- a/archaeological_warehouse/ishtar_menu.py +++ b/archaeological_warehouse/ishtar_menu.py @@ -22,17 +22,17 @@ from django.utils.translation import ugettext_lazy as _ from ishtar_common.menu_base import SectionItem, MenuItem from archaeological_finds.models import Treatment -import models + +# be carreful: each access_controls must be relevant with check_rights in urls MENU_SECTIONS = [ (60, SectionItem('find_management', _(u"Find"), - childs=[ - MenuItem('warehouse_packaging', _(u"Packaging"), - model=Treatment, - access_controls=['add_treatment', 'add_own_treatment']), - ]) - ), + childs=[ + MenuItem('warehouse_packaging', _(u"Packaging"), + model=Treatment, + access_controls=['add_treatment', 'add_own_treatment']), + ])), ] """ (60, SectionItem('warehouse', _(u"Warehouse"), diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index 2ae27c279..58f594bcd 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -19,25 +19,30 @@ from django.conf.urls.defaults import * +# from ishtar_common.wizards import check_rights import views +# be carreful: each check_rights must be relevant with ishtar_menu + # forms -urlpatterns = patterns('', - #url(r'treatment_creation/(?P<step>.+)?$', - # views.treatment_creation_wizard, name='treatment_creation'), - url(r'warehouse_packaging/(?P<step>.+)?$', - views.warehouse_packaging_wizard, name='warehouse_packaging'), +urlpatterns = patterns( + '', + # url(r'treatment_creation/(?P<step>.+)?$', + # views.treatment_creation_wizard, name='treatment_creation'), + url(r'warehouse_packaging/(?P<step>.+)?$', + views.warehouse_packaging_wizard, name='warehouse_packaging'), ) -urlpatterns += patterns('archaeological_warehouse.views', - url(r'new-warehouse/(?P<parent_name>.+)?/$', - 'new_warehouse', name='new-warehouse'), - url(r'autocomplete-warehouse/$', 'autocomplete_warehouse', - name='autocomplete-warehouse'), - url(r'new-container/(?P<parent_name>.+)?/$', - 'new_container', name='new-container'), - url(r'get-container/$', 'get_container', - name='get-container'), - url(r'autocomplete-container/?$', - 'autocomplete_container', name='autocomplete-container'), +urlpatterns += patterns( + 'archaeological_warehouse.views', + url(r'new-warehouse/(?P<parent_name>.+)?/$', + 'new_warehouse', name='new-warehouse'), + url(r'autocomplete-warehouse/$', 'autocomplete_warehouse', + name='autocomplete-warehouse'), + url(r'new-container/(?P<parent_name>.+)?/$', + 'new_container', name='new-container'), + url(r'get-container/$', 'get_container', + name='get-container'), + url(r'autocomplete-container/?$', + 'autocomplete_container', name='autocomplete-container'), ) |