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

unicode, key_type

This commit is contained in:
j 2011-01-03 08:45:31 +00:00
parent 7b54205574
commit 7745ec5c7f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora/item/managers.py
View File

@ -34,8 +34,8 @@ def parseCondition(condition):
else: else:
exclude = False exclude = False
key_type = models.site_config['keys'].get(k, 'string') key_type = models.site_config['keys'].get(k, {'type':'string'}).get('type')
return { key_type = {
'title': 'string', 'title': 'string',
'person': 'string' 'person': 'string'
}.get(key_type, key_type) }.get(key_type, key_type)

10
pandora/item/models.py
View File

@ -522,11 +522,11 @@ class Item(models.Model):
s = ItemSort(item=self) s = ItemSort(item=self)
def sortNames(values): def sortNames(values):
sort_value = '' sort_value = u''
if values: if values:
sort_value = '; '.join([get_name_sort(name) for name in values]) sort_value = u'; '.join([get_name_sort(name) for name in values])
if not sort_value: if not sort_value:
sort_value = '' sort_value = u''
return sort_value return sort_value
base_keys = ( base_keys = (
@ -572,9 +572,9 @@ class Item(models.Model):
setattr(s, '%s_desc'%name, value) setattr(s, '%s_desc'%name, value)
elif field_type == 'text': elif field_type == 'text':
#FIXME: what use pural_key? #FIXME: what use pural_key?
value = self.get(name, '') value = self.get(name, u'')
if isinstance(value, list): if isinstance(value, list):
value = ','.join(value) value = u','.join(value)
value = unicodedata.normalize('NFKD', value) value = unicodedata.normalize('NFKD', value)
setattr(s, name, value) setattr(s, name, value)
if not value: if not value: