Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
J
jumpserver
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
jumpserver
Commits
9d62deea
Commit
9d62deea
authored
Mar 29, 2019
by
BaiJiangJie
Committed by
老广
Mar 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Update] 修复小问题 (#2557)
* [Update] 修复小问题 * [Bugfix] 修复操作日志动作、资源类型过滤不成功的bug
parent
3062e3f6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
asset_detail.html
apps/assets/templates/assets/asset_detail.html
+1
-1
operate_log_list.html
apps/audits/templates/audits/operate_log_list.html
+2
-2
login_otp.html
apps/authentication/templates/authentication/login_otp.html
+1
-1
reset_password.html
apps/users/templates/users/reset_password.html
+1
-1
No files found.
apps/assets/templates/assets/asset_detail.html
View file @
9d62deea
...
@@ -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"
>
...
...
apps/audits/templates/audits/operate_log_list.html
View file @
9d62deea
...
@@ -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=
"a
sset
"
>
<select
class=
"select2 form-control"
name=
"a
ction
"
>
<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>
...
...
apps/authentication/templates/authentication/login_otp.html
View file @
9d62deea
...
@@ -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>
...
...
apps/users/templates/users/reset_password.html
View file @
9d62deea
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment