[TikiWiki-commits] [Git][tikiwiki/tiki][master] More task queue fixes

Jonny Bradley pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
59a483bd by Jonny Bradley at 2026-01-08T17:11:35+00:00
More task queue fixes
---
* [FIX] queue: Make queued_tasks_banner obey the feature pref

* [FIX] queue: Add queued_tasks_banner to the rest of the layout templates (social already had them)

See merge request tikiwiki/tiki!9329

- - - - -


5 changed files:

- lib/smarty_tiki/FunctionHandler/QueuedTasksBanner.php
- templates/layouts/admin/layout_view.tpl
- templates/layouts/basic/layout_view.tpl
- templates/layouts/classic/layout_view.tpl
- templates/layouts/layout_plain.tpl


Changes:

=====================================
lib/smarty_tiki/FunctionHandler/QueuedTasksBanner.php
=====================================
@@ -16,12 +16,18 @@ class QueuedTasksBanner extends Base
 {
     public function handle($params, Template $template)
     {
-        $smarty = TikiLib::lib('smarty');
-        $result = QueuedTaskBanner::get();
-        if (empty($result)) {
+        global $prefs;
+
+        if ($prefs['feature_queued_tasks'] === 'y') {
+            $smarty = TikiLib::lib('smarty');
+            $result = QueuedTaskBanner::get();
+            if (empty($result)) {
+                return '';
+            }
+            $smarty->assign('queuedInfo', $result);
+            return $smarty->fetch('queuedtasks/alert.tpl');
+        } else {
             return '';
         }
-        $smarty->assign('queuedInfo', $result);
-        return $smarty->fetch('queuedtasks/alert.tpl');
     }
 }


=====================================
templates/layouts/admin/layout_view.tpl
=====================================
@@ -34,19 +34,20 @@
                 <div class="page-content-top-margin"  style="height: var(--tiki-page-content-top-margin)"></div>
                 <div class="col col1 col-md-12 pb-4" id="col1">
                     <div id="feedback" role="alert">
-                    {feedback}
+                        {feedback}
                     </div>
-                {block name=quicknav}{/block}
-                {block name=title}{/block}
-                {block name=navigation}{/block}
+                    {queued_tasks_banner}
+                    {block name=quicknav}{/block}
+                    {block name=title}{/block}
+                    {block name=navigation}{/block}
                     <main>
                         <div class="admin-wrapper highlightable">
                             <aside class="admin-nav">
-            {include file='admin/include_anchors.tpl'}
+                                {include file='admin/include_anchors.tpl'}
                             </aside>
                             <div class="admin-content w-100 mx-3-lg">
-            {include file="admin/admin_navbar.tpl"}
-            {block name=content}{/block}
+                                {include file="admin/admin_navbar.tpl"}
+                                {block name=content}{/block}
                             </div>
                         </div>
                     </main>


=====================================
templates/layouts/basic/layout_view.tpl
=====================================
@@ -60,6 +60,7 @@
                 <div id="feedback" role="alert">
                     {feedback}
                 </div>
+                {queued_tasks_banner}
                 {block name=quicknav}{/block}
                 {block name=title}{/block}
                 {block name=navigation}{/block}
@@ -81,6 +82,7 @@
                     <div id="feedback" role="alert">
                         {feedback}
                     </div>
+                        {queued_tasks_banner}
                     {block name=quicknav}{/block}
                     </div>
                     <div class="d-none d-lg-flex">
@@ -126,6 +128,7 @@
                         <div id="feedback" role="alert">
                             {feedback}
                         </div>
+                        {queued_tasks_banner}
                         {block name=quicknav}{/block}
                     </div>
                 </div>
@@ -162,6 +165,7 @@
                         <div id="feedback" role="alert">
                             {feedback}
                         </div>
+                        {queued_tasks_banner}
                         {block name=quicknav}{/block}
                     </div>
                     <div class="d-none d-lg-block">


=====================================
templates/layouts/classic/layout_view.tpl
=====================================
@@ -69,6 +69,7 @@
                             <div id="feedback" role="alert">
                                 {feedback}
                             </div>
+                            {queued_tasks_banner}
                             {block name=quicknav}{/block}
                             {block name=title}{/block}
                             {block name=navigation}{/block}
@@ -91,6 +92,7 @@
                                 <div id="feedback" role="alert">
                                     {feedback}
                                 </div>
+                                {queued_tasks_banner}
                                 {block name=quicknav}{/block}
                             </div>
                             <div class="d-none d-lg-flex">
@@ -138,6 +140,7 @@
                                     <div id="feedback" role="alert">
                                         {feedback}
                                     </div>
+                                    {queued_tasks_banner}
                                     {block name=quicknav}{/block}
                                 </div>
                             </div>
@@ -176,6 +179,7 @@
                                     <div id="feedback" role="alert">
                                         {feedback}
                                     </div>
+                                    {queued_tasks_banner}
                                     {block name=quicknav}{/block}
                                 </div>
                                 <div class="d-none d-lg-block">


=====================================
templates/layouts/layout_plain.tpl
=====================================
@@ -40,6 +40,7 @@
                     {block name=title}{/block}
                     {block name=navigation}{/block}
                     {feedback}
+                    {queued_tasks_banner}
                     {block name=content}{/block}
                 </div>
             </div>



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/59a483bdc23a4d06ff7af6c7dcd216aa1a0538d9

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/59a483bdc23a4d06ff7af6c7dcd216aa1a0538d9
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs