From 11ec432f84e3a5cc6cce7ec2bd29e5d60c394a92 Mon Sep 17 00:00:00 2001
From: llj <lingjun.li1@gmail.com>
Date: Wed, 9 Jul 2014 17:51:07 +0800
Subject: [PATCH] [user role] bugfix and improvement

---
 media/css/seahub.css                          | 17 ++++---
 seahub/forms.py                               |  4 +-
 seahub/group/templates/group/group_info.html  |  5 ++
 seahub/group/templates/group/groups.html      |  2 +
 .../templates/group/groups_left_panel.html    | 14 ++----
 .../templates/group/groups_right_panel.html   | 21 ++++-----
 .../templates/profile/set_profile.html        |  5 +-
 .../templates/share/priv_shared_files.html    | 12 +++--
 seahub/templates/home_base.html               |  6 +++
 seahub/templates/myhome.html                  | 47 ++++++-------------
 seahub/templates/sysadmin/sys_useradmin.html  | 19 ++++----
 seahub/templates/sysadmin/useradmin_js.html   | 30 ++++++------
 .../templates/sysadmin/useradmin_table.html   |  5 +-
 seahub/views/__init__.py                      |  3 +-
 seahub/views/sysadmin.py                      |  2 +-
 15 files changed, 94 insertions(+), 98 deletions(-)

diff --git a/media/css/seahub.css b/media/css/seahub.css
index fe86a1dc70..45578c7f35 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -68,6 +68,7 @@
 .icon-picture:before              { content: "\f03e"; }
 .icon-undo:before                 { content: "\f0e2"; }
 .icon-repeat:before               { content: "\f01e"; }
