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
7720e9f3
Commit
7720e9f3
authored
Mar 31, 2017
by
ibuler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Change] 修改图片
parent
61a481f4
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
13 additions
and
9 deletions
+13
-9
terminal_list.html
apps/applications/templates/applications/terminal_list.html
+8
-2
default.png
apps/media/avatar/default.png
+0
-0
default1.png
apps/media/avatar/default/default1.png
+0
-0
default2.png
apps/media/avatar/default/default2.png
+0
-0
default3.png
apps/media/avatar/default/default3.png
+0
-0
default4.png
apps/media/avatar/default/default4.png
+0
-0
default5.png
apps/media/avatar/default/default5.png
+0
-0
default6.png
apps/media/avatar/default/default6.png
+0
-0
_user_profile.html
apps/templates/_user_profile.html
+2
-2
user.py
apps/users/models/user.py
+3
-5
No files found.
apps/applications/templates/applications/terminal_list.html
View file @
7720e9f3
...
@@ -81,9 +81,15 @@ $(document).ready(function(){
...
@@ -81,9 +81,15 @@ $(document).ready(function(){
var
connect_btn
=
'<a href="{% url "applications:terminal-connect" pk=99991937 %}"" class="btn btn-xs btn-warning btn-connect" >{% trans "Connect" %}</a> '
var
connect_btn
=
'<a href="{% url "applications:terminal-connect" pk=99991937 %}"" class="btn btn-xs btn-warning btn-connect" >{% trans "Connect" %}</a> '
.
replace
(
'99991937'
,
cellData
);
.
replace
(
'99991937'
,
cellData
);
if
(
rowData
.
is_accepted
)
{
if
(
rowData
.
is_accepted
)
{
$
(
td
).
html
(
connect_btn
+
update_btn
+
delete_btn
)
{
%
if
user
.
is_superuser
%
}
$
(
td
).
html
(
connect_btn
+
update_btn
+
delete_btn
);
{
%
else
%
}
$
(
td
).
html
(
connect_btn
);
{
%
endif
%
}
}
else
{
}
else
{
$
(
td
).
html
(
accept_btn
+
reject_btn
)
{
%
if
user
.
is_superuser
%
}
$
(
td
).
html
(
accept_btn
+
reject_btn
);
{
%
endif
%
}
}
}
}}
}}
],
],
...
...
apps/media/avatar/default.png
0 → 100644
View file @
7720e9f3
106 KB
apps/media/avatar/default/default1.png
deleted
100644 → 0
View file @
61a481f4
2.61 KB
apps/media/avatar/default/default2.png
deleted
100644 → 0
View file @
61a481f4
2.29 KB
apps/media/avatar/default/default3.png
deleted
100644 → 0
View file @
61a481f4
3.75 KB
apps/media/avatar/default/default4.png
deleted
100644 → 0
View file @
61a481f4
1.11 KB
apps/media/avatar/default/default5.png
deleted
100644 → 0
View file @
61a481f4
1.8 KB
apps/media/avatar/default/default6.png
deleted
100644 → 0
View file @
61a481f4
1.3 KB
apps/templates/_user_profile.html
View file @
7720e9f3
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
</span>
</span>
</a>
</a>
<ul
class=
"dropdown-menu animated fadeInRight m-t-xs"
>
<ul
class=
"dropdown-menu animated fadeInRight m-t-xs"
>
<li><a
value=
"
"
>
{% trans 'Profile' %}
</a></li>
<li><a
href=
"{% url 'users:user-profile' %}
"
>
{% trans 'Profile' %}
</a></li>
<li><a
value=
"
"
>
{% trans 'Profile settings' %}
</a></li>
<li><a
href=
"{% url 'users:user-profile-update' %}
"
>
{% trans 'Profile settings' %}
</a></li>
<li
class=
"divider"
></li>
<li
class=
"divider"
></li>
<li><a
href=
""
>
{% trans 'Logout' %}
</a></li>
<li><a
href=
""
>
{% trans 'Logout' %}
</a></li>
</ul>
</ul>
...
...
apps/users/models/user.py
View file @
7720e9f3
...
@@ -183,11 +183,9 @@ class User(AbstractUser):
...
@@ -183,11 +183,9 @@ class User(AbstractUser):
if
self
.
avatar
:
if
self
.
avatar
:
return
self
.
avatar
.
url
return
self
.
avatar
.
url
else
:
else
:
default_dir
=
os
.
path
.
join
(
settings
.
MEDIA_ROOT
,
'avatar'
,
'default'
)
avatar_dir
=
os
.
path
.
join
(
settings
.
MEDIA_ROOT
,
'avatar'
)
if
os
.
path
.
isdir
(
default_dir
):
if
os
.
path
.
isdir
(
avatar_dir
):
default_avatar_list
=
os
.
listdir
(
default_dir
)
return
os
.
path
.
join
(
settings
.
MEDIA_URL
,
'avatar'
,
'default.png'
)
default_avatar
=
default_avatar_list
[
len
(
self
.
username
)
%
len
(
default_avatar_list
)]
return
os
.
path
.
join
(
settings
.
MEDIA_URL
,
'avatar'
,
'default'
,
default_avatar
)
return
'https://www.gravatar.com/avatar/c6812ab450230979465d7bf288eadce2a?s=120&d=identicon'
return
'https://www.gravatar.com/avatar/c6812ab450230979465d7bf288eadce2a?s=120&d=identicon'
def
generate_reset_token
(
self
):
def
generate_reset_token
(
self
):
...
...
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