Merge branch 'sprint/master_lanzongjun_fixbug_nopermission' into 'master'

* fix bug no permisssion See merge request easycorp/zentaopms!2347
2022-03-18 01:51:46 +00:00
parent 7216dbd7c9 3fefbe3699
commit 897ae6e1b2
1 changed files with 14 additions and 1 deletions
@@ -25,7 +25,20 @@ public function setMenu($executionID, $buildID = 0, $extra = '')
    $modulePageNav .= "<ul class='dropdown-menu'>";
    foreach($kanbanList as $kanbanID => $kanban)
    {
-        $modulePageNav .=  '<li>' . html::a(helper::createLink($this->app->rawModule, $this->app->rawMethod, "execution=$kanban->id"), $kanban->name) . '</li>';
+        if($this->session->kanbanview && strpos('|kanban|task|calendar|gantt|tree|grouptask|', "|{$this->session->kanbanview}|") !== false)
+        {
+            $method = $this->session->kanbanview;
+        }
+        elseif($this->cookie->kanbanview && strpos('|kanban|task|calendar|gantt|tree|grouptask|', "|{$this->cookie->kanbanview}|") !== false)
+        {
+            $method = $this->cookie->kanbanview;
+        }
+        else
+        {
+            $method = 'kanban';
+        }
+
+        $modulePageNav .=  '<li>' . html::a(helper::createLink('execution', $method, "execution=$kanban->id"), $kanban->name) . '</li>';
    }
    $modulePageNav .= "</ul></div></div>";