diff --git a/cps/editbooks.py b/cps/editbooks.py index 91134db6..6e06e053 100644 --- a/cps/editbooks.py +++ b/cps/editbooks.py @@ -689,8 +689,7 @@ def upload(): db.session.commit() db.update_title_sort(config) book = db.session.query(db.Books).filter(db.Books.id == book_id).filter(common_filters()).first() - - # upload book to gdrive if nesseccary and add "(bookid)" to folder name + # upload book to gdrive if necessary and add "(bookid)" to folder name if config.config_use_google_drive: gdriveutils.updateGdriveCalibreFromLocal() error = helper.update_dir_stucture(book.id, config.config_calibre_dir) diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html index 77c78783..926657bc 100644 --- a/cps/templates/user_edit.html +++ b/cps/templates/user_edit.html @@ -14,7 +14,7 @@ {% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %} - {% if g.user and g.user.role_admin() and not new_user and not profile and ( mail_configured and content.email if content.email != None %} + {% if g.user and g.user.role_admin() and not new_user and not profile and ( mail_configured and content.email if content.email != None ) %}
{{_('Reset user Password')}}
{% endif %}
diff --git a/cps/web.py b/cps/web.py index 0e394249..92e164f8 100644 --- a/cps/web.py +++ b/cps/web.py @@ -981,11 +981,7 @@ def render_read_books(page, are_read, as_xml=False, order=None, *args, **kwargs) entries, random, pagination = fill_indexpage(page, db.Books, db_filter, order) if as_xml: - currtime = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S+00:00") - xml = render_template(current_time=currtime, instance=config.config_calibre_web_title, *args, **kwargs) - response = make_response(xml) - response.headers["Content-Type"] = "application/xml; charset=utf-8" - return response + return entries, pagination else: if are_read: name = _(u'Read Books') + ' (' + str(len(readBookIds)) + ')'