[Bugfix] 修复一些bug

579e74dd · ibuler · cad07434 · 579e74dd · 579e74dd · 579e74dd
Commit 579e74dd authored Jan 23, 2018 by ibuler
15 changed files
--- a/apps/assets/api.py
+++ b/apps/assets/api.py
 # ~*~ coding: utf-8 ~*~
-# Copyright (C) 2014-2017 Beijing DuiZhan Technology Co.,Ltd. All Rights Reserved.
+# Copyright (C) 2014-2018 Beijing DuiZhan Technology Co.,Ltd. All Rights Reserved.
 #
 # Licensed under the GNU General Public License v2.0 (the "License");
 # you may not use this file except in compliance with the License.

--- a/apps/assets/hands.py
+++ b/apps/assets/hands.py
@@ -6,7 +6,7 @@

    Other module of this app shouldn't connect with other app.

-    :copyright: (c) 2014-2017 by Jumpserver Team.
+    :copyright: (c) 2014-2018 by Jumpserver Team.
    :license: GPL v2, see LICENSE for more details.
 """


--- a/apps/locale/zh/LC_MESSAGES/django.mo
+++ b/apps/locale/zh/LC_MESSAGES/django.mo
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
--- a/apps/static/css/jumpserver.css
+++ b/apps/static/css/jumpserver.css
@@ -303,7 +303,7 @@ div.dataTables_wrapper div.dataTables_filter {

 .profile-element div:first-child {
    line-height: 60px;
-    width: 70px;
+    /*width: 70px;*/
    float: left;
    text-align: center;
 }

--- a/apps/templates/_footer.html
+++ b/apps/templates/_footer.html
@@ -4,6 +4,6 @@
        <img style="display: none" src="http://www.jumpserver.org/img/evaluate_avatar1.jpg">
    </div>
    <div>
-        <strong>Copyright</strong> 北京堆栈科技有限公司 &copy; 2014-2017
+        <strong>Copyright</strong> 北京堆栈科技有限公司 &copy; 2014-2018
    </div>
 </div>
\ No newline at end of file
--- a/apps/templates/flash_message_standalone.html
+++ b/apps/templates/flash_message_standalone.html
@@ -52,7 +52,7 @@
                Copyright Jumpserver.org
            </div>
            <div class="col-md-6 text-right">
-               <small>2014-2017</small>
+               <small>2014-2018</small>
            </div>
        </div>
    </div>

--- a/apps/templates/index.html
+++ b/apps/templates/index.html
@@ -163,9 +163,6 @@
                            {% if last_login_ten %}
                                {% for login in last_login_ten %}
                                    <div class="feed-element">
-                                        <a href="#" class="pull-left">
-                                            <img alt="image" class="img-circle" src="/static/img/root.png">
-                                        </a>
                                        <div class="media-body ">
                                            {% ifequal login.is_finished 0 %}
                                                <small class="pull-right text-navy">{{ login.date_start|timesince }} ago</small>

--- a/apps/users/hands.py
+++ b/apps/users/hands.py
@@ -6,7 +6,7 @@

    Other module of this app shouldn't connect with other app.

-    :copyright: (c) 2014-2017 by Jumpserver Team.
+    :copyright: (c) 2014-2018 by Jumpserver Team.
    :license: GPL v2, see LICENSE for more details.
 """


--- a/apps/users/templates/users/forgot_password.html
+++ b/apps/users/templates/users/forgot_password.html
@@ -55,7 +55,7 @@
                Copyright Jumpserver.org
            </div>
            <div class="col-md-6 text-right">
-               <small>© 2014-2017</small>
+               <small>© 2014-2018</small>
            </div>
        </div>
    </div>

--- a/apps/users/templates/users/login.html
+++ b/apps/users/templates/users/login.html
@@ -78,7 +78,7 @@
                Copyright Jumpserver.org
            </div>
            <div class="col-md-6 text-right">
-               <small>© 2014-2017</small>
+               <small>© 2014-2018</small>
            </div>
        </div>
    </div>

--- a/apps/users/templates/users/reset_password.html
+++ b/apps/users/templates/users/reset_password.html
@@ -74,7 +74,7 @@
                Copyright Jumpserver.org
            </div>
            <div class="col-md-6 text-right">
-               <small>© 2014-2017</small>
+               <small>© 2014-2018</small>
            </div>
        </div>
    </div>

--- a/apps/users/templates/users/user_detail.html
+++ b/apps/users/templates/users/user_detail.html
@@ -24,8 +24,9 @@
                            <li class="pull-right">
                                <a class="btn btn-outline btn-default" href="{% url 'users:user-update' pk=user_object.id %}"><i class="fa fa-edit"></i>{% trans 'Update' %}</a>
                            </li>
