[sagenb] 50/157: cancel and invalid user error in admin, adduser

[felix salfelder]

This is an automated email from the git hooks/post-receive script.

felix-guest pushed a commit to branch master
in repository sagenb.

commit c28784c6c2fca08a84f5ef28df15838e211bc911
Author: J. Miguel Farto <migeruhito at gmail.com>
Date:   Tue Sep 16 17:16:31 2014 +0200

    cancel and invalid user error in admin, adduser
---
 sagenb/data/sage/html/settings/admin_add_user.html | 4 ++--
 sagenb/flask_version/admin.py                      | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sagenb/data/sage/html/settings/admin_add_user.html b/sagenb/data/sage/html/settings/admin_add_user.html
index 0c4ec12..e6be20a 100644
--- a/sagenb/data/sage/html/settings/admin_add_user.html
+++ b/sagenb/data/sage/html/settings/admin_add_user.html
@@ -22,8 +22,8 @@
     </li>
   </ol>
   <div id="buttons">
-    <button type="submit">{{ gettext('Create Account') }}</buttoN>
-    <a href="/users"><button>{{ gettext('Cancel') }}</button></a>
+    <button type="submit" name="cancel" value="">{{ gettext('Create Account') }}</buttoN>
+    <button type="submit" name="cancel" value="yes">{{ gettext('Cancel') }}</button>
   </div>
 </form>
 </div>
diff --git a/sagenb/flask_version/admin.py b/sagenb/flask_version/admin.py
index 36de5ef..d4d0d7a 100644
--- a/sagenb/flask_version/admin.py
+++ b/sagenb/flask_version/admin.py
@@ -76,10 +76,12 @@ def add_user():
     template_dict = {'admin': g.notebook.user_manager().user(g.username).is_admin(),
                      'username': g.username}
     if 'username' in request.values:
+        if request.values['cancel']:
+            return redirect(url_for('users'))
         username = request.values['username']
         if not is_valid_username(username):
             return render_template(os.path.join('html', 'settings', 'admin_add_user.html'),
-                                   error='username_invalid', username=username, **template_dict)
+                                   error='username_invalid', username_input=username, **template_dict)
 
         from random import choice
         import string

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git