sh4nks 11 лет назад
Родитель
Сommit
31fea56d84
2 измененных файлов с 9 добавлено и 6 удалено
  1. 7 5
      flaskbb/admin/views.py
  2. 2 1
      manage.py

+ 7 - 5
flaskbb/admin/views.py

@@ -53,14 +53,16 @@ def users():
     search_form = UserSearchForm()
 
     if search_form.validate():
-        users = search_form.get_results().paginate(page, current_app.config['USERS_PER_PAGE'], False)
-        return render_template("admin/users.html", users=users, search_form=search_form)
-    else:
-        users = User.query. \
+        users = search_form.get_results().\
             paginate(page, current_app.config['USERS_PER_PAGE'], False)
-        return render_template("admin/users.html", users=users, search_form=search_form)
+        return render_template("admin/users.html", users=users,
+                               search_form=search_form)
 
+    users = User.query. \
+        paginate(page, current_app.config['USERS_PER_PAGE'], False)
 
+    return render_template("admin/users.html", users=users,
+                           search_form=search_form)
 
 
 @admin.route("/groups")

+ 2 - 1
manage.py

@@ -102,7 +102,8 @@ def initflaskbb(username=None, password=None, email=None):
     try:
         create_default_groups()
     except IntegrityError:
-        app.logger.error("Couldn't create the default groups because they are already exist!")
+        app.logger.error("Couldn't create the default groups because they are\
+                          already exist!")
         if prompt_bool("Do you want to recreate the database? (y/n)"):
             db.session.rollback()
             db.drop_all()