Add simple view permissions

7 files changed, 14 insertions, 3 deletions

diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index c558587aa..93b37d87e 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -133,6 +133,7 @@ class ContextRecord(BaseHistorizedItem, OwnPerms):
         verbose_name = _(u"Context Record")
         verbose_name_plural = _(u"Context Record")
         permissions = (
+ ("view_contextrecord", ugettext(u"Can view all Context Record")),
  ("view_own_contextrecord", ugettext(u"Can view own Context Record")),
  ("add_own_contextrecord", ugettext(u"Can add own Context Record")),
  ("change_own_contextrecord", ugettext(u"Can change own Context Record")),
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 1bcaa2ced..8f2f513d2 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -106,6 +106,7 @@ class File(BaseHistorizedItem, OwnPerms):
         verbose_name = _(u"Archaeological file")
         verbose_name_plural = _(u"Archaeological files")
         permissions = (
+            ("view_file", ugettext(u"Can view all Archaelogical file")),
             ("view_own_file", ugettext(u"Can view own Archaelogical file")),
             ("add_own_file", ugettext(u"Can add own Archaelogical file")),
             ("change_own_file", ugettext(u"Can change own Archaelogical file")),
diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index ce0df10cf..9c1e72e38 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -55,6 +55,7 @@ class BaseFind(BaseHistorizedItem, OwnPerms):
         verbose_name = _(u"Base find")
         verbose_name_plural = _(u"Base finds")
         permissions = (
+            ("view_basefind", ugettext(u"Can view all Base find")),
             ("view_own_basefind", ugettext(u"Can view own Base find")),
             ("add_own_basefind", ugettext(u"Can add own Base find")),
             ("change_own_basefind", ugettext(u"Can change own Base find")),
@@ -192,6 +193,7 @@ class Find(BaseHistorizedItem, OwnPerms):
         verbose_name = _(u"Find")
         verbose_name_plural = _(u"Finds")
         permissions = (
+            ("view_find", ugettext(u"Can view all Find")),
             ("view_own_find", ugettext(u"Can view own Find")),
             ("add_own_find", ugettext(u"Can add own Find")),
             ("change_own_find", ugettext(u"Can change own Find")),
@@ -251,6 +253,7 @@ class Treatment(BaseHistorizedItem, OwnPerms):
         verbose_name = _(u"Treatment")
         verbose_name_plural = _(u"Treatments")
         permissions = (
+            ("view_treatment", ugettext(u"Can view all Treatment")),
             ("view_own_treatment", ugettext(u"Can view own Treatment")),
             ("add_own_treatment", ugettext(u"Can add own Treatment")),
             ("change_own_treatment", ugettext(u"Can change own Treatment")),
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index fb6b856db..36781249f 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -131,6 +131,7 @@ class Operation(BaseHistorizedItem, OwnPerms):
         verbose_name = _(u"Operation")
         verbose_name_plural = _(u"Operations")
         permissions = (
+            ("view_operation", ugettext(u"Can view all Operation")),
             ("view_own_operation", ugettext(u"Can view own Operation")),
             ("add_own_operation", ugettext(u"Can add own Operation")),
             ("change_own_operation", ugettext(u"Can change own Operation")),
@@ -304,6 +305,8 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms):
         verbose_name = _(u"Administrative act")
         verbose_name_plural = _(u"Administrative acts")
         permissions = (
+            ("view_administrativeact",
+             ugettext(u"Can view all Administrative act")),
             ("view_own_administrativeact",
              ugettext(u"Can view own Administrative act")),
             ("add_own_administrativeact",
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 877d16487..d67a5768c 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -42,6 +42,7 @@ class Warehouse(Address, OwnPerms):
         verbose_name = _(u"Warehouse")
         verbose_name_plural = _(u"Warehouses")
         permissions = (
+            ("view_warehouse", ugettext(u"Can view all Warehouse")),
             ("view_own_warehouse", ugettext(u"Can view own Warehouse")),
             ("add_own_warehouse", ugettext(u"Can add own Warehouse")),
             ("change_own_warehouse", ugettext(u"Can change own Warehouse")),
diff --git a/ishtar_common/management/commands/regenerate_permissions.py b/ishtar_common/management/commands/regenerate_permissions.py
index 81c56e79e..c2af8b353 100644
--- a/ishtar_common/management/commands/regenerate_permissions.py
+++ b/ishtar_common/management/commands/regenerate_permissions.py
@@ -35,5 +35,6 @@ class Command(BaseCommand):
             if not model:
                 continue
             for perm_slug, perm_label in model._meta.permissions:
-                Permission.objects.get_or_create(name=perm_label,
-                                    content_type=ct, codename=perm_slug)
+                Permission.objects.get_or_create(content_type=ct,
+                                    codename=perm_slug,
+                                    defaults={'name':perm_label})
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index cf1448497..1cff9f8f5 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -536,6 +536,7 @@ class Organization(Address, OwnPerms):
         verbose_name = _(u"Organization")
         verbose_name_plural = _(u"Organizations")
         permissions = (
+          ("view_organization", ugettext(u"Can view all Organization")),
           ("view_own_organization", ugettext(u"Can view own Organization")),
           ("add_own_organization", ugettext(u"Can add own Organization")),
           ("change_own_organization", ugettext(u"Can change own Organization")),
@@ -570,7 +571,7 @@ class Person(Address, OwnPerms) :
         verbose_name = _(u"Person")
         verbose_name_plural = _(u"Persons")
         permissions = (
-            ("view_person", ugettext(u"Can view Person")),
+            ("view_person", ugettext(u"Can view all Person")),
             ("view_own_person", ugettext(u"Can view own Person")),
             ("add_own_person", ugettext(u"Can add own Person")),
             ("change_own_person", ugettext(u"Can change own Person")),