Delete all department fields in the old version of the web page

seahub/profile/templates/profile/set_profile.html

@@ -64,12 +64,7 @@
         <br/>
         {% endif %}
 
-        {% if form.department and form.telephone %}
+        {% if form.telephone %}
-        <label>{% trans "Department:" %}</label><input type="text" name="department" value="{{ form.data.department }}" class="input" />
-        {% for error in form.department.errors %}
-        <span class="error">{{ error|escape }}</span>
-        {% endfor %}
-        <br/>
         <label>{% trans "Telephone:" %}</label><input type="text" name="telephone" value="{{ form.data.telephone }}" class="input" />
         {% for error in form.telephone.errors %}
         <span class="error">{{ error|escape }}</span>

seahub/profile/templates/profile/user_profile.html

@@ -11,12 +11,6 @@
     <p title="{{ nickname }}" class="user-profile-nickname ellipsis">{{ nickname }}</p>
     <ul>
         {% if d_profile %}
-        {% if d_profile.department %}
-        <li title="{{ d_profile.department }}" class="user-profile-info ellipsis">
-            <span class="user-profile-info-icon icon-building fa-1x vam"></span>
-            <span class="vam">{{ d_profile.department }}</span>
-        </li>
-        {% endif %}
         {% if d_profile.telephone %}
         <li title="{{ d_profile.telephone }}" class="user-profile-info ellipsis">
             <span class="user-profile-info-icon icon-phone fa-1x vam"></span>

seahub/templates/sysadmin/sys_useradmin.html

@@ -45,8 +45,6 @@
 
     <label for="id_name">{% trans "Name(optional)" %}</label><br />
     <input type="text" name="name" id="id_name" class="input" /><br />
-    <label for="id_dept">{% trans "Department(optional)" %}</label><br />
-    <input type="text" name="department" id="id_dept" class="input" /><br />
 
     {% if is_pro %}
     <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>
@@ -138,7 +136,6 @@ $('#add-user-form').on('submit', function() {
         form_id = $(this).attr('id'),
         email = $.trim(form.children('[name="email"]').val()),
         name = $.trim($('[name="name"]', form).val()),
-        department = $.trim($('[name="department"]', form).val()),
         {% if is_pro %}
         role = $('select[name="role"]', form).val(),
         {% endif %}
@@ -173,7 +170,6 @@ $('#add-user-form').on('submit', function() {
         data: {
             'email': email,
             'name': name,
-            'department': department,
             {% if is_pro %}
             'role': role,
             {% endif %}

seahub/templates/sysadmin/userinfo.html

@@ -88,18 +88,6 @@
                 <span id="set-reference-id" title="{% trans "Edit" %}" class="sf2-icon-edit op-icon"></span>
             </dd>
 
-            <dt>{% trans "Department" %}</dt>
-            <dd>
-                <span id="department">
-                    {% if d_profile and d_profile.department %}
-                    {{ d_profile.department }}
-                    {% else %}
-                    --
-                    {% endif %}
-                </span>
-                <span id="set-dept" title="{% trans "Edit"%}" class="sf2-icon-edit op-icon"></span>
-            </dd>
-
             {% if d_profile and d_profile.telephone %}
             <dt>{% trans "Telephone" %}</dt>
             <dd>{{ d_profile.telephone }}</dd>
@@ -572,43 +560,6 @@ $('#set-reference-id-form').on('submit', function() {
     return false;
 });
 
-$('#set-dept-form').on('submit', function() {
-    var department = $.trim($('[name="department"]', $(this)).val());
-    var $department = $('#department');
-    var $error = $('.error', $(this));
-    var $submitBtn = $('[type="submit"]', $(this));
-    disable($submitBtn);
-
-    $.ajax({
-        url: '{% url 'api-v2.1-admin-user' email %}',
-        type: 'PUT',
-        dataType: 'json',
-        cache: false,
-        beforeSend: prepareCSRFToken,
-        data: {'department': department},
-        success: function(data) {
-            if (department == '') {
-                $department.html('--');
-            } else {
-                $department.html(HTMLescape(data['department']));
-            }
-            $.modal.close();
-        },
-        error: function(xhr, textStatus, errorThrown) {
-            var err_msg;
-            if (xhr.responseText) {
-                err_msg = JSON.parse(xhr.responseText).error_msg;
-            } else {
-                err_msg = "{% trans "Failed. Please check the network." %}";
-            }
-            $error.html(err_msg).show();
-            enable($submitBtn);
-        }
-    });
-
-    return false;
-});
-
 $('#set-quota-form').on('submit', function() {
     var form = $(this),
         form_id = form.attr('id'),

seahub/views/sysadmin.py

@@ -1885,16 +1885,14 @@ def batch_add_user_example(request):
         next = SITE_ROOT
     data_list = []
     head = [_('Email'), _('Password'), _('Name')+ '(' + _('Optional') + ')', 
-            _('Department')+ '(' + _('Optional') + ')', _('Role')+
+            _('Role') + '(' + _('Optional') + ')', _('Space Quota') + '(MB, ' + _('Optional') + ')']
-            '(' + _('Optional') + ')', _('Space Quota') + '(MB, ' + _('Optional') + ')']
     for i in xrange(5):
         username = "test" + str(i) +"@example.com"
         password = "123456"
         name = "test" + str(i)
-        department = "department" + str(i)
         role = "default"
         quota = "1000"
-        data_list.append([username, password, name, department, role, quota])
+        data_list.append([username, password, name, role, quota])
 
     wb = write_xls('sample', head, data_list)
     if not wb:
@@ -1970,21 +1968,14 @@ def batch_add_user(request):
                     logger.error(e)
 
                 try:
-                    department = row[3].strip()
+                    role = row[3].strip()
-                    if len(department) <= 512:
-                        DetailedProfile.objects.add_or_update(username, department, '')
-                except Exception as e:
-                    logger.error(e)
-
-                try:
-                    role = row[4].strip()
                     if is_pro_version() and role in get_available_roles():
                         User.objects.update_role(username, role)
                 except Exception as e:
                     logger.error(e)
 
                 try:
-                    space_quota_mb = int(row[5])
+                    space_quota_mb = int(row[4])
                     if space_quota_mb >= 0:
                         space_quota = int(space_quota_mb) * get_file_size_unit('MB')
                         seafile_api.set_user_quota(username, space_quota)