From fc85704a31c90eb174f062cbd15fd5a400c7a1ee Mon Sep 17 00:00:00 2001
From: absurdo <antonio.delarosa@salirdelhoyo.com>
Date: Fri, 7 Apr 2023 00:54:25 +0200
Subject: [PATCH] Little fixes

---
 admin/dashboard.py             |  7 +++++--
 templates/admin/progress.phtml | 10 ++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

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;
+      
+  }
   </style>
 </%block>
 <%block name="content">
 <h3>${hostname}</h3>
-<%block name="return_block"></%block>
 <h2>${lang('pastafari2', 'task progress', 'Task progress')} - ${name_task}</h2>
+<div class="return_block"></div>
 <p>${description_task}</p>
 <hr />
 <i class="fa fa-cog fa-spin fa-5x fa-fw margin-bottom" id="gear"></i>
 <div id="progressbar"><div class="progress-label">${lang('pastafari2', 'processing_task', 'Processing task...')}</div></div>
 <div id="no_progress" style="border: solid #cbcbcb 1px;height:150px;overflow:scroll;padding:2px;"></div>
-<%block name="return_bottom_block"></%block>
+<div id="return_block"></div>
 </%block>
 <%block name="jscript_block">
 <script language="Javascript" src="${make_media_url('js/jquery-ui.min.js', 'pastafari2')}"></script>