From 4dbf6940e67c808e858e7b8bc8fa65e6f36a2252 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Fri, 12 Aug 2022 16:39:07 +0800
Subject: [PATCH] * Fix bug #26395.

---
 module/execution/model.php             |  2 +-
 module/programplan/view/gantt.html.php | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 5c441b0f47..14d8e21126 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -100,7 +100,7 @@ class executionModel extends model
             include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
         }
 
-        if(isset($execution->cal) and $execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist);
+        if(isset($execution->acl) and $execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist);
 
         if($execution and $execution->lifetime == 'ops')
         {
diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php
index b096d6d64a..d58bde8cf0 100644
--- a/module/programplan/view/gantt.html.php
+++ b/module/programplan/view/gantt.html.php
@@ -70,12 +70,17 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;}
 <?php js::set('module', $app->rawModule);?>
 <?php js::set('method', $app->rawMethod);?>
 <?php js::set('ganttType', $ganttType);?>
-<?php js::set('showFields', $showFields);?>
+<?php js::set('showFields', $this->config->programplan->ganttCustom->ganttFields);?>
 <?php js::set('canGanttEdit', common::hasPriv('programplan', 'ganttEdit'));?>
 <div id='mainContent' class='main-content load-indicator' data-loading='<?php echo $lang->programplan->exporting;?>'>
   <div class="pull-right btn-toolbar">
-    <?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=programplan&section=ganttCustom&key=ganttFields')?>
-    <?php include '../../common/view/customfield.html.php';?>
+  <?php
+  if($this->app->getMethodName() == 'browse')
+  {
+      $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=programplan&section=ganttCustom&key=ganttFields');
+      include '../../common/view/customfield.html.php';
+  }
+  ?>
   </div>
   <form class="main-form form-ajax not-watch">
     <div class="example">
@@ -475,12 +480,15 @@ $(function()
 
     <?php
     $userList = array();
-    foreach($users as $account => $realname)
+    if(!empty($users))
     {
-        $user = array();
-        $user['key']   = $account;
-        $user['label'] = $realname;
-        $userList[]    = $user;
+        foreach($users as $account => $realname)
+        {
+            $user = array();
+            $user['key']   = $account;
+            $user['label'] = $realname;
+            $userList[]    = $user;
+        }
     }
     ?>
     gantt.serverList("userList", <?php echo json_encode($userList);?>);