diff --git a/admin/dashboard.py b/admin/dashboard.py index d9bae9d..d572a24 100644 --- a/admin/dashboard.py +++ b/admin/dashboard.py @@ -280,8 +280,11 @@ def pastafari2_progress(): arr_task=task.set_conditions('WHERE id=%s', [task_id]).select_a_row_where() #print(arr_task) - - return t.load_template('progress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module='admin_app.pastafari2_dashboard', name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname']) + if arr_task: + return t.load_template('progress.phtml', title=I18n.lang('pastafari2', 'task_progress', 'Task progress'), path_module='admin_app.pastafari2_dashboard', name_task=arr_task['name_task'], description_task=arr_task['description_task'], position=position, task_id=task_id, server=arr_task['server'], hostname=arr_task['hostname']) + else: + + return "" diff --git a/templates/admin/progress.phtml b/templates/admin/progress.phtml index 7cd34df..2879845 100644 --- a/templates/admin/progress.phtml +++ b/templates/admin/progress.phtml @@ -14,18 +14,24 @@ color: #fff; text-shadow: 1px 1px 0 #000; } + + .return_block { + + display: none; + + } <%block name="content">

${hostname}

-<%block name="return_block">

${lang('pastafari2', 'task progress', 'Task progress')} - ${name_task}

+

${description_task}


${lang('pastafari2', 'processing_task', 'Processing task...')}
-<%block name="return_bottom_block"> +
<%block name="jscript_block">