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

user-api: Load the User-List from UserFormField on any request

Browse Source
This commit is contained in:
Oskar Hahn 2012-08-03 16:25:04 +02:00
parent 1ae91d1130
commit c16d38d9a3
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openslides/utils/user/__init__.py
View File

@ -33,8 +33,22 @@ class UserFormField(forms.fields.ChoiceField):
self.empty_label = None self.empty_label = None
else: else:
self.empty_label = empty_label self.empty_label = empty_label
#TODO use a own self.choices property, see ModelChoiceField forms.fields.Field.__init__(self, required=required, initial=initial, *args, **kwargs)
super(UserFormField, self).__init__(choices=UserChoices(field=self), required=required, initial=initial, *args, **kwargs) self.widget.choices = self.choices
def __deepcopy__(self, memo):
result = super(forms.fields.ChoiceField, self).__deepcopy__(memo)
return result
def _get_choices(self):
# If self._choices is set, then somebody must have manually set
# the property self.choices. In this case, just return self._choices.
if hasattr(self, '_choices'):
return self._choices
return UserChoices(self)
choices = property(_get_choices, forms.fields.ChoiceField._set_choices)
def to_python(self, value): def to_python(self, value):
return get_user(value) return get_user(value)
@ -104,19 +118,17 @@ class Users(object):
def __iter__(self): def __iter__(self):
for receiver, users in receiv_users.send(sender='users', user_prefix=self.user_prefix, id=self.id): for receiver, users in receiv_users.send(sender='users', user_prefix=self.user_prefix, id=self.id):
# Does iter(users) work?
for user in users: for user in users:
yield user yield user
def __getitem__(self, key): def __getitem__(self, key):
user_list = list(self) user_list = list(self)
print user_list
return user_list[key] return user_list[key]
def generate_uid(prefix, id): def generate_uid(prefix, id):
if ':' in prefix: if ':' in prefix:
# TODO: Use the right Error. # TODO: Use the right Exception.
raise Exception("':' is not allowed in a the 'user_prefix'") raise Exception("':' is not allowed in a the 'user_prefix'")
return "%s:%d" % (prefix, id) return "%s:%d" % (prefix, id)
@ -125,7 +137,7 @@ class UserMixin(object):
@property @property
def uid(self): def uid(self):
try: try:
return generate_uid(self.user_prefix, self.id) return generate_uid(self.user_prefix, self.pk)
except AttributeError: except AttributeError:
raise AttributeError("%s has to have a attribute 'user_prefix'" % self) raise AttributeError("%s has to have a attribute 'user_prefix'" % self)