0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

remove special case for user and allow turning user and groups item item keys

Browse source
This commit is contained in:
j 2013-09-23 15:36:52 +00:00
parent d056dbe13c
commit 0b7d82529c
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pandora/item/models.py
View file

@ -183,6 +183,10 @@ class Item(models.Model):
def get(self, key, default=None): def get(self, key, default=None):
if key == 'rightslevel': if key == 'rightslevel':
return self.level return self.level
if key == 'user':
return self.user and self.user.username or None
if key == 'groups':
return [g.name for g in self.groups.all()]
if self.data and key in self.data: if self.data and key in self.data:
return self.data[key] return self.data[key]
if self.external_data and key in self.external_data: if self.external_data and key in self.external_data:
@ -666,9 +670,6 @@ class Item(models.Model):
save(i, self.level) save(i, self.level)
elif i == 'filename': elif i == 'filename':
save(i, '\n'.join(self.all_paths())) save(i, '\n'.join(self.all_paths()))
elif i == 'user':
if self.user:
save(i, self.user.username)
elif i == 'annotations': elif i == 'annotations':
qs = Annotation.objects.filter(item=self) qs = Annotation.objects.filter(item=self)
qs = qs.filter(layer__in=Annotation.public_layers()).exclude(findvalue=None) qs = qs.filter(layer__in=Annotation.public_layers()).exclude(findvalue=None)
@ -686,12 +687,7 @@ class Item(models.Model):
save(i, value) save(i, value)
for key in self.facet_keys: for key in self.facet_keys:
if key == 'user': if key == 'character':
if self.user:
values = self.user.username
else:
values = ''
elif key == 'character':
values = self.get('cast', '') values = self.get('cast', '')
if values: if values:
values = filter(lambda x: x.strip(), values = filter(lambda x: x.strip(),
@ -918,8 +914,6 @@ class Item(models.Model):
at = self.get('alternativeTitles') at = self.get('alternativeTitles')
if at: if at:
current_values += [a[0] for a in at] current_values += [a[0] for a in at]
elif key == 'user':
current_values = [self.user.username]
elif key == 'character': elif key == 'character':
current_values = filter(lambda x: x.strip(), current_values = filter(lambda x: x.strip(),
[f['character'] for f in self.get('cast', [])]) [f['character'] for f in self.get('cast', [])])