diff options
| -rw-r--r-- | archaeological_context_records/models.py | 14 | ||||
| -rw-r--r-- | archaeological_files/models.py | 14 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 30 | ||||
| -rw-r--r-- | archaeological_finds/models_treatments.py | 46 | ||||
| -rw-r--r-- | archaeological_operations/models.py | 32 | ||||
| -rw-r--r-- | archaeological_warehouse/models.py | 10 | ||||
| -rw-r--r-- | ishtar_common/models.py | 37 |
7 files changed, 85 insertions, 98 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index f2b649a67..483d77883 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -278,15 +278,11 @@ class ContextRecord(BulkUpdatedItem, BaseHistorizedItem, ImageModel, OwnPerms, verbose_name = _(u"Context Record") verbose_name_plural = _(u"Context Record") permissions = ( - ("view_contextrecord", ugettext(u"Can view all Context Records")), - ("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")), - ("delete_own_contextrecord", - ugettext(u"Can delete own Context Record")), + ("view_contextrecord", u"Can view all Context Records"), + ("view_own_contextrecord", u"Can view own Context Record"), + ("add_own_contextrecord", u"Can add own Context Record"), + ("change_own_contextrecord", u"Can change own Context Record"), + ("delete_own_contextrecord", u"Can delete own Context Record"), ) ordering = ('cached_label',) diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 2a4bcb0aa..e9882040c 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -220,14 +220,12 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, verbose_name = _(u"Archaeological file") verbose_name_plural = _(u"Archaeological files") permissions = ( - ("view_file", ugettext(u"Can view all Archaeological files")), - ("view_own_file", ugettext(u"Can view own Archaeological file")), - ("add_own_file", ugettext(u"Can add own Archaeological file")), - ("change_own_file", - ugettext(u"Can change own Archaeological file")), - ("delete_own_file", - ugettext(u"Can delete own Archaeological file")), - ("close_file", ugettext(u"Can close File")), + ("view_file", u"Can view all Archaeological files"), + ("view_own_file", u"Can view own Archaeological file"), + ("add_own_file", u"Can add own Archaeological file"), + ("change_own_file", u"Can change own Archaeological file"), + ("delete_own_file", u"Can delete own Archaeological file"), + ("close_file", u"Can close File"), ) ordering = ('cached_label',) diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index aa79c2b32..c8e0ef8e2 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -199,11 +199,11 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms): verbose_name = _(u"Base find") verbose_name_plural = _(u"Base finds") permissions = ( - ("view_basefind", ugettext(u"Can view all Base finds")), - ("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")), - ("delete_own_basefind", ugettext(u"Can delete own Base find")), + ("view_basefind", u"Can view all Base finds"), + ("view_own_basefind", u"Can view own Base find"), + ("add_own_basefind", u"Can add own Base find"), + ("change_own_basefind", u"Can change own Base find"), + ("delete_own_basefind", u"Can delete own Base find"), ) def __unicode__(self): @@ -708,11 +708,11 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel, verbose_name = _(u"Find") verbose_name_plural = _(u"Finds") permissions = ( - ("view_find", ugettext(u"Can view all Finds")), - ("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")), - ("delete_own_find", ugettext(u"Can delete own Find")), + ("view_find", u"Can view all Finds"), + ("view_own_find", u"Can view own Find"), + ("add_own_find", u"Can add own Find"), + ("change_own_find", u"Can change own Find"), + ("delete_own_find", u"Can delete own Find"), ) ordering = ('cached_label',) @@ -1153,15 +1153,15 @@ class FindSource(Source): verbose_name_plural = _(u"Find documentations") permissions = ( ("view_findsource", - ugettext(u"Can view all Find sources")), + u"Can view all Find sources"), ("view_own_findsource", - ugettext(u"Can view own Find source")), + u"Can view own Find source"), ("add_own_findsource", - ugettext(u"Can add own Find source")), + u"Can add own Find source"), ("change_own_findsource", - ugettext(u"Can change own Find source")), + u"Can change own Find source"), ("delete_own_findsource", - ugettext(u"Can delete own Find source")), + u"Can delete own Find source"), ) find = models.ForeignKey(Find, verbose_name=_(u"Find"), related_name="source") diff --git a/archaeological_finds/models_treatments.py b/archaeological_finds/models_treatments.py index cfde9b036..d1b1afd4b 100644 --- a/archaeological_finds/models_treatments.py +++ b/archaeological_finds/models_treatments.py @@ -148,11 +148,11 @@ class Treatment(DashboardFormItem, ValueGetter, BaseHistorizedItem, verbose_name_plural = _(u"Treatments") unique_together = ('year', 'index') permissions = ( - ("view_treatment", ugettext(u"Can view all Treatments")), - ("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")), - ("delete_own_treatment", ugettext(u"Can delete own Treatment")), + ("view_treatment", u"Can view all Treatments"), + ("view_own_treatment", u"Can view own Treatment"), + ("add_own_treatment", u"Can add own Treatment"), + ("change_own_treatment", u"Can change own Treatment"), + ("delete_own_treatment", u"Can delete own Treatment"), ) def __unicode__(self): @@ -516,21 +516,21 @@ class TreatmentFile(DashboardFormItem, ClosedItem, BaseHistorizedItem, unique_together = ('year', 'index') permissions = ( ("view_filetreatment", - ugettext(u"Can view all Treatment requests")), + u"Can view all Treatment requests"), ("add_filetreatment", - ugettext(u"Can add Treatment request")), + u"Can add Treatment request"), ("change_filetreatment", - ugettext(u"Can change Treatment request")), + u"Can change Treatment request"), ("delete_filetreatment", - ugettext(u"Can delete Treatment request")), + u"Can delete Treatment request"), ("view_own_filetreatment", - ugettext(u"Can view own Treatment request")), + u"Can view own Treatment request"), ("add_own_filetreatment", - ugettext(u"Can add own Treatment request")), + u"Can add own Treatment request"), ("change_own_filetreatment", - ugettext(u"Can change own Treatment request")), + u"Can change own Treatment request"), ("delete_own_filetreatment", - ugettext(u"Can delete own Treatment request")), + u"Can delete own Treatment request"), ) ordering = ('cached_label',) @@ -596,15 +596,15 @@ class TreatmentSource(Source): verbose_name_plural = _(u"Treament documentations") permissions = ( ("view_treatmentsource", - ugettext(u"Can view all Treatment sources")), + u"Can view all Treatment sources"), ("view_own_treatmentsource", - ugettext(u"Can view own Treatment source")), + u"Can view own Treatment source"), ("add_own_treatmentsource", - ugettext(u"Can add own Treatment source")), + u"Can add own Treatment source"), ("change_own_treatmentsource", - ugettext(u"Can change own Treatment source")), + u"Can change own Treatment source"), ("delete_own_treatmentsource", - ugettext(u"Can delete own Treatment source")), + u"Can delete own Treatment source"), ) @property @@ -626,15 +626,15 @@ class TreatmentFileSource(Source): verbose_name_plural = _(u"Treatment request documentations") permissions = ( ("view_filetreatmentsource", - ugettext(u"Can view Treatment request source")), + u"Can view Treatment request source"), ("view_own_filetreatmentsource", - ugettext(u"Can view own Treatment request source")), + u"Can view own Treatment request source"), ("add_own_filetreatmentsource", - ugettext(u"Can add own Treatment request source")), + u"Can add own Treatment request source"), ("change_own_filetreatmentsource", - ugettext(u"Can change own Treatment request source")), + u"Can change own Treatment request source"), ("delete_own_filetreatmentsource", - ugettext(u"Can delete own Treatment request source")), + u"Can delete own Treatment request source"), ) @property diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index b982e7d45..12773f495 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -95,15 +95,15 @@ class ArchaeologicalSite(BaseHistorizedItem): verbose_name_plural = _(u"Archaeological sites") permissions = ( ("view_archaeologicalsite", - ugettext(u"Can view all Archaeological sites")), + u"Can view all Archaeological sites"), ("view_own_archaeologicalsite", - ugettext(u"Can view own Archaeological site")), + u"Can view own Archaeological site"), ("add_own_archaeologicalsite", - ugettext(u"Can add own Archaeological site")), + u"Can add own Archaeological site"), ("change_own_archaeologicalsite", - ugettext(u"Can change own Archaeological site")), + u"Can change own Archaeological site"), ("delete_own_archaeologicalsite", - ugettext(u"Can delete own Archaeological site")), + u"Can delete own Archaeological site"), ) def __unicode__(self): @@ -372,12 +372,12 @@ class Operation(ClosedItem, BaseHistorizedItem, ImageModel, OwnPerms, verbose_name = _(u"Operation") verbose_name_plural = _(u"Operations") permissions = ( - ("view_operation", ugettext(u"Can view all Operations")), - ("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")), - ("delete_own_operation", ugettext(u"Can delete own Operation")), - ("close_operation", ugettext(u"Can close Operation")), + ("view_operation", u"Can view all Operations"), + ("view_own_operation", u"Can view own Operation"), + ("add_own_operation", u"Can add own Operation"), + ("change_own_operation", u"Can change own Operation"), + ("delete_own_operation", u"Can delete own Operation"), + ("close_operation", u"Can close Operation"), ) ordering = ('cached_label',) @@ -1080,15 +1080,15 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter): verbose_name_plural = _(u"Administrative acts") permissions = ( ("view_administrativeact", - ugettext(u"Can view all Administrative acts")), + u"Can view all Administrative acts"), ("view_own_administrativeact", - ugettext(u"Can view own Administrative act")), + u"Can view own Administrative act"), ("add_own_administrativeact", - ugettext(u"Can add own Administrative act")), + u"Can add own Administrative act"), ("change_own_administrativeact", - ugettext(u"Can change own Administrative act")), + u"Can change own Administrative act"), ("delete_own_administrativeact", - ugettext(u"Can delete own Administrative act")), + u"Can delete own Administrative act"), ) def __unicode__(self): diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index c8f50987e..35e5536fa 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -65,11 +65,11 @@ class Warehouse(Address, DashboardFormItem, OwnPerms): verbose_name = _(u"Warehouse") verbose_name_plural = _(u"Warehouses") permissions = ( - ("view_warehouse", ugettext(u"Can view all Warehouses")), - ("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")), - ("delete_own_warehouse", ugettext(u"Can delete own Warehouse")), + ("view_warehouse", u"Can view all Warehouses"), + ("view_own_warehouse", u"Can view own Warehouse"), + ("add_own_warehouse", u"Can add own Warehouse"), + ("change_own_warehouse", u"Can change own Warehouse"), + ("delete_own_warehouse", u"Can delete own Warehouse"), ) def __unicode__(self): diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 0277ddefb..caf9be26c 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2598,13 +2598,11 @@ class Organization(Address, Merge, OwnPerms, ValueGetter): verbose_name = _(u"Organization") verbose_name_plural = _(u"Organizations") permissions = ( - ("view_organization", ugettext(u"Can view all Organizations")), - ("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")), - ("delete_own_organization", - ugettext(u"Can delete own Organization")), + ("view_organization", u"Can view all Organizations"), + ("view_own_organization", u"Can view own Organization"), + ("add_own_organization", u"Can add own Organization"), + ("change_own_organization", u"Can change own Organization"), + ("delete_own_organization", u"Can delete own Organization"), ) def simple_lbl(self): @@ -2715,11 +2713,11 @@ class Person(Address, Merge, OwnPerms, ValueGetter): verbose_name = _(u"Person") verbose_name_plural = _(u"Persons") permissions = ( - ("view_person", ugettext(u"Can view all Persons")), - ("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")), - ("delete_own_person", ugettext(u"Can delete own Person")), + ("view_person", u"Can view all Persons"), + ("view_own_person", u"Can view own Person"), + ("add_own_person", u"Can add own Person"), + ("change_own_person", u"Can change own Person"), + ("delete_own_person", u"Can delete own Person"), ) @property @@ -2983,16 +2981,11 @@ class Author(models.Model): verbose_name_plural = _(u"Authors") ordering = ('author_type__order', 'person__name') permissions = ( - ("view_author", - ugettext(u"Can view all Authors")), - ("view_own_author", - ugettext(u"Can view own Author")), - ("add_own_author", - ugettext(u"Can add own Author")), - ("change_own_author", - ugettext(u"Can change own Author")), - ("delete_own_author", - ugettext(u"Can delete own Author")), + ("view_author", u"Can view all Authors"), + ("view_own_author", u"Can view own Author"), + ("add_own_author", u"Can add own Author"), + ("change_own_author", u"Can change own Author"), + ("delete_own_author", u"Can delete own Author"), ) def __unicode__(self): |