NunoSempere/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'language_edit/master'

Browse Source
This commit is contained in:
Ozzieisaacs 2019-01-03 20:52:46 +01:00
commit 7086c8d1bf
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cps/web.py
View File

@ -586,24 +586,29 @@ def modify_database_object(input_elements, db_book_object, db_object, db_session
db_session.add(new_element) db_session.add(new_element)
db_book_object.append(new_element) db_book_object.append(new_element)
else: else:
if db_type == 'custom' and db_element.value != add_element: if db_type == 'custom':
new_element.value = add_element if db_element.value != add_element:
# new_element = db_element new_element.value = add_element
elif db_type == 'languages' and db_element.lang_code != add_element: # new_element = db_element
db_element.lang_code = add_element elif db_type == 'languages':
# new_element = db_element if db_element.lang_code != add_element:
elif db_type == 'series' and db_element.name != add_element: db_element.lang_code = add_element
db_element.name = add_element # = add_element # new_element = db_object(add_element, add_element) # new_element = db_element
db_element.sort = add_element elif db_type == 'series':
# new_element = db_element if db_element.name != add_element:
elif db_type == 'author' and db_element.name != add_element: db_element.name = add_element # = add_element # new_element = db_object(add_element, add_element)
db_element.name = add_element db_element.sort = add_element
db_element.sort = add_element.replace('|', ',') # new_element = db_element
# new_element = db_element elif db_type == 'author':
if db_type == 'publisher' and db_element.name != add_element: if db_element.name != add_element:
db_element.name = add_element db_element.name = add_element
db_element.sort = None db_element.sort = add_element.replace('|', ',')
# new_element = db_element # new_element = db_element
elif db_type == 'publisher':
if db_element.name != add_element:
db_element.name = add_element
db_element.sort = None
# new_element = db_element
elif db_element.name != add_element: elif db_element.name != add_element:
db_element.name = add_element db_element.name = add_element
# new_element = db_element # new_element = db_element
@ -3533,7 +3538,7 @@ def edit_cc_data(book_id, book, to_save):
input_tags = list(map(lambda it: it.strip(), input_tags)) input_tags = list(map(lambda it: it.strip(), input_tags))
modify_database_object(input_tags, getattr(book, cc_string), db.cc_classes[c.id], db.session, modify_database_object(input_tags, getattr(book, cc_string), db.cc_classes[c.id], db.session,
'custom') 'custom')
return cc return cc
def upload_single_file(request, book, book_id): def upload_single_file(request, book, book_id):
# Check and handle Uploaded file # Check and handle Uploaded file