fixed find_keywords, added style for errors

git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@5140 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 9 insertions, 4 deletions

diff --git a/sandbox/py-rest-doc/sphinx/web/application.py b/sandbox/py-rest-doc/sphinx/web/application.py
index 8427da365..ace13f3ff 100644
--- a/sandbox/py-rest-doc/sphinx/web/application.py
+++ b/sandbox/py-rest-doc/sphinx/web/application.py
@@ -311,6 +311,7 @@ class DocumentationApplication(object):
             users = sorted((user, []) for user in self.userdb.users)
             to_delete = set()
             generated_user = generated_password = None
+            user_exists = False
 
             if req.method == 'POST':
                 for item in req.form.getlist('delete'):
@@ -327,9 +328,12 @@ class DocumentationApplication(object):
                 elif req.form.get('add_user'):
                     username = req.form.get('username')
                     if username:
-                        generated_password = self.userdb.add_user(username)
-                        self.userdb.save()
-                        generated_user = username
+                        if username in self.userdb.users:
+                            user_exists = username
+                        else:
+                            generated_password = self.userdb.add_user(username)
+                            self.userdb.save()
+                            generated_user = username
                     else:
                         add_user_mode = True
                 elif req.form.get('aborted'):
@@ -370,7 +374,8 @@ class DocumentationApplication(object):
                                         and not self_destruction,
                 'generated_user':       generated_user,
                 'generated_password':   generated_password,
-                'self_destruction':     self_destruction
+                'self_destruction':     self_destruction,
+                'user_exists':          user_exists
             }))
         elif page == '':
             return Response(render_template(req, 'admin/index.html', {