+.icon-question-sign:before        { content: "\f059"; }
 
 /****** sf-icon-xx ********/
 @font-face {
@@ -124,7 +125,7 @@ textarea {
     resize: vertical; /* for drag */
     outline:0;
 }
-textarea, select, input { border: 1px solid #ddd; }
+textarea, input { border: 1px solid #ddd; }
 input { height:22px; margin:3px 0; outline:0; }
 input, button { display:inline-block;/*for ie*/ }
 input[type=submit],
@@ -136,7 +137,8 @@ button,
 input[type=submit],
 input[type=button],
 input.submit,
-.fileinput-button { 
+.fileinput-button,
+select { 
     padding:5px 6px;
     background:-webkit-linear-gradient(top, #fafafb, #eeeeee);
     background:-moz-linear-gradient(top, #fafafb, #eeeeee);
@@ -144,6 +146,9 @@ input.submit,
     border: 1px solid #c5c5c5;
     border-radius: 2px;
 }
+select {
+    outline:none;
+}
 input[type=radio] {
     height:auto;
     border:0;/*for ie*/
@@ -188,7 +193,8 @@ button::-moz-focus-inner {/*Remove button padding in FF*/
     display: block;
 }
 input[type=submit],
-input.submit {
+input.submit,
+button.submit {
     margin-top:8px;
 }
 input[type=submit]:hover,
@@ -1476,7 +1482,6 @@ textarea:-moz-placeholder {/* for FF */
 }
 #repo-create-form .perm {
     width:268px;
-    height:22px;
     margin-bottom:10px;
 }
 .event-group-hd {
@@ -2454,8 +2459,7 @@ textarea:-moz-placeholder {/* for FF */
 }
 #file-enc {
     border:1px solid #ddd;
-    border-radius:2px;
-    background:#efefef;
+    padding:0;
 }
 #file-view-tip {
     height: 150px;
@@ -2948,6 +2952,7 @@ textarea:-moz-placeholder {/* for FF */
 }
 #mass-email {
     width:432px;
+    padding:0;
 }
 /* payments */
 #plans {
diff --git a/seahub/forms.py b/seahub/forms.py
index cfd5b38342..1e0a9af95f 100644
--- a/seahub/forms.py
+++ b/seahub/forms.py
@@ -28,7 +28,7 @@ class AddUserForm(forms.Form):
         email = self.cleaned_data['email']
         try:
             user = User.objects.get(email=email)
-            raise forms.ValidationError(_("A user with this email already"))
+            raise forms.ValidationError(_("A user with this email already exists."))
         except User.DoesNotExist:
             return self.cleaned_data['email']            
 
@@ -42,7 +42,7 @@ class AddUserForm(forms.Form):
         """
         if 'password1' in self.cleaned_data and 'password2' in self.cleaned_data:
             if self.cleaned_data['password1'] != self.cleaned_data['password2']:
-                raise forms.ValidationError(_("The two password fields didn't match."))
+                raise forms.ValidationError(_("The two passwords didn't match."))
         return self.cleaned_data
 
 class RepoCreateForm(forms.Form):
diff --git a/seahub/group/templates/group/group_info.html b/seahub/group/templates/group/group_info.html
index 78119981cc..9527c048b4 100644
--- a/seahub/group/templates/group/group_info.html
+++ b/seahub/group/templates/group/group_info.html
@@ -121,7 +121,10 @@
     </div>
 </div>
 
+{% if request.user.role == default_user or request.user.role == None %}
 {% include "snippets/repo_create_form.html" %}
+{% endif %}
+
 <form id="repo-decrypt-form" class="hide">
     <h3>{% trans 'Library' %} <span class="op-target"></span> {% trans 'is encrypted' %}</h3>
     <input type="hidden" name="repo_id" value="" />
@@ -154,6 +157,7 @@ $('.download').click(function() {
     window.open('{{ SITE_ROOT }}seafile_access_check/?repo_id=' + e(repo_id));
 });
 
+{% if request.user.role == default_user or request.user.role == None %}
 function repoCreateSuccessCallback() {
     location.reload();
 }
@@ -161,6 +165,7 @@ function repoCreateSuccessCallback() {
 {% with post_url=repo_create_url %}
     {% include 'snippets/repo_create_js.html' %}
 {% endwith %}
+{% endif %}
 
 {% if recent_commits %}
 {% include 'snippets/list_commit_detail.html' %}
diff --git a/seahub/group/templates/group/groups.html b/seahub/group/templates/group/groups.html
index 02e99860e1..37760243a8 100644
--- a/seahub/group/templates/group/groups.html
+++ b/seahub/group/templates/group/groups.html
@@ -15,10 +15,12 @@
 
 {% block extra_script %}
 <script type="text/javascript">
+{% if request.user.role == default_user or request.user.role == None %}
 {% url 'group_add' as group_add_url %}
 {% with post_url=group_add_url %}
 {% include "snippets/group_add_js.html" %}
 {% endwith %}
+{% endif %}
 
 $('.group').hover(
 	function() {
diff --git a/seahub/group/templates/group/groups_left_panel.html b/seahub/group/templates/group/groups_left_panel.html
index f690bd4441..6eef51d75c 100644
--- a/seahub/group/templates/group/groups_left_panel.html
+++ b/seahub/group/templates/group/groups_left_panel.html
@@ -1,16 +1,12 @@
 {% load i18n %}
-{% if request.user.role == default_user or request.user.role == None %}
 <div class="info-item">
     <h3 class="info-item-top">{% trans "Tips" %}</h3>
     <div class="info-item-bottom">
+        {% if request.user.role == default_user or request.user.role == None %}
         <p class="not-last">{% trans "After creating a group, you can add members and share libraries into it." %}</p>
+        {% else %}
+        <p class="not-last">{% trans "Since you are a guest user now, you can not create groups." %}</p>
+        {% endif %}
     </div>
 </div>
-{% else %}
-<div class="info-item">
-    <h3 class="info-item-top">{% trans "Tips" %}</h3>
-    <div class="info-item-bottom">
-        <p class="not-last">{% trans "You are a guest user now, can not create group. But group(s) you have joined in will be list right." %}</p>
-    </div>
-</div>
-{% endif %}
+
diff --git a/seahub/group/templates/group/groups_right_panel.html b/seahub/group/templates/group/groups_right_panel.html
index 77bd82f029..003fe33219 100644
--- a/seahub/group/templates/group/groups_right_panel.html
+++ b/seahub/group/templates/group/groups_right_panel.html
@@ -26,18 +26,16 @@
     {% endfor %}
 </ul>
 {% else %}
+<div class="empty-tips">
+    <h2 class="alc">{% trans "You are not in any groups" %}</h2>
+    {% if request.user.role == default_user or request.user.role == None %}
+    <p>{% blocktrans %}Group is a place for you and your friends leaving messages and collaborating on libraries. You can create a group by clicking "New Group" button.{% endblocktrans %}</p>
+    {% else %}
+    <p>{% trans "Group is a place for you and your friends leaving messages and collaborating on libraries. Groups you join will be listed here." %}</p>
+    {% endif %}
+</div>
+{% endif %}
 {% if request.user.role == default_user or request.user.role == None %}
-<div class="empty-tips">
-  <h2 class="alc">{% trans "You are not in any groups" %}</h2>
-  <p>{% blocktrans %}You can create a group by clicking "New Group" button. Group is a place for you and your friends leaving messages and collaborating on libraries.{% endblocktrans %}</p>
-</div>
-{% else %}
-<div class="empty-tips">
-  <h2 class="alc">{% trans "You are a guest user" %}</h2>
-  <p class="not-last">{% trans "You are a guest user now, can not create group.  But group(s) you have joined in will be list here." %}</p>
-</div>
-{% endif %}
-{% endif %}
 <form id="group-add-form" action="" method="post" name="group-add-form" class="hide">{% csrf_token %}
     <h3>{% trans "New Group" %}</h3>
     <label>{% trans "Group Name" %}</label><br />
@@ -45,3 +43,4 @@
     <p class="error hide"></p>
     <input id="group-add-submit" type="submit" class="submit" value="{% trans "Submit" %}" />
 </form>
+{% endif %}
diff --git a/seahub/profile/templates/profile/set_profile.html b/seahub/profile/templates/profile/set_profile.html
index bee9f9c743..1cbebc0461 100644
--- a/seahub/profile/templates/profile/set_profile.html
+++ b/seahub/profile/templates/profile/set_profile.html
@@ -75,6 +75,7 @@
 </div>
 
 {% if request.user.role == default_user or request.user.role == None %}
+
 {% if not force_server_crypto %}
 <div class="setting-item" id="enc-lib-setting">
 <h3>{% trans "Encrypted Libraries Setting" %}</h3>
@@ -109,6 +110,7 @@
     <p>{% trans "Default library is the default place to store your personal documents and pictures." %}</p>
     <button id="default-lib">{% trans "Choose Default Library" %}</button>
 </div>
+
 {% endif %}
 
 <div class="setting-item" id="del-account">
@@ -143,6 +145,7 @@ addConfirmTo($('#account-delete-btn'), {
     'con' : "{% trans "Really want to delete your account?" %}"
 });
 
+{% if request.user.role == default_user or request.user.role == None %}
 var all_repos = [];
 {% for a_repo in owned_repos %}
     all_repos.push({
@@ -156,7 +159,6 @@ $('#default-lib').click(function() {
     form.modal({appendTo:'#main', autoResize:true, focus:false});
     file_tree.renderDirTree($('#repos-dirs').data('site_root', '{{SITE_ROOT}}'), form, all_repos);
 });
-
 $('#default-lib-form').submit(function() {
     var dst_repo = $('[name="dst_repo"]', $(this)).val();
     if (!$.trim(dst_repo)) {
@@ -164,6 +166,7 @@ $('#default-lib-form').submit(function() {
         return false;
     }
 });
+{% endif %}
 
 (function() {
     var lang_context = $('#lang-context'),
diff --git a/seahub/share/templates/share/priv_shared_files.html b/seahub/share/templates/share/priv_shared_files.html
index f5906dccfb..25b0827ac5 100644
--- a/seahub/share/templates/share/priv_shared_files.html
+++ b/seahub/share/templates/share/priv_shared_files.html
@@ -10,17 +10,19 @@
 <div id="tabs" class="tab-tabs">
     <ul class="tab-tabs-nav hd w100 ovhd">
         <li class="tab"><a href="#priv-share-in" class="a">{% trans "From Others" %}</a></li>
+        {% if request.user.role == default_user or request.user.role == None %}
         <li class="tab long-tab"><a href="#priv-share-out" class="a">{% trans "To Others" %}</a></li>
+        {% endif %}
     </ul>
     <div id="priv-share-in">
         {% if priv_share_in %}
         <table>
             <tr>
                 <th width="5%"><!--icon--></th>
-                <th width="40%">{% trans "Name"%}</th>
-                <th width="25%">{% trans "Library"%}</th>
-                <th width="18%">{% trans "From"%}</th>
-                <th width="12%">{% trans "Operations"%}</th>
+                <th width="40%">{% trans "Name" %}</th>
+                <th width="25%">{% trans "Library" %}</th>
+                <th width="18%">{% trans "From" %}</th>
+                <th width="12%">{% trans "Operations" %}</th>
             </tr>
             {% for e in priv_share_in %}
             <tr>
@@ -45,6 +47,7 @@
         {% endif %}
     </div>
 
+    {% if request.user.role == default_user or request.user.role == None %}
     <div id="priv-share-out" class="hide">
         {% if priv_share_out %}
         <table>
@@ -77,5 +80,6 @@
         </div>
         {% endif %}
     </div>
+    {% endif %}
 </div>
 {% endblock %}
diff --git a/seahub/templates/home_base.html b/seahub/templates/home_base.html
index c5228b5982..5dcac47e2f 100644
--- a/seahub/templates/home_base.html
+++ b/seahub/templates/home_base.html
@@ -28,8 +28,10 @@
 
     <h3 class="hd">{% trans "Share Admin" %}</h3>
     <ul class="side-tabnav-tabs">
+        {% if request.user.role == default_user or request.user.role == None %}
         <li class="tab {% block cur_share_libs %}{% endblock %}"><a href="{% url 'share_admin' %}" class="lib">{% trans "Libraries" %}</a></li>
         <li class="tab {% block cur_share_folders %}{% endblock %}"><a href="{% url 'list_priv_shared_folders' %}" class="folders">{% trans "Folders" %}</a></li>
+        {% endif %}
         <li class="tab {% block cur_share_files %}{% endblock %}"><a href="{% url 'list_priv_shared_files' %}" class="files">{% trans "Files" %}</a></li>        
         <li class="tab {% block cur_share_links %}{% endblock %}"><a href="{% url 'list_shared_links' %}" class="links">{% trans "Links" %}</a></li>
     </ul>
@@ -37,6 +39,7 @@
 {% endblock %}
 
 {% block main_panel %}
+{% if request.user.role == default_user or request.user.role == None %}
 <form id="mods-enable-form" method="post" action="{% url 'toggle_modules' %}" class="hide">{% csrf_token%}
     <h3>{% trans "Enable Modules"%}</h3>
     <ul>
@@ -53,14 +56,17 @@
     </ul>
     <input type="submit" id="mods-enable-submit" value="{% trans "Submit"%}" class="submit"/>
 </form>
+{% endif %}
 {% endblock %}
 
 {% block extra_script %}
 <script type="text/javascript">
+{% if request.user.role == default_user or request.user.role == None %}
 $('#enable-mods').click(function() {
     $('#mods-enable-form').modal({appendTo: "#main"});
     $('#simplemodal-container').css('height', 'auto');
     return false;
 });
+{% endif %}
 </script>
 {% endblock %}
diff --git a/seahub/templates/myhome.html b/seahub/templates/myhome.html
index a165ecc8c5..acf166cb62 100644
--- a/seahub/templates/myhome.html
+++ b/seahub/templates/myhome.html
@@ -6,17 +6,14 @@
 {% block extra_style %}
 {% if need_guide %}
 <style type="text/css">
-#guide-for-guest,
 #guide-for-new {
     padding: 0 20px;
     width: 450px;
 }
-#guide-for-guest .icon-lightbulb,
 #guide-for-new .icon-lightbulb {
     font-size:6em;
     color:#feac74;
 }
-#guide-for-guest .txt,
 #guide-for-new .txt {
     margin-left:6.4em;
 }
@@ -36,28 +33,19 @@
 
 {% include "snippets/repo_create_form.html" %}
 
-{% if request.user.role == default_user or request.user.role == None %}
-    {% if need_guide %}
-    <div id="guide-for-new" class="hide">
-        <span class="icon-lightbulb fleft"></span>
-        <div class="txt">
-            <h3>{% trans "Welcome to Seafile!" %}</h3>
-            <p>{% trans "Seafile organizes files into libraries. Each library can be synced and shared separately. We have created a personal library for you. You can create more libraries later." %}</p>
-            <button class="simplemodal-close" style="margin:8px 0 0 0;">{% trans "Close" %}</button>
-        </div>
+{% if need_guide %}
+<div id="guide-for-new" class="hide">
+    <span class="icon-lightbulb fleft"></span>
+    <div class="txt">
+        <h3>{% trans "Welcome to Seafile!" %}</h3>
+        {% if request.user.role == default_user or request.user.role == None %}
+        <p>{% trans "Seafile organizes files into libraries. Each library can be synced and shared separately. We have created a personal library for you. You can create more libraries later." %}</p>
+        {% else %}
+        <p>{% trans "Seafile organizes files into libraries. Each library can be synced and shared separately. Howerver, since you are a guest user now, you can not create libraries." %}</p>
+        {% endif %}
+        <button class="simplemodal-close" style="margin:8px 0 0 0;">{% trans "Close" %}</button>
     </div>
-    {% endif %}
-{% else %}
-    {% if need_guide %}
-    <div id="guide-for-guest" class="hide">
-        <span class="icon-lightbulb fleft"></span>
-        <div class="txt">
-            <h3>{% trans "Welcome to Seafile!" %}</h3>
-            <p>{% trans "You are a guest user, some operations are limited, you can ask system administrator to change you to commom user for full operations." %}</p>
-            <button class="simplemodal-close" style="margin:8px 0 0 0;">{% trans "Close" %}</button>
-        </div>
-    </div>
-    {% endif %}
+</div>
 {% endif %}
 
 {% if ENABLE_SUB_LIBRARY and sub_lib_enabled %}
@@ -78,16 +66,9 @@
 
 {% block extra_script %}{{block.super}}
 <script type="text/javascript">
-{% if request.user.role == default_user or request.user.role == None %}
-    {% if need_guide %}
-    $(function() {$('#guide-for-new').modal({appendTo: '#main', focus:false});});
-    {% endif %}
-{% else %}
-    {% if need_guide %}
-    $(function() {$('#guide-for-guest').modal({appendTo: '#main', focus:false});});
-    {% endif %}
+{% if need_guide %}
+$(function() {$('#guide-for-new').modal({appendTo: '#main', focus:false});});
 {% endif %}
-
 {% include "snippets/myhome_extra_script.html" %}
 var cur_tab = $('.ui-tabs-selected .a');    
 var lib_create_btn = $('#repo-create'),
diff --git a/seahub/templates/sysadmin/sys_useradmin.html b/seahub/templates/sysadmin/sys_useradmin.html
index 8e7cde359b..0d8a3c0239 100644
--- a/seahub/templates/sysadmin/sys_useradmin.html
+++ b/seahub/templates/sysadmin/sys_useradmin.html
@@ -26,7 +26,6 @@
         <li class="tabnav-tab"><a href="{% url 'sys_useradmin_admins' %}">{% trans "Admins" %}</a></li>
     </ul>
     <div class="fright">
-        <!--button id="upload-file-btn"><span class="icon-upload-alt"></span>{% trans "Upload csv file"%}</button-->
         <button id="upload-file-btn"><span class="icon-upload-alt"></span>{% trans "Import users" %}</button>
         <button id="add-user-btn"><img src="{{ MEDIA_URL }}img/add.png" alt="" class="add vam" /><span class="vam">{% trans "Add user" %}</span></button>
     </div>
@@ -36,17 +35,17 @@
     <h3>{% trans "Add user" %}</h3>
     <label for="id_email">{% trans "Email" %}</label><br />
     <input type="text" name="email" id="id_email" class="input" /><br />
+    <label>{% trans "Role"%}</label><span class="icon-question-sign" title="{% trans "You can also add a user as a guest, who will not be allowed to create libraries and groups." %}" style="color:#666; margin-left:3px;"></span>
+    <select name="role" class="w100">
+      <option value={{default_user}} selected="selected">{% trans "Default"%}</option>
+      <option value={{guest_user}}>{% trans "Guest"%}</option>
+    </select><br />
     <label for="id_password1">{% trans "Password" %}</label><br />
     <input type="password" name="password1" id="id_password1" class="input" /><br />    
     <label for="id_password2">{% trans "Confirm Password" %}</label><br />
     <input type="password" name="password2" id="id_password2" class="input" /><br />    
-    <label>{% trans "Role:"%} </label>
-    <select name="role">
-      <option value={{default_user}} selected="selected">{% trans "Default"%}</option>
-      <option value={{guest_user}}>{% trans "Guest"%}</option>
-    </select><br />
     <p class="error hide"></p>
-    <input type="submit" value="{% trans "Submit" %}" class="submit" />
+    <button type="submit" class="submit">{% trans "Submit" %}</button>
 </form>
 
 <form id="upload-csv-form" class="hide" enctype="multipart/form-data" method="post" action="{% url 'batch_add_user' %}">{% csrf_token %}
@@ -54,7 +53,7 @@
     <input type="file" name="file" />
     <p class="tip">{% trans "File format: user@mail.com,password"%}</p>
     <p class="error hide">{% trans "Please choose a CSV file" %}</p>
-    <input type="submit" value="{% trans "Submit" %}" class="submit" />
+    <button type="submit" class="submit">{% trans "Submit" %}</button>
 </form>
 
 {% include "sysadmin/useradmin_table.html"%}
@@ -108,7 +107,7 @@ $('#add-user-form').submit(function() {
         return false;
     } 
 
-    var submit_btn = $(this).find('input[type="submit"]');
+    var submit_btn = $(this).find('[type="submit"]');
     disable(submit_btn);
     $.ajax({
         url: '{% url 'user_add' %}',
@@ -129,7 +128,7 @@ $('#add-user-form').submit(function() {
         },  
         error: function(jqXHR, textStatus, errorThrown) {
             if (jqXHR.responseText) {
-                apply_form_error(form_id, $.parseJSON(jqXHR.responseText).err);
+                apply_form_error(form_id, $.parseJSON(jqXHR.responseText).error);
             } else {
                 apply_form_error(form_id, "{% trans "Failed. Please check the network." %}");
             }
diff --git a/seahub/templates/sysadmin/useradmin_js.html b/seahub/templates/sysadmin/useradmin_js.html
index 7cdcb21b98..3dab7ee041 100644
--- a/seahub/templates/sysadmin/useradmin_js.html
+++ b/seahub/templates/sysadmin/useradmin_js.html
@@ -28,22 +28,20 @@ $('tr:gt(0)').hover(
         $(this).find('.user-status-edit-icon, .user-role-edit-icon').addClass('vh');
     }
 );
-// show 'user-status(role)-select'
 $('.user-status-edit-icon, .user-role-edit-icon').click(function() {
     $(this).parent().addClass('hide');
-    $(this).parent().next().removeClass('hide');
+    $(this).parent().next().removeClass('hide'); // show 'select'
 });
 $('.user-status-select, .user-role-select').change(function() {
     var select = $(this),
         select_val = select.val(),
-        class_val = $(this).attr('class');
+        uid = select.parents('tr').attr('data-userid'),
+        url;
 
-    if (class_val.indexOf('status') != -1) {
-        var uid = $(this).parent().prev().attr('data'),
-            url = "{{ SITE_ROOT }}useradmin/toggle_status/" + uid + "/?s=" + select_val;
+    if (select.hasClass('user-status-select')) {
+        url = "{{ SITE_ROOT }}useradmin/toggle_status/" + uid + "/?s=" + select_val;
     } else {
-        var uid = $(this).parent().prev().prev().attr('data'),
-            url = "{{ SITE_ROOT }}useradmin/toggle_role/" + uid + "/?r=" + select_val;
+        url = "{{ SITE_ROOT }}useradmin/toggle_role/" + uid + "/?r=" + select_val;
     }
 
     $.ajax({
@@ -61,16 +59,12 @@ $('.user-status-select, .user-role-select').change(function() {
         success: function(data) {
             if (data['email_sent']) {
                 feedback("{% trans "Edit succeeded, an email has been sent." %}", 'success');
-                select.prev().children(select).html(select.children('option[value="' +select.val() + '"]').text());
-            
             } else if (data['email_sent'] === false) {
                 feedback("{% trans "Edit succeeded, but failed to send email, please check your email configuration." %}", 'success');
-                select.prev().children(select).html(select.children('option[value="' +select.val() + '"]').text());
             } else {
                 feedback("{% trans "Edit succeeded" %}", 'success');
-                select.prev().children(select).html(select.children('option[value="' +select.val() + '"]').text());
             }
-            
+            select.prev().children('span').html(select.children('option[value="' +select.val() + '"]').text());
             select.addClass('hide');
             select.prev().removeClass('hide');
             $.modal.close();
@@ -87,8 +81,12 @@ $('.user-status-select, .user-role-select').change(function() {
 $(document).click(function(e) {
     var target = e.target || event.srcElement;
     // target can't be edit-icon
-    if (!$('.user-status-edit-icon, .user-status-select, .user-role-edit-icon, .user-role-select').is(target)) {
-        $('.user-status, .user-role').removeClass('hide');
-        $('.user-status-select, .user-role-select').addClass('hide');
+    if (!$('.user-status-edit-icon, .user-status-select').is(target)) {
+        $('.user-status').removeClass('hide');
+        $('.user-status-select').addClass('hide');
+    }
+    if (!$('.user-role-edit-icon, .user-role-select').is(target)) {
+        $('.user-role').removeClass('hide');
+        $('.user-role-select').addClass('hide');
     }
 });
diff --git a/seahub/templates/sysadmin/useradmin_table.html b/seahub/templates/sysadmin/useradmin_table.html
index 081373c9b4..d967f476a5 100644
--- a/seahub/templates/sysadmin/useradmin_table.html
+++ b/seahub/templates/sysadmin/useradmin_table.html
@@ -10,9 +10,8 @@
     </tr>
 
     {% for user in users %}
-    <tr>
-        <td data="{{user.id}}"><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.email }}</a></td>
-
+    <tr data-userid="{{user.id}}">
+        <td><a href="{{ SITE_ROOT }}useradmin/info/{{ user.props.email }}/">{{ user.email }}</a></td>
         <td>
           {% if user.source != 'LDAP' %}
             <div class="user-status">
diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py
index c3bb4f6bf4..766d11449f 100644
--- a/seahub/views/__init__.py
+++ b/seahub/views/__init__.py
@@ -982,9 +982,8 @@ def myhome(request):
         need_guide = UserOptions.objects.is_user_guide_enabled(username)
         if need_guide:
             UserOptions.objects.disable_user_guide(username)
-            # create a default library for user
-
             if request.user.role == DEFAULT_USER or request.user.role == None:
+                # create a default library for user
                 create_default_library(request)
                 # refetch owned repos
                 owned_repos = get_owned_repo_list(request)
diff --git a/seahub/views/sysadmin.py b/seahub/views/sysadmin.py
index 67e8d810c0..a990c6cc48 100644
--- a/seahub/views/sysadmin.py
+++ b/seahub/views/sysadmin.py
@@ -640,7 +640,7 @@ def user_add(request):
 
             return HttpResponse(json.dumps({'success': True}), content_type=content_type)
     else:
-        return HttpResponse(json.dumps({'err': str(form.errors)}), status=400, content_type=content_type)
+        return HttpResponse(json.dumps({'error': str(form.errors.values()[0])}), status=400, content_type=content_type)
 
 @login_required
 @sys_staff_required