Commit 9d62deea authored by BaiJiangJie's avatar BaiJiangJie Committed by 老广

[Update] 修复小问题 (#2557)

* [Update] 修复小问题

* [Bugfix] 修复操作日志动作、资源类型过滤不成功的bug
parent 3062e3f6
...@@ -20,7 +20,7 @@ ...@@ -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> <a href="{% url 'assets:asset-detail' pk=asset.id %}" class="text-center"><i class="fa fa-laptop"></i> {% trans 'Asset detail' %} </a>
</li> </li>
<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> </li>
{% if user.is_superuser %} {% if user.is_superuser %}
<li class="pull-right"> <li class="pull-right">
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</select> </select>
</div> </div>
<div class="input-group"> <div class="input-group">
<select class="select2 form-control" name="asset"> <select class="select2 form-control" name="action">
<option value="">{% trans 'Action' %}</option> <option value="">{% trans 'Action' %}</option>
{% for k, v in actions.items %} {% for k, v in actions.items %}
<option value="{{ k }}" {% if k == action %} selected {% endif %}>{{ v }}</option> <option value="{{ k }}" {% if k == action %} selected {% endif %}>{{ v }}</option>
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</select> </select>
</div> </div>
<div class="input-group"> <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> <option value="">{% trans 'Resource Type' %}</option>
{% for r in resource_type_list %} {% for r in resource_type_list %}
<option value="{{ r }}" {% if r == resource_type %} selected {% endif %}>{{ r }}</option> <option value="{{ r }}" {% if r == resource_type %} selected {% endif %}>{{ r }}</option>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> {{ JMS_TITLE }} </title> <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' %} {% include '_head_css_js.html' %}
<link href="{% static "css/jumpserver.css" %}" rel="stylesheet"> <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
<script type="text/javascript" src="{% url 'javascript-catalog' %}"></script> <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> {{ JMS_TITLE }} </title> <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' %} {% include '_head_css_js.html' %}
<link href="{% static "css/jumpserver.css" %}" rel="stylesheet"> <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
<script type="text/javascript" src="{% url 'javascript-catalog' %}"></script> <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment