make user and group admin work fine

pboard/pboard/controllers/admin.py

@@ -1,130 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Main Controller"""
-
-import tg.predicates
-from tgext.admin.config import AdminConfig, CrudRestControllerConfig
-from sprox.formbase import AddRecordForm
-from sprox import formbase as sform
-from sprox import fillerbase as sfill
-from sprox import tablebase as stable
-from formencode import Schema
-from formencode.validators import FieldsMatch
-from tw2.forms import PasswordField, TextField, HiddenField
-from tw2 import forms as tw2f
-from formencode import validators as fev
-
-from pboard.model import auth as pma
-from pboard import model as pm
-
-########################################################################################################################
-##
-## GROUP RELATED STUFF
-##
-
-class GroupRegistrationForm(sform.AddRecordForm):
-    __model__ = pma.Group
-    __require_fields__     = ['group_name', 'display_name', 'users', 'personnal_group']
-    __omit_fields__        = ['created', 'permissions', '_lRights']
-    __field_order__        = ['group_name', 'display_name', 'users']
-
-    __headers__ = dict(group_name='Unique name', display_name='Visible name')
-
-    group_name = tw2f.TextField('group_name')
-    display_name = tw2f.TextField('display_name', place_holder='agaga')
-    display_name = tw2f.TextField('display_name', place_holder='agaga')
-    personnal_group = tw2f.HiddenField('personnal_group', value='off')
-
-class GroupEditForm(sform.EditableForm):
-    __model__ = pma.Group
-    __require_fields__     = ['group_name', 'display_name', 'users']
-    __omit_fields__        = ['personnal_group', 'created', 'permissions', '_lRights']
-    __field_order__        = ['group_name', 'display_name']
-
-    __headers__ = dict(group_name='Unique name', display_name='Visible name')
-
-class GroupTableFillerForm(sfill.TableFiller):
-
-    __model__ = pma.Group
-    __limit_fields__ = ['group_id', 'group_name', 'display_name', 'users']
-    #__add_fields__ = {'associated_users':None}
-
-    def _do_get_provider_count_and_objs(self, director=None, **kw):
-        groups = pm.DBSession.query(pma.Group).filter(pma.Group.group_id>0).all()
-        return len(groups), groups
-
-    def users(self, obj):
-        users = ''.join(['<li>{0}</li>'.format(user.getDisplayName()) for user in obj.users])
-        return users.join(('<ul>', '</ul>'))
-
-class GroupTable(stable.TableBase):
-    __model__ = pma.Group
-    __limit_fields__ = ['group_id', 'group_name', 'display_name', 'users']
-    __headers__ = dict(group_id='id', group_name='Unique name', display_name='Visible name', users='Users')
-    __xml_fields__ = ['users']
-
-class GroupCrudConfig(CrudRestControllerConfig):
-    new_form_type = GroupRegistrationForm
-    edit_form_type = GroupEditForm
-    table_filler_type = GroupTableFillerForm
-    table_type = GroupTable
-
-
-########################################################################################################################
-##
-## USER RELATED STUFF
-##
-
-
-form_validator =  Schema(chained_validators=(FieldsMatch('password',
-                                                         'verify_password',
-                                                         messages={'invalidNoMatch':
-                                                         'Passwords do not match'}),))
-class UserRegistrationForm(AddRecordForm):
-    pass
-    __model__ = pma.User
-    __require_fields__     = ['display_name', 'email_address', 'password']
-    __omit_fields__        = ['_password', 'groups', 'created', 'user_id', '_lAllNodes']
-    __field_order__        = ['display_name', 'email_address', 'password', 'verify_password']
-
-    __fields__ = dict(display_name='Name', email_address='Email', password='Password', verify_password='Retype Password', )
-
-    email_address          = TextField('blop')
-    display_name           = TextField
-    verify_password        = PasswordField('verify_password')
-    groups = tw2f.MultipleSelectionField('groups')
-
-
-class UserTableFiller(sfill.TableFiller):
-
-    __model__ = pma.User
-    __limit_fields__ = ['user_id', 'email_address', 'display_name', 'groups']
-
-    def groups(self, obj):
-        groups = ''.join(['<li>{0}</li>'.format(group.getDisplayName()) for group in obj.groups if group.group_id>0])
-        return groups.join(('<ul>', '</ul>'))
-
-class UserTable(stable.TableBase):
-    __model__ = pma.User
-    __limit_fields__ = ['user_id', 'email_address', 'display_name', 'groups']
-    __field_order__ = ['user_id', 'display_name', 'email_address', 'groups']
-    __omit_fields__ = ['__actions__']
-    __headers__ = dict(user_id='id', email_address='Email', display_name='Name', groups='Groups')
-    __xml_fields__ = ['groups']
-
-
-class UserCrudConfig(CrudRestControllerConfig):
-    new_form_type = UserRegistrationForm
-    table_filler_type = UserTableFiller
-    table_type = UserTable
-
-########################################################################################################################
-##
-## GENERIC STUFF
-##
-
-class PodAdminConfig(AdminConfig):
-    user = UserCrudConfig
-    group = GroupCrudConfig
-    allow_only = tg.predicates.in_group('user')
-
-

pboard/pboard/controllers/admingroup.py

@@ -0,0 +1,109 @@
+# -*- coding: utf-8 -*-
+
+from pboard import model  as pm
+
+from tgext.crud import CrudRestController
+from sprox.tablebase import TableBase
+from sprox.formbase import EditableForm, AddRecordForm
+from sprox.fillerbase import TableFiller, EditFormFiller
+from pboard.model import auth as pma
+from tw2 import forms as tw2f
+import tg
+
+from sprox.widgets import PropertyMultipleSelectField
+from sprox._compat import unicode_text
+from formencode import Schema
+from formencode.validators import FieldsMatch
+
+from pboard.lib import dbapi as pld
+
+class GroupField(PropertyMultipleSelectField):
+    """ Shows a limited list of groups """
+
+    def prepare(self):
+        # self.entity = pma.Group
+        #self.__class__.entity
+
+        visible_groups = pm.DBSession.query(pma.Group).\
+            filter(pma.Group.group_id>0).\
+            filter(pma.Group.group_id!=pma.Group.GROUP_ID_ALL_USERS).all()
+
+        self.options = [(group.group_id, group.getDisplayName()) for group in visible_groups]
+
+        if not self.value:
+            self.value = []
+        self.value = [unicode_text(v) for v in self.value]
+
+        super(PropertyMultipleSelectField, self).prepare()
+
+
+class AdminUserController(CrudRestController):
+    model = pma.User
+
+    class new_form_type(AddRecordForm):
+        __model__ = pma.User
+
+        __require_fields__     = ['display_name', 'email_address', 'password', 'verify_password', 'groups']
+        __omit_fields__        = ['_password', 'created', 'user_id', '_lAllNodes']
+        __field_order__        = ['display_name', 'email_address', 'password', 'verify_password', 'groups']
+
+        email_address          = tw2f.TextField('email_address')
+        display_name           = tw2f.TextField('display_name')
+        verify_password        = tw2f.PasswordField('verify_password')
+        groups = GroupField('groups')
+
+    class edit_form_type(EditableForm):
+        __model__ = pma.User
+
+        __require_fields__     = ['display_name', 'email_address', 'groups']
+        __omit_fields__        = ['_password', 'created', 'user_id', '_lAllNodes', 'password']
+        __field_order__        = ['display_name', 'email_address', 'groups']
+
+        email_address          = tw2f.TextField('email_address')
+        display_name           = tw2f.TextField('display_name')
+        groups = GroupField('groups')
+
+    class edit_filler_type(EditFormFiller):
+        __model__ = pma.User
+
+    class table_type(TableBase):
+        __model__ = pma.User
+        __limit_fields__ = ['user_id', 'email_address', 'display_name', 'groups']
+        __field_order__ = ['user_id', 'display_name', 'email_address', 'groups']
+        __headers__ = dict(user_id='id', email_address='Email', display_name='Name', groups='Groups')
+        __xml_fields__ = ['groups']
+
+    class table_filler_type(TableFiller):
+        __model__ = pma.User
+        __limit_fields__ = ['user_id', 'email_address', 'display_name', 'groups']
+
+        def groups(self, obj):
+            groups = ''.join(['<li>{0}</li>'.format(group.getDisplayName()) for group in obj.groups if group.group_id>0])
+            return groups.join(('<ul>', '</ul>'))
+
+    @tg.expose()
+    #@tg.validate(new_user_validator, error_handler=CrudRestController.new)
+    def post(self, *args, **kw):
+
+        real_name = kw['display_name']
+        email = kw['email_address']
+        groups = kw['groups'] if 'groups' in kw else []
+        password = kw['password']
+
+        new_user = pld.PODStaticController.createNewUser(real_name, email, password, groups)
+        if tg.request.response_type == 'application/json':
+            if new_user is not None and self.conditional_update_field is not None:
+                tg.response.last_modified = getattr(new_user, self.conditional_update_field)
+
+            return dict(model=self.model.__name__,
+                        value=self._dictify(new_user))
+
+        return tg.redirect('./', params=self._kept_params())
+
+
+    @tg.expose()
+    def post_delete(self, *args, **kw):
+        user_id = int(args[0])
+
+        pld.PODStaticController.deleteUser(user_id)
+        return tg.redirect('./', params=self._kept_params())

pboard/pboard/controllers/adminuser.py

@@ -0,0 +1,159 @@
+# -*- coding: utf-8 -*-
+
+from pboard import model  as pm
+
+from tgext.crud import CrudRestController
+from sprox.tablebase import TableBase
+from sprox.formbase import EditableForm, AddRecordForm
+from sprox.fillerbase import TableFiller, EditFormFiller
+from pboard.model import auth as pma
+from tw2 import forms as tw2f
+import tg
+
+from sprox.widgets import PropertyMultipleSelectField
+from sprox._compat import unicode_text
+from formencode import Schema
+from formencode.validators import FieldsMatch
+
+from pboard.lib import dbapi as pld
+
+class GroupField(PropertyMultipleSelectField):
+    """ Shows a limited list of groups """
+
+    def prepare(self):
+        # self.entity = pma.Group
+        #self.__class__.entity
+
+        visible_groups = pm.DBSession.query(pma.Group).\
+            filter(pma.Group.group_id>0).\
+            filter(pma.Group.group_id!=pma.Group.GROUP_ID_ALL_USERS).all()
+
+        self.options = [(group.group_id, group.getDisplayName()) for group in visible_groups]
+
+        if not self.value:
+            self.value = []
+        self.value = [unicode_text(v) for v in self.value]
+
+        super(PropertyMultipleSelectField, self).prepare()
+
+
+class AdminUserController(CrudRestController):
+    model = pma.User
+
+    class new_form_type(AddRecordForm):
+        __model__ = pma.User
+
+        __require_fields__     = ['display_name', 'email_address', 'password', 'verify_password', 'groups']
+        __omit_fields__        = ['_password', 'created', 'user_id', '_lAllNodes']
+        __field_order__        = ['display_name', 'email_address', 'password', 'verify_password', 'groups']
+
+        email_address          = tw2f.TextField('email_address')
+        display_name           = tw2f.TextField('display_name')
+        verify_password        = tw2f.PasswordField('verify_password')
+        groups = GroupField('groups')
+
+    class edit_form_type(EditableForm):
+        __model__ = pma.User
+
+        __require_fields__     = ['display_name', 'email_address', 'groups']
+        __omit_fields__        = ['_password', 'created', 'user_id', '_lAllNodes', 'password']
+        __field_order__        = ['display_name', 'email_address', 'groups']
+
+        email_address          = tw2f.TextField('email_address')
+        display_name           = tw2f.TextField('display_name')
+        groups = GroupField('groups')
+
+    class edit_filler_type(EditFormFiller):
+        __model__ = pma.User
+
+    class table_type(TableBase):
+        __model__ = pma.User
+        __limit_fields__ = ['user_id', 'email_address', 'display_name', 'groups']
+        __field_order__ = ['user_id', 'display_name', 'email_address', 'groups']
+        __headers__ = dict(user_id='id', email_address='Email', display_name='Name', groups='Groups')
+        __xml_fields__ = ['groups']
+
+    class table_filler_type(TableFiller):
+        __model__ = pma.User
+        __limit_fields__ = ['user_id', 'email_address', 'display_name', 'groups']
+
+        def groups(self, obj):
+            groups = ''.join(['<li>{0}</li>'.format(group.getDisplayName()) for group in obj.groups if group.group_id>0])
+            return groups.join(('<ul>', '</ul>'))
+
+    @tg.expose()
+    #@tg.validate(new_user_validator, error_handler=CrudRestController.new)
+    def post(self, *args, **kw):
+
+        real_name = kw['display_name']
+        email = kw['email_address']
+        groups = kw['groups'] if 'groups' in kw else []
+        password = kw['password']
+
+        new_user = pld.PODStaticController.createNewUser(real_name, email, password, groups)
+        if tg.request.response_type == 'application/json':
+            if new_user is not None and self.conditional_update_field is not None:
+                tg.response.last_modified = getattr(new_user, self.conditional_update_field)
+
+            return dict(model=self.model.__name__,
+                        value=self._dictify(new_user))
+
+        return tg.redirect('./', params=self._kept_params())
+
+
+    @tg.expose()
+    def post_delete(self, *args, **kw):
+        user_id = int(args[0])
+
+        pld.PODStaticController.deleteUser(user_id)
+        return tg.redirect('./', params=self._kept_params())
+
+    @tg.expose()
+    def put(self, *args, **kw):
+        """update"""
+        print ("UUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU")
+        print(kw)
+
+        user_id = kw['user_id']
+        real_name = kw['display_name']
+        email = kw['email_address']
+        groups = kw['groups'] if 'groups' in kw else []
+
+        updated_user = pld.PODStaticController.updateUser(user_id, real_name, email, groups)
+
+        return
+
+        omit_fields = []
+        if getattr(self, 'edit_form', None):
+            omit_fields.extend(self.edit_form.__omit_fields__)
+
+        for remembered_value in self.remember_values:
+            value = kw.get(remembered_value)
+            if value is None or value == '':
+                omit_fields.append(remembered_value)
+
+        obj = self.provider.get_obj(self.model, kw)
+
+        #This should actually by done by provider.update to make it atomic
+        can_modify = True
+        if obj is not None and self.conditional_update_field is not None and \
+           tg.request.if_unmodified_since is not None and \
+           tg.request.if_unmodified_since < getattr(obj, self.conditional_update_field):
+                can_modify = False
+
+        if obj is not None and can_modify:
+            obj = self.provider.update(self.model, params=kw, omit_fields=omit_fields)
+
+        if tg.request.response_type == 'application/json':
+            if obj is None:
+                tg.response.status_code = 404
+            elif can_modify is False:
+                tg.response.status_code = 412
+            elif self.conditional_update_field is not None:
+                tg.response.last_modified = getattr(obj, self.conditional_update_field)
+
+            return dict(model=self.model.__name__,
+                        value=self._dictify(obj))
+
+        pks = self.provider.get_primary_fields(self.model)
+        return redirect('../' * len(pks), params=self._kept_params())