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
207004be
Commit
207004be
authored
Dec 20, 2019
by
Michael Shavit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove config_server_url setting.
parent
27d084ce
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
1 addition
and
9 deletions
+1
-9
admin.py
cps/admin.py
+0
-3
config_sql.py
cps/config_sql.py
+0
-1
kobo.py
cps/kobo.py
+1
-1
config_edit.html
cps/templates/config_edit.html
+0
-4
No files found.
cps/admin.py
View file @
207004be
...
...
@@ -296,8 +296,6 @@ def _configuration_update_helper():
reboot_required
|=
_config_string
(
"config_certfile"
)
if
config
.
config_certfile
and
not
os
.
path
.
isfile
(
config
.
config_certfile
):
return
_configuration_result
(
'Certfile location is not valid, please enter correct path'
,
gdriveError
)
_config_string
(
"config_server_url"
)
_config_checkbox_int
(
"config_uploading"
)
_config_checkbox_int
(
"config_anonbrowse"
)
...
...
@@ -595,7 +593,6 @@ def edit_user(user_id):
content
.
default_language
=
to_save
[
"default_language"
]
if
"locale"
in
to_save
and
to_save
[
"locale"
]:
content
.
locale
=
to_save
[
"locale"
]
if
to_save
[
"email"
]
and
to_save
[
"email"
]
!=
content
.
email
:
existing_email
=
ub
.
session
.
query
(
ub
.
User
)
.
filter
(
ub
.
User
.
email
==
to_save
[
"email"
]
.
lower
())
\
.
first
()
...
...
cps/config_sql.py
View file @
207004be
...
...
@@ -49,7 +49,6 @@ class _Settings(_Base):
config_port
=
Column
(
Integer
,
default
=
constants
.
DEFAULT_PORT
)
config_certfile
=
Column
(
String
)
config_keyfile
=
Column
(
String
)
config_server_url
=
Column
(
String
,
default
=
''
)
config_calibre_web_title
=
Column
(
String
,
default
=
u'Calibre-Web'
)
config_books_per_page
=
Column
(
Integer
,
default
=
60
)
...
...
cps/kobo.py
View file @
207004be
...
...
@@ -388,7 +388,7 @@ def HandleAuthRequest():
@
kobo
.
route
(
"/v1/initialization"
)
def
HandleInitRequest
():
resources
=
NATIVE_KOBO_RESOURCES
(
calibre_web_url
=
config
.
config_server_url
)
resources
=
NATIVE_KOBO_RESOURCES
(
calibre_web_url
=
url_for
(
"web.index"
,
_external
=
True
)
.
strip
(
"/"
)
)
response
=
make_response
(
jsonify
({
"Resources"
:
resources
}))
response
.
headers
[
"x-kobo-apitoken"
]
=
"e30="
return
response
...
...
cps/templates/config_edit.html
View file @
207004be
...
...
@@ -104,10 +104,6 @@
<!--option-- value="3" {% if config.config_updatechannel == 3 %}selected{% endif %}>{{_('Nightly (Automatic)')}}</option-->
</select>
</div>
<div
class=
"form-group"
>
<label
for=
"config_server_url"
>
{{_('Server Url. This is only used for the (experimental) Kobo device library sync')}}
</label>
<input
type=
"text"
class=
"form-control"
name=
"config_server_url"
id=
"config_server_url"
value=
"{% if config.config_server_url != None %}{{ config.config_server_url }}{% endif %}"
autocomplete=
"off"
>
</div>
</div>
</div>
</div>
...
...
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