From 1030e195a5ff8fbd29cfbe360f505282f168c042 Mon Sep 17 00:00:00 2001 From: Ozzieisaacs Date: Sat, 11 May 2019 13:03:38 +0200 Subject: [PATCH] Fix #916 --- cps/helper.py | 8 ++------ cps/web.py | 6 ------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/cps/helper.py b/cps/helper.py index e5874822..9b789f78 100644 --- a/cps/helper.py +++ b/cps/helper.py @@ -130,7 +130,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False): text += "Sincerely\r\n\r\n" text += "Your Calibre-Web team" global_WorkerThread.add_email(_(u'Get Started with Calibre-Web'),None, None, ub.get_mail_settings(), - e_mail, user_name, _(u"Registration e-mail for user: %(name)s", name=user_name), text) + e_mail, None, _(u"Registration e-mail for user: %(name)s", name=user_name), text) return def check_send_to_kindle(entry): @@ -568,17 +568,13 @@ def json_serial(obj): return obj.isoformat() raise TypeError ("Type %s not serializable" % type(obj)) - +# helper function to apply localize status information in tasklist entries def render_task_status(tasklist): - #helper function to apply localize status information in tasklist entries renderedtasklist=list() - # task2 = task for task in tasklist: if task['user'] == current_user.nickname or current_user.role_admin(): - # task2 = copy.deepcopy(task) # = task if task['formStarttime']: task['starttime'] = format_datetime(task['formStarttime'], format='short', locale=web.get_locale()) - # task2['formStarttime'] = "" else: if 'starttime' not in task: task['starttime'] = "" diff --git a/cps/web.py b/cps/web.py index 01bcf737..d194826f 100644 --- a/cps/web.py +++ b/cps/web.py @@ -1643,14 +1643,8 @@ def bookmark(book_id, book_format): @login_required def get_tasks_status(): # if current user admin, show all email, otherwise only own emails - answer=list() - # UIanswer=list() tasks=helper.global_WorkerThread.get_taskstatus() - # answer = tasks - - # UIanswer = copy.deepcopy(answer) answer = helper.render_task_status(tasks) - # foreach row format row return render_title_template('tasks.html', entries=answer, title=_(u"Tasks"), page="tasks")