matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add from __future__ import unicode_literals, issue #37

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-19 04:06:40 -04:00
parent efbac7300c
commit d59ea3ede2
334 changed files with 2452 additions and 2268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mayan/apps/permissions/models.py
View File

@@ -1,4 +1,4 @@
from __future__ import absolute_import
from __future__ import unicode_literals
import logging
@@ -48,7 +48,7 @@ class PermissionManager(object):
logger.debug('no permission')
raise PermissionDenied(ugettext(u'Insufficient permissions.'))
raise PermissionDenied(ugettext('Insufficient permissions.'))
@classmethod
def get_for_holder(cls, holder):
@@ -93,7 +93,7 @@ class Permission(object):
@property
def uuid(self):
return u'%s.%s' % (self.namespace.name, self.name)
return '%s.%s' % (self.namespace.name, self.name)
@property
def stored_permission(self):
@@ -123,16 +123,16 @@ Permission._default_manager = Permission.objects
class StoredPermission(models.Model):
namespace = models.CharField(max_length=64, verbose_name=_(u'Namespace'))
name = models.CharField(max_length=64, verbose_name=_(u'Name'))
namespace = models.CharField(max_length=64, verbose_name=_('Namespace'))
name = models.CharField(max_length=64, verbose_name=_('Name'))
objects = StoredPermissionManager()
class Meta:
ordering = ('namespace',)
unique_together = ('namespace', 'name')
verbose_name = _(u'Permission')
verbose_name_plural = _(u'Permissions')
verbose_name = _('Permission')
verbose_name_plural = _('Permissions')
def __init__(self, *args, **kwargs):
super(StoredPermission, self).__init__(*args, **kwargs)
@@ -193,7 +193,7 @@ class StoredPermission(models.Model):
class PermissionHolder(models.Model):
permission = models.ForeignKey(StoredPermission, verbose_name=_(u'Permission'))
permission = models.ForeignKey(StoredPermission, verbose_name=_('Permission'))
holder_type = models.ForeignKey(ContentType,
related_name='permission_holder',
limit_choices_to={'model__in': ('user', 'group', 'role')})
@@ -201,21 +201,21 @@ class PermissionHolder(models.Model):
holder_object = generic.GenericForeignKey(ct_field='holder_type', fk_field='holder_id')
class Meta:
verbose_name = _(u'Permission holder')
verbose_name_plural = _(u'Permission holders')
verbose_name = _('Permission holder')
verbose_name_plural = _('Permission holders')
def __unicode__(self):
return u'%s: %s' % (self.holder_type, self.holder_object)
return '%s: %s' % (self.holder_type, self.holder_object)
class Role(models.Model):
name = models.CharField(max_length=64, unique=True)
label = models.CharField(max_length=64, unique=True, verbose_name=_(u'Label'))
label = models.CharField(max_length=64, unique=True, verbose_name=_('Label'))
class Meta:
ordering = ('label',)
verbose_name = _(u'Role')
verbose_name_plural = _(u'Roles')
verbose_name = _('Role')
verbose_name_plural = _('Roles')
def __unicode__(self):
return self.label
@@ -245,7 +245,7 @@ class Role(models.Model):
class RoleMember(models.Model):
role = models.ForeignKey(Role, verbose_name=_(u'Role'))
role = models.ForeignKey(Role, verbose_name=_('Role'))
member_type = models.ForeignKey(
ContentType,
related_name='role_member',
@@ -261,8 +261,8 @@ class RoleMember(models.Model):
objects = RoleMemberManager()
class Meta:
verbose_name = _(u'Role member')
verbose_name_plural = _(u'Role members')
verbose_name = _('Role member')
verbose_name_plural = _('Role members')
def __unicode__(self):
return unicode(self.member_object)