diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/management/commands/regenerate_permissions.py | 5 | ||||
| -rw-r--r-- | ishtar_common/models.py | 3 |
2 files changed, 5 insertions, 3 deletions
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")), |