ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #60 from ostcar/master

Browse Source 
Fix emptyuser
This commit is contained in:
Oskar Hahn 2012-11-27 13:51:21 -08:00
commit 9b9d801c38
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/utils/person/__init__.py
View File

@ -21,7 +21,7 @@ __all__ = ['receive_persons', 'generate_person_id', 'get_person', 'Person',
'PersonField', 'PersonMixin', 'EmptyPerson'] 'PersonField', 'PersonMixin', 'EmptyPerson']
class EmptyPerson(PersonMixin): class EmptyPerson(PersonMixin, Person):
@property @property
def person_id(self): def person_id(self):
return 'empty' return 'empty'

6
openslides/utils/utils.py
View File

@ -142,12 +142,10 @@ def ajax_request(data):
def _propper_unicode(text): def _propper_unicode(text):
res = ''
if not isinstance(text, unicode): if not isinstance(text, unicode):
res = u"%s" % text.decode('UTF-8') return u"%s" % text.decode('UTF-8')
else: else:
res = text return text
return res
def decodedict(dict): def decodedict(dict):