+
                            <li class="pull-right">
-                                <a class="btn btn-outline btn-danger btn-delete-user">
+                                <a class="btn btn-outline {% if request.user != user_object and user_object.username != "admin" %} btn-danger btn-delete-user {% else %} disabled {% endif %}">
                                    <i class="fa fa-trash-o"></i>{% trans 'Delete' %}
                                </a>
                            </li>
@@ -128,7 +129,7 @@
                                            <td><span class="pull-right">
                                                <div class="switch">
                                                    <div class="onoffswitch">
-                                                        <input type="checkbox" {% if user_object.is_active %} checked {% endif %}  class="onoffswitch-checkbox" id="is_active">
+                                                        <input type="checkbox" {% if user_object.is_active %} checked {% endif %} {% if request.user == user_object %} disabled="disabled" {% endif %} class="onoffswitch-checkbox disabled" id="is_active">
                                                        <label class="onoffswitch-label" for="is_active">
                                                            <span class="onoffswitch-inner"></span>
                                                            <span class="onoffswitch-switch"></span>
@@ -156,7 +157,7 @@
                                            <td>{% trans 'Send reset password mail' %}:</td>
                                            <td>
                                                <span class="pull-right">
-                                                    <button type="button" class="btn btn-primary btn-xs" id="btn-reset-password" style="width: 54px">{% trans 'Send' %}</button>
+                                                    <button type="button" class="btn btn-primary btn-xs" {% if request.user == user_object %} disabled="disabled" {% endif %} id="btn-reset-password" style="width: 54px">{% trans 'Send' %}</button>
                                                </span>
                                            </td>
                                        </tr>
@@ -164,7 +165,7 @@
                                            <td>{% trans 'Send reset ssh key mail' %}:</td>
                                            <td>
                                                <span class="pull-right">
-                                                    <button type="button" class="btn btn-primary btn-xs" id="btn-reset-pk" style="width: 54px;">{% trans 'Send' %}</button>
+                                                    <button type="button" class="btn btn-primary btn-xs" {% if request.user == user_object %} disabled="disabled" {% endif %} id="btn-reset-pk" style="width: 54px;">{% trans 'Send' %}</button>
                                                </span>
                                            </td>
                                        </tr>
@@ -331,7 +332,7 @@ $(document).ready(function() {
    }
    swal({
        title: "{% trans 'Are you sure?' %}",
-        text: "{% trans "This will reset the user's password. A password-reset email will be sent to the user\'s mailbox." %}",
+        text: "{% trans "This will reset the user password and send a reset mail"%}",
        type: "warning",
        showCancelButton: true,
        confirmButtonColor: "#DD6B55",
@@ -356,7 +357,7 @@ $(document).ready(function() {
    }
    swal({
        title: "{% trans 'Are you sure?' %}",
-        text: "{% trans 'This will reset the user\'s public key.' %}",
+        text: "{% trans 'This will reset the user public key and send a reset mail' %}",
        type: "warning",
        showCancelButton: true,
        confirmButtonColor: "#DD6B55",

--- a/apps/users/templates/users/user_list.html
+++ b/apps/users/templates/users/user_list.html
@@ -76,7 +76,7 @@ function initTable() {
                var update_btn = '<a href="{% url "users:user-update" pk=DEFAULT_PK %}" class="btn btn-xs btn-info">{% trans "Update" %}</a>'.replace('00000000-0000-0000-0000-000000000000', cellData);

                var del_btn = "";
-                if (rowData.id === 1 || rowData.username === "admin" || rowData.username === "{{ user.username }}") {
+                if (rowData.id === 1 || rowData.username === "admin" || rowData.username === "{{ request.user.username }}") {
                    del_btn = '<a class="btn btn-xs btn-danger m-l-xs" disabled>{% trans "Delete" %}</a>'
                            .replace('{{ DEFAULT_PK }}', cellData)
                            .replace('99991938', rowData.name);

--- a/apps/users/views/login.py
+++ b/apps/users/views/login.py
@@ -54,7 +54,7 @@ class UserLoginView(FormView):
            return HttpResponse(_("Please enable cookies and try again."))
        auth_login(self.request, form.get_user())
        x_forwarded_for = self.request.META.get('HTTP_X_FORWARDED_FOR', '').split(',')
-        if x_forwarded_for:
+        if x_forwarded_for and x_forwarded_for[0]:
            login_ip = x_forwarded_for[0]
        else:
            login_ip = self.request.META.get('REMOTE_ADDR', '')