Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
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
captainwong
douban-api-proxy
Commits
130701a7
Commit
130701a7
authored
Oct 31, 2020
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'sec_fixes/admin_update' into master
parents
ff88e689
8b60a195
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
admin.py
cps/admin.py
+2
-1
web.py
cps/web.py
+1
-0
No files found.
cps/admin.py
View file @
130701a7
...
@@ -1029,7 +1029,8 @@ def send_logfile(logtype):
...
@@ -1029,7 +1029,8 @@ def send_logfile(logtype):
@
admi
.
route
(
"/get_update_status"
,
methods
=
[
'GET'
])
@
admi
.
route
(
"/get_update_status"
,
methods
=
[
'GET'
])
@
login_required_if_no_ano
@
login_required
@
admin_required
def
get_update_status
():
def
get_update_status
():
log
.
info
(
u"Update status requested"
)
log
.
info
(
u"Update status requested"
)
return
updater_thread
.
get_available_updates
(
request
.
method
,
locale
=
get_locale
())
return
updater_thread
.
get_available_updates
(
request
.
method
,
locale
=
get_locale
())
...
...
cps/web.py
View file @
130701a7
...
@@ -308,6 +308,7 @@ def before_request():
...
@@ -308,6 +308,7 @@ def before_request():
@
app
.
route
(
'/import_ldap_users'
)
@
app
.
route
(
'/import_ldap_users'
)
@
login_required
@
login_required
@
admin_required
def
import_ldap_users
():
def
import_ldap_users
():
showtext
=
{}
showtext
=
{}
try
:
try
:
...
...
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