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
27d6df7a
Commit
27d6df7a
authored
Apr 21, 2015
by
halcyon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
解决django低版本不支持first()问题
parent
b65f620f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
11 deletions
+9
-11
views.py
jasset/views.py
+6
-8
views.py
jlog/views.py
+2
-2
api.py
jumpserver/api.py
+1
-1
No files found.
jasset/views.py
View file @
27d6df7a
...
...
@@ -167,7 +167,7 @@ def db_idc_delete(request, idc_id):
idc
=
IDC
.
objects
.
filter
(
id
=
idc_id
)
if
idc
:
idc_class
=
idc
.
first
()
idc_class
=
idc
[
0
]
idc_class
.
asset_set
.
update
(
idc
=
default_idc
)
idc
.
delete
()
else
:
...
...
@@ -330,7 +330,7 @@ def host_edit_common_batch(request):
asset_alias
.
save
()
else
:
AssetAlias
.
objects
.
create
(
user
=
u
,
host
=
a
,
alias
=
j_alias
)
return
my_render
(
'jasset/host_list_common.html'
)
return
my_render
(
'jasset/host_list_common.html'
,
locals
(),
request
)
@require_login
...
...
@@ -539,7 +539,7 @@ def host_detail(request):
post
=
Asset
.
objects
.
filter
(
id
=
host_id
)
if
not
post
:
return
httperror
(
request
,
'没有此主机!'
)
post
=
post
.
first
()
post
=
post
[
0
]
if
is_group_admin
(
request
)
and
not
validate
(
request
,
asset
=
[
host_id
]):
return
httperror
(
request
,
'您无权查看!'
)
...
...
@@ -697,7 +697,7 @@ def group_add(request):
pass
else
:
j_dept
=
DEPT
.
objects
.
filter
(
id
=
j_dept
)
.
first
()
j_dept
=
DEPT
.
objects
.
filter
(
id
=
j_dept
)
[
0
]
group
=
BisGroup
.
objects
.
create
(
name
=
j_group
,
dept
=
j_dept
,
comment
=
j_comment
)
for
host
in
j_hosts
:
g
=
Asset
.
objects
.
get
(
id
=
host
)
...
...
@@ -772,7 +772,7 @@ def group_edit(request):
group_id
=
request
.
GET
.
get
(
'id'
,
''
)
group
=
BisGroup
.
objects
.
filter
(
id
=
group_id
)
if
group
:
group
=
group
.
first
()
group
=
group
[
0
]
else
:
httperror
(
request
,
u'没有这个主机组!'
)
...
...
@@ -918,10 +918,9 @@ def host_search(request):
posts
=
post_all
.
filter
(
dept
=
dept
)
elif
is_common_user
(
request
):
user
name
=
get_session_user_info
(
request
)[
2
]
user
_id
,
username
=
get_session_user_info
(
request
)[
0
:
2
]
post_perm
=
user_perm_asset_api
(
username
)
posts
=
list
(
set
(
post_all
)
&
set
(
post_perm
))
contact_list
,
p
,
contacts
,
page_range
,
current_page
,
show_first
,
show_end
=
pages
(
posts
,
request
)
return
my_render
(
'jasset/host_search.html'
,
locals
(),
request
)
\ No newline at end of file
jlog/views.py
View file @
27d6df7a
...
...
@@ -71,7 +71,7 @@ def log_kill(request):
pid
=
request
.
GET
.
get
(
'id'
,
''
)
log
=
Log
.
objects
.
filter
(
pid
=
pid
)
if
log
:
log
=
log
.
first
()
log
=
log
[
0
]
dept_name
=
log
.
dept_name
deptname
=
get_session_user_info
(
request
)[
4
]
if
is_group_admin
(
request
)
and
dept_name
!=
deptname
:
...
...
@@ -89,7 +89,7 @@ def log_history(request):
log_id
=
request
.
GET
.
get
(
'id'
,
0
)
log
=
Log
.
objects
.
filter
(
id
=
int
(
log_id
))
if
log
:
log
=
log
.
first
()
log
=
log
[
0
]
dept_name
=
log
.
dept_name
deptname
=
get_session_user_info
(
request
)[
4
]
if
is_group_admin
(
request
)
and
dept_name
!=
deptname
:
...
...
jumpserver/api.py
View file @
27d6df7a
...
...
@@ -254,7 +254,7 @@ def get_session_user_info(request):
user_id
=
request
.
session
.
get
(
'user_id'
,
0
)
user
=
User
.
objects
.
filter
(
id
=
user_id
)
if
user
:
user
=
user
.
first
()
user
=
user
[
0
]
dept
=
user
.
dept
return
[
user
.
id
,
user
.
username
,
user
,
dept
.
id
,
dept
.
name
,
dept
]
...
...
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