Merge pull request Evarisk#1106 from evarisk-kilyan/fix_infinite_redi…

…rect Evarisk#1105 [DocumentAction] fix: infinite redirect when archive
nicolas-eoxia · Oct 14, 2024 · 8a1f949 · 8a1f949
2 parents 0c12749 + 1f8fbbb
commit 8a1f949
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/class/saturnedashboard.class.php b/class/saturnedashboard.class.php
@@ -300,13 +300,13 @@ public function show_dashboard(?array $moreParams = [])
                         print '<table class="noborder centpercent">';
                         print '<tr class="liste_titre">';
                         foreach ($dashboardList['labels'] as $key => $dashboardListLabel) {
-                            print '<td class="nowraponall tdoverflowmax200 ' . (($key != 'Ref') ? 'center' : '') . '">' . $langs->transnoentities($dashboardListLabel) . '</td>';
+                            print '<td class="' . ($conf->browser->layout == 'classic' ? 'nowraponall tdoverflowmax200 ' : '') . (($key != 'Ref') ? 'center' : '') . '">' . $langs->transnoentities($dashboardListLabel) . '</td>';
                         }
                         print '</tr>';
                         foreach ($dashboardList['data'] as $dashboardListDatasets) {
                             print '<tr class="oddeven">';
                             foreach ($dashboardListDatasets as $key => $dashboardGraphDataset) {
-                                print '<td class="nowraponall tdoverflowmax200 ' . (($key != 'Ref') ? 'center ' : '') . $dashboardGraphDataset['morecss'] . '"' . $dashboardGraphDataset['moreAttr'] . '>' . $dashboardGraphDataset['value'] . '</td>';
+                                print '<td class="' . ($conf->browser->layout == 'classic' ? 'nowraponall tdoverflowmax200 ' : '') . (($key != 'Ref') ? 'center ' : '') . $dashboardGraphDataset['morecss'] . '"' . $dashboardGraphDataset['moreAttr'] . '>' . $dashboardGraphDataset['value'] . '</td>';
                             }
                             print '</tr>';
                         }

diff --git a/core/tpl/documents/documents_action.tpl.php b/core/tpl/documents/documents_action.tpl.php
@@ -103,7 +103,7 @@
             $urlToRedirect = preg_replace('/#builddoc$/', '', $urlToRedirect);
             $urlToRedirect = preg_replace('/action=builddoc&?/', '', $urlToRedirect); // To avoid infinite loop.
             $urlToRedirect = preg_replace('/forcebuilddoc=1&?/', '', $urlToRedirect); // To avoid infinite loop.
-            if (empty($shouldRedirect)) {
+            if (!isset($shouldRedirect) || $shouldRedirect) {
                 header('Location: ' . $urlToRedirect);
                 exit;
             }