From 9d62deeabe481d90f3b7e878748cd0edce851889 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Fri, 29 Mar 2019 19:14:18 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E5=A4=8D=E5=B0=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#2557)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 修复小问题

* [Bugfix] 修复操作日志动作、资源类型过滤不成功的bug
---
 apps/assets/templates/assets/asset_detail.html              | 2 +-
 apps/audits/templates/audits/operate_log_list.html          | 4 ++--
 apps/authentication/templates/authentication/login_otp.html | 2 +-
 apps/users/templates/users/reset_password.html              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html
index 4ff3bdf75..01c048af8 100644
--- a/apps/assets/templates/assets/asset_detail.html
+++ b/apps/assets/templates/assets/asset_detail.html
@@ -20,7 +20,7 @@
                                 <a href="{% url 'assets:asset-detail' pk=asset.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Asset detail' %} </a>
                             </li>
                             <li>
-                                <a href="{% url 'assets:asset-user-list' pk=asset.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Asset user list' %} </a>
+                                <a href="{% url 'assets:asset-user-list' pk=asset.id %}" class="text-center"><i class="fa fa-bar-chart-o"></i> {% trans 'Asset user list' %} </a>
                             </li>
                             {% if user.is_superuser %}
                             <li class="pull-right">
diff --git a/apps/audits/templates/audits/operate_log_list.html b/apps/audits/templates/audits/operate_log_list.html
index 2de992faa..736c4f7ac 100644
--- a/apps/audits/templates/audits/operate_log_list.html
+++ b/apps/audits/templates/audits/operate_log_list.html
@@ -37,7 +37,7 @@
             </select>
         </div>
         <div class="input-group">
-            <select class="select2 form-control" name="asset">
+            <select class="select2 form-control" name="action">
                 <option value="">{% trans 'Action' %}</option>
                 {% for k, v in actions.items %}
                     <option value="{{ k }}" {% if k == action %} selected {% endif %}>{{ v }}</option>
@@ -45,7 +45,7 @@
             </select>
         </div>
         <div class="input-group">
-            <select class="select2 form-control" name="system_user">
+            <select class="select2 form-control" name="resource_type">
                 <option value="">{% trans 'Resource Type' %}</option>
                 {% for r in resource_type_list %}
                     <option value="{{ r }}" {% if r == resource_type %} selected {% endif %}>{{ r }}</option>
diff --git a/apps/authentication/templates/authentication/login_otp.html b/apps/authentication/templates/authentication/login_otp.html
index d697cdf30..33ddb8e45 100644
--- a/apps/authentication/templates/authentication/login_otp.html
+++ b/apps/authentication/templates/authentication/login_otp.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>  {{ JMS_TITLE }} </title>
-    <link rel="shortcut icon" href="{{ FAVICON_URL }}"" type="image/x-icon">
+    <link rel="shortcut icon" href="{{ FAVICON_URL }}" type="image/x-icon">
     {% include '_head_css_js.html' %}
     <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
     <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
diff --git a/apps/users/templates/users/reset_password.html b/apps/users/templates/users/reset_password.html
index f397acc37..6817f0a75 100644
--- a/apps/users/templates/users/reset_password.html
+++ b/apps/users/templates/users/reset_password.html
@@ -7,7 +7,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title> {{ JMS_TITLE }} </title>
-    <link rel="shortcut icon" href="{{ FAVICON_URL }}" %}" type="image/x-icon">
+    <link rel="shortcut icon" href="{{ FAVICON_URL }}" type="image/x-icon">
     {% include '_head_css_js.html' %}
     <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
     <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>