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
b95f6563
Commit
b95f6563
authored
May 01, 2020
by
Ozzieisaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'read-config/remove-duplicate-read-status-without-filter' into Develop
parents
547bbece
ca2bcc64
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
helper.py
cps/helper.py
+12
-8
web.py
cps/web.py
+1
-1
No files found.
cps/helper.py
View file @
b95f6563
...
...
@@ -860,16 +860,20 @@ def get_search_results(term):
))
.
order_by
(
db
.
Books
.
sort
)
.
all
()
def
get_cc_columns
():
def
get_cc_columns
(
filter_config_custom_read
=
False
):
tmpcc
=
db
.
session
.
query
(
db
.
Custom_Columns
)
.
filter
(
db
.
Custom_Columns
.
datatype
.
notin_
(
db
.
cc_exceptions
))
.
all
()
cc
=
[]
r
=
None
if
config
.
config_columns_to_ignore
:
cc
=
[]
for
col
in
tmpcc
:
r
=
re
.
compile
(
config
.
config_columns_to_ignore
)
if
not
r
.
match
(
col
.
name
):
cc
.
append
(
col
)
else
:
cc
=
tmpcc
r
=
re
.
compile
(
config
.
config_columns_to_ignore
)
for
col
in
tmpcc
:
if
filter_config_custom_read
and
config
.
config_read_column
and
config
.
config_read_column
==
col
.
id
:
continue
if
r
and
r
.
match
(
col
.
label
):
continue
cc
.
append
(
col
)
return
cc
...
...
cps/web.py
View file @
b95f6563
...
...
@@ -1593,7 +1593,7 @@ def show_book(book_id):
except
UnknownLocaleError
:
entries
.
languages
[
index
]
.
language_name
=
_
(
isoLanguages
.
get
(
part3
=
entries
.
languages
[
index
]
.
lang_code
)
.
name
)
cc
=
get_cc_columns
()
cc
=
get_cc_columns
(
filter_config_custom_read
=
True
)
book_in_shelfs
=
[]
shelfs
=
ub
.
session
.
query
(
ub
.
BookShelf
)
.
filter
(
ub
.
BookShelf
.
book_id
==
book_id
)
.
all
()
for
entry
in
shelfs
:
...
...
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