diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-12 15:43:15 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:24 +0100 |
| commit | 13b9ef1c26bb89349a15be94db7d01512e270d5a (patch) | |
| tree | bb7c35ca850f60028c576ee42e3fb95db20a64be /archaeological_warehouse | |
| parent | 7e6c628ff9f4d27609efda613b790f87bbeacea1 (diff) | |
| download | Ishtar-13b9ef1c26bb89349a15be94db7d01512e270d5a.tar.bz2 Ishtar-13b9ef1c26bb89349a15be94db7d01512e270d5a.zip | |
Refactor - clean
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/ishtar_menu.py | 30 | ||||
| -rw-r--r-- | archaeological_warehouse/lookups.py | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py index 17acae47a..fe012d214 100644 --- a/archaeological_warehouse/ishtar_menu.py +++ b/archaeological_warehouse/ishtar_menu.py @@ -27,46 +27,46 @@ from . import models MENU_SECTIONS = [ - (80, SectionItem('warehouse', _(u"Warehouse"), + (80, SectionItem('warehouse', _("Warehouse"), profile_restriction='warehouse', css='menu-warehouse', childs=[ - MenuItem('warehouse_search', _(u"Search"), + MenuItem('warehouse_search', _("Search"), model=models.Warehouse, access_controls=['view_warehouse', 'view_own_warehouse']), - MenuItem('warehouse_creation', _(u"Creation"), + MenuItem('warehouse_creation', _("Creation"), model=models.Warehouse, access_controls=['add_warehouse',]), - MenuItem('warehouse_modification', _(u"Modification"), + MenuItem('warehouse_modification', _("Modification"), model=models.Warehouse, access_controls=['change_warehouse',]), - MenuItem('warehouse_deletion', _(u"Deletion"), + MenuItem('warehouse_deletion', _("Deletion"), model=models.Warehouse, access_controls=['change_warehouse',]), SectionItem( - 'containers', _(u"Containers"), + 'containers', _("Containers"), childs=[ - MenuItem('container_search', _(u"Search"), + MenuItem('container_search', _("Search"), model=models.Warehouse, access_controls=['view_container', 'view_own_container']), - MenuItem('container_creation', _(u"Creation"), + MenuItem('container_creation', _("Creation"), model=models.Warehouse, access_controls=['add_container', 'add_own_container']), - MenuItem('container_modification', _(u"Modification"), + MenuItem('container_modification', _("Modification"), model=models.Warehouse, access_controls=['change_container', 'change_own_container']), MenuItem( - 'container-merge', _(u"Automatic merge"), + 'container-merge', _("Automatic merge"), model=models.Container, access_controls=['administrator']), MenuItem( - 'container-manual-merge', _(u"Manual merge"), + 'container-manual-merge', _("Manual merge"), model=models.Container, access_controls=['administrator']), - MenuItem('container_deletion', _(u"Deletion"), + MenuItem('container_deletion', _("Deletion"), model=models.Warehouse, access_controls=['change_container', 'change_own_container']), @@ -74,13 +74,13 @@ MENU_SECTIONS = [ ])) ] """ - MenuItem('warehouse_inventory', _(u"Inventory"), + MenuItem('warehouse_inventory', _("Inventory"), model=models.Warehouse, access_controls=['change_warehouse',]), - MenuItem('warehouse_recording', _(u"Recording"), + MenuItem('warehouse_recording', _("Recording"), model=Treatment, access_controls=['add_treatment', 'add_own_treatment']), - MenuItem('warehouse_lend', _(u"Lending"), + MenuItem('warehouse_lend', _("Lending"), model=Treatment, access_controls=['add_treatment', 'add_own_treatment']), """ diff --git a/archaeological_warehouse/lookups.py b/archaeological_warehouse/lookups.py index f4df88a7d..ea06db3c5 100644 --- a/archaeological_warehouse/lookups.py +++ b/archaeological_warehouse/lookups.py @@ -30,7 +30,7 @@ class ContainerLookup(LookupChannel): return escape(force_text(obj.cached_label)) def format_item_display(self, item): - return u"<span class='ajax-label'>%s</span>" % item.cached_label + return "<span class='ajax-label'>%s</span>" % item.cached_label @register('warehouse') @@ -48,4 +48,4 @@ class WarehouseLookup(LookupChannel): return self.model.objects.filter(query).order_by('name')[:20] def format_item_display(self, item): - return u"<span class='ajax-label'>%s</span>" % item.name + return "<span class='ajax-label'>%s</span>" % item.name |