user.get_profile()->user.profile
This commit is contained in:
parent
3e8f28ff47
commit
1cc795995d
27 changed files with 72 additions and 70 deletions
|
|
@ -98,7 +98,7 @@ def parseCondition(condition, user, owner=None):
|
|||
if (not exclude and op == '=' or op in ('$', '^')) and v == '':
|
||||
return Q()
|
||||
elif k == 'filename' and (user.is_anonymous() or \
|
||||
not user.get_profile().capability('canSeeMedia')):
|
||||
not user.profile.capability('canSeeMedia')):
|
||||
return Q(id=0)
|
||||
elif k == 'oshash':
|
||||
return Q(files__oshash=v)
|
||||
|
|
@ -117,7 +117,7 @@ def parseCondition(condition, user, owner=None):
|
|||
q = ~q
|
||||
return q
|
||||
elif k in ('canplayvideo', 'canplayclips'):
|
||||
level = user.is_anonymous() and 'guest' or user.get_profile().get_level()
|
||||
level = user.is_anonymous() and 'guest' or user.profile.get_level()
|
||||
allowed_level = settings.CONFIG['capabilities'][{
|
||||
'canplayvideo': 'canPlayVideo',
|
||||
'canplayclips': 'canPlayClips'
|
||||
|
|
@ -326,7 +326,7 @@ class ItemManager(Manager):
|
|||
rendered_q = Q(rendered=True)
|
||||
#users can see public items, there own items and items of there groups
|
||||
else:
|
||||
level = user.get_profile().get_level()
|
||||
level = user.profile.get_level()
|
||||
allowed_level = settings.CONFIG['capabilities']['canSeeItem'][level]
|
||||
q = Q(level__lte=allowed_level)|Q(user=user)
|
||||
rendered_q = Q(rendered=True)|Q(user=user)
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ class Item(models.Model):
|
|||
if user.is_anonymous():
|
||||
level = 'guest'
|
||||
else:
|
||||
level = user.get_profile().get_level()
|
||||
level = user.profile.get_level()
|
||||
editable = self.editable(user)
|
||||
if editable:
|
||||
return True
|
||||
|
|
@ -220,7 +220,7 @@ class Item(models.Model):
|
|||
def editable(self, user):
|
||||
if user.is_anonymous():
|
||||
return False
|
||||
if user.get_profile().capability('canEditMetadata') == True or \
|
||||
if user.profile.capability('canEditMetadata') == True or \
|
||||
user.is_staff or \
|
||||
self.user == user or \
|
||||
self.groups.filter(id__in=user.groups.all()).count() > 0:
|
||||
|
|
@ -346,7 +346,7 @@ class Item(models.Model):
|
|||
update_ids = False
|
||||
if not self.id:
|
||||
if self.user:
|
||||
self.level = settings.CONFIG['rightsLevel'][self.user.get_profile().get_level()]
|
||||
self.level = settings.CONFIG['rightsLevel'][self.user.profile.get_level()]
|
||||
else:
|
||||
self.level = settings.CONFIG['rightsLevel']['member']
|
||||
if not self.public_id:
|
||||
|
|
@ -1139,7 +1139,7 @@ class Item(models.Model):
|
|||
|
||||
def get_files(self, user):
|
||||
files = self.files.all().select_related()
|
||||
if user.get_profile().get_level() != 'admin':
|
||||
if user.profile.get_level() != 'admin':
|
||||
files = files.filter(instances__volume__user=user)
|
||||
return [f.json() for f in files]
|
||||
|
||||
|
|
@ -1779,7 +1779,7 @@ class Description(models.Model):
|
|||
|
||||
|
||||
class AnnotationSequence(models.Model):
|
||||
item = models.ForeignKey('Item', related_name='_annotation_sequence', unique=True)
|
||||
item = models.OneToOneField('Item', related_name='_annotation_sequence')
|
||||
value = models.BigIntegerField(default=1)
|
||||
|
||||
@classmethod
|
||||
|
|
|
|||
|
|
@ -504,7 +504,7 @@ def add(request, data):
|
|||
notes: To allow for this, set config option `itemRequiresVideo` to false.
|
||||
see: edit, find, get, lookup, remove, upload
|
||||
'''
|
||||
if not request.user.get_profile().capability('canAddItems'):
|
||||
if not request.user.profile.capability('canAddItems'):
|
||||
response = json_response(status=403, text='permission denied')
|
||||
else:
|
||||
data['title'] = data.get('title', 'Untitled')
|
||||
|
|
@ -542,13 +542,13 @@ def edit(request, data):
|
|||
if item.editable(request.user):
|
||||
response = json_response(status=200, text='ok')
|
||||
if 'rightslevel' in data:
|
||||
if request.user.get_profile().capability('canEditRightsLevel') == True:
|
||||
if request.user.profile.capability('canEditRightsLevel') == True:
|
||||
item.level = int(data['rightslevel'])
|
||||
else:
|
||||
response = json_response(status=403, text='permission denied')
|
||||
del data['rightslevel']
|
||||
if 'user' in data:
|
||||
if request.user.get_profile().get_level() in ('admin', 'staff') and \
|
||||
if request.user.profile.get_level() in ('admin', 'staff') and \
|
||||
models.User.objects.filter(username=data['user']).exists():
|
||||
new_user = models.User.objects.get(username=data['user'])
|
||||
if new_user != item.user:
|
||||
|
|
@ -556,7 +556,7 @@ def edit(request, data):
|
|||
update_clips = True
|
||||
del data['user']
|
||||
if 'groups' in data:
|
||||
if not request.user.get_profile().capability('canManageUsers'):
|
||||
if not request.user.profile.capability('canManageUsers'):
|
||||
# Users wihtout canManageUsers can only add/remove groups they are not in
|
||||
groups = set([g.name for g in item.groups.all()])
|
||||
user_groups = set([g.name for g in request.user.groups.all()])
|
||||
|
|
@ -588,7 +588,7 @@ def remove(request, data):
|
|||
response = json_response({})
|
||||
item = get_object_or_404_json(models.Item, public_id=data['id'])
|
||||
user = request.user
|
||||
if user.get_profile().capability('canRemoveItems') == True or \
|
||||
if user.profile.capability('canRemoveItems') == True or \
|
||||
user.is_staff or \
|
||||
item.user == user or \
|
||||
item.groups.filter(id__in=user.groups.all()).count() > 0:
|
||||
|
|
@ -1016,7 +1016,7 @@ def atom_xml(request):
|
|||
|
||||
level = settings.CONFIG['capabilities']['canSeeItem']['guest']
|
||||
if not request.user.is_anonymous():
|
||||
level = request.user.get_profile().level
|
||||
level = request.user.profile.level
|
||||
for item in models.Item.objects.filter(level__lte=level, rendered=True).order_by('-created')[:7]:
|
||||
if add_updated:
|
||||
updated = ET.SubElement(feed, "updated")
|
||||
|
|
@ -1185,7 +1185,7 @@ def sitemap_xml(request):
|
|||
def item_json(request, id):
|
||||
level = settings.CONFIG['capabilities']['canSeeItem']['guest']
|
||||
if not request.user.is_anonymous():
|
||||
level = request.user.get_profile().level
|
||||
level = request.user.profile.level
|
||||
qs = models.Item.objects.filter(public_id=id, level__lte=level)
|
||||
if qs.count() == 0:
|
||||
response = json_response(status=404, text='not found')
|
||||
|
|
@ -1198,7 +1198,7 @@ def item_json(request, id):
|
|||
def item_xml(request, id):
|
||||
level = settings.CONFIG['capabilities']['canSeeItem']['guest']
|
||||
if not request.user.is_anonymous():
|
||||
level = request.user.get_profile().level
|
||||
level = request.user.profile.level
|
||||
qs = models.Item.objects.filter(public_id=id, level__lte=level)
|
||||
if qs.count() == 0:
|
||||
response = json_response(status=404, text='not found')
|
||||
|
|
@ -1237,7 +1237,7 @@ def item(request, id):
|
|||
template = 'index.html'
|
||||
level = settings.CONFIG['capabilities']['canSeeItem']['guest']
|
||||
if not request.user.is_anonymous():
|
||||
level = request.user.get_profile().level
|
||||
level = request.user.profile.level
|
||||
qs = models.Item.objects.filter(public_id=id, level__lte=level)
|
||||
if qs.count() == 0:
|
||||
context = RequestContext(request, {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue