diff options
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/ishtar_menu.py | 5 | ||||
| -rw-r--r-- | archaeological_warehouse/migrations/0101_squashed.py | 4 | ||||
| -rw-r--r-- | archaeological_warehouse/migrations/0111_auto_20210225_1039.py | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/models.py | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/urls.py | 3 |
5 files changed, 6 insertions, 10 deletions
diff --git a/archaeological_warehouse/ishtar_menu.py b/archaeological_warehouse/ishtar_menu.py index 9b7cb98cb..65f7838d7 100644 --- a/archaeological_warehouse/ishtar_menu.py +++ b/archaeological_warehouse/ishtar_menu.py @@ -96,7 +96,6 @@ MENU_SECTIONS = [ model=models.Warehouse, access_controls=[ "archaeological_warehouse.add_container", - "archaeological_warehouse.add_own_container" ], ), MenuItem( @@ -140,8 +139,8 @@ MENU_SECTIONS = [ access_controls=['change_warehouse',]), MenuItem('warehouse_recording', _("Recording"), model=Treatment, - access_controls=['add_treatment', 'add_own_treatment']), + access_controls=['add_treatment']), MenuItem('warehouse_lend', _("Lending"), model=Treatment, - access_controls=['add_treatment', 'add_own_treatment']), + access_controls=['add_treatment']), """ diff --git a/archaeological_warehouse/migrations/0101_squashed.py b/archaeological_warehouse/migrations/0101_squashed.py index bb9a3a4b0..0a6472a52 100644 --- a/archaeological_warehouse/migrations/0101_squashed.py +++ b/archaeological_warehouse/migrations/0101_squashed.py @@ -88,7 +88,7 @@ class Migration(migrations.Migration): 'verbose_name': 'Container', 'verbose_name_plural': 'Containers', 'ordering': ('cached_label',), - 'permissions': (('view_own_container', 'Can view own Container'), ('add_own_container', 'Can add own Container'), ('change_own_container', 'Can change own Container'), ('delete_own_container', 'Can delete own Container')), + 'permissions': (('view_own_container', 'Can view own Container'), ('change_own_container', 'Can change own Container'), ('delete_own_container', 'Can delete own Container')), }, bases=(ishtar_common.models.DocumentItem, ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models_common.FixAssociated, ishtar_common.models.ImageContainerModel, ishtar_common.models.OwnPerms, ishtar_common.models.MainItem), @@ -180,7 +180,7 @@ class Migration(migrations.Migration): options={ 'verbose_name': 'Warehouse', 'verbose_name_plural': 'Warehouses', - 'permissions': (('view_own_warehouse', 'Can view own Warehouse'), ('add_own_warehouse', 'Can add own Warehouse'), ('change_own_warehouse', 'Can change own Warehouse'), ('delete_own_warehouse', 'Can delete own Warehouse')), + 'permissions': (('view_own_warehouse', 'Can view own Warehouse'), ('change_own_warehouse', 'Can change own Warehouse'), ('delete_own_warehouse', 'Can delete own Warehouse')), }, bases=(ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, ishtar_common.models.DocumentItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models_common.FixAssociated, ishtar_common.models.ImageContainerModel, ishtar_common.models.DashboardFormItem, ishtar_common.models.OwnPerms, ishtar_common.models.MainItem), diff --git a/archaeological_warehouse/migrations/0111_auto_20210225_1039.py b/archaeological_warehouse/migrations/0111_auto_20210225_1039.py index 42142f01c..232cae761 100644 --- a/archaeological_warehouse/migrations/0111_auto_20210225_1039.py +++ b/archaeological_warehouse/migrations/0111_auto_20210225_1039.py @@ -13,7 +13,7 @@ class Migration(migrations.Migration): operations = [ migrations.AlterModelOptions( name='container', - options={'ordering': ('location', 'index', 'cached_label'), 'permissions': (('view_own_container', 'Can view own Container'), ('add_own_container', 'Can add own Container'), ('change_own_container', 'Can change own Container'), ('delete_own_container', 'Can delete own Container')), 'verbose_name': 'Container', 'verbose_name_plural': 'Containers'}, + options={'ordering': ('location', 'index', 'cached_label'), 'permissions': (('view_own_container', 'Can view own Container'), ('change_own_container', 'Can change own Container'), ('delete_own_container', 'Can delete own Container')), 'verbose_name': 'Container', 'verbose_name_plural': 'Containers'}, ), migrations.AlterField( model_name='container', diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 14711e046..d39e90e97 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -476,7 +476,6 @@ class Warehouse( verbose_name_plural = _("Warehouses") permissions = ( ("view_own_warehouse", "Can view own Warehouse"), - ("add_own_warehouse", "Can add own Warehouse"), ("change_own_warehouse", "Can change own Warehouse"), ("delete_own_warehouse", "Can delete own Warehouse"), ) @@ -1267,7 +1266,6 @@ class Container( unique_together = [("location", "container_type", "parent", "reference")] permissions = ( ("view_own_container", "Can view own Container"), - ("add_own_container", "Can add own Container"), ("change_own_container", "Can change own Container"), ("delete_own_container", "Can delete own Container"), ) diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index 78bc5945c..e5128c81f 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -192,8 +192,7 @@ urlpatterns = [ url( r"^container_creation/(?P<step>.+)?$", check_permissions( - ["archaeological_warehouse.add_container", - "archaeological_warehouse.add_own_container"] + ["archaeological_warehouse.add_container"] )(views.container_creation_wizard), name="container_creation", ), |