From 69702074fdd7dd63c991980909f1ec9cd51cdc2f Mon Sep 17 00:00:00 2001
From: Bibhas <me@bibhas.in>
Date: Tue, 25 Jun 2019 21:57:22 +0530
Subject: [PATCH] Detecting usermodel and lastuser for userselectfield

---
 baseframe/forms/fields.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/baseframe/forms/fields.py b/baseframe/forms/fields.py
index 637ed972..aaf85619 100644
--- a/baseframe/forms/fields.py
+++ b/baseframe/forms/fields.py
@@ -375,8 +375,8 @@ class UserSelectFieldBase(object):
     Select a user
     """
     def __init__(self, *args, **kwargs):
-        self.usermodel = kwargs.pop('usermodel')
-        self.lastuser = kwargs.pop('lastuser')
+        self.lastuser = kwargs.pop('lastuser', current_app.login_manager)
+        self.usermodel = kwargs.pop('usermodel', self.lastuser.usermanager.usermodel if self.lastuser else None)
         self.separator = kwargs.pop('separator', ',')
         if self.lastuser:
             self.autocomplete_endpoint = self.lastuser.endpoint_url(current_app.lastuser_config['getuser_autocomplete_endpoint'])
@@ -391,7 +391,6 @@ def iter_choices(self):
             return [(u.userid, u.pickername, True) for u in self.data]
 
     def process_formdata(self, valuelist):
-        retval = super(UserSelectFieldBase, self).process_formdata(valuelist)
         userids = valuelist
         # Convert strings in userids into User objects
         users = []
@@ -412,7 +411,6 @@ def process_formdata(self, valuelist):
             else:
                 users = self.usermodel.all(userids=userids)
         self.data = users
-        return retval
 
 
 class UserSelectField(UserSelectFieldBase, StringField):