Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/index/js/index.js

@@ -534,7 +534,7 @@
         $(document).on('click', '.open-in-app,.show-in-app', function(e)
         {
             var $link = $(this);
-            if($link.is('[data-modal],[data-toggle!="tooltip"],.iframe,.not-in-app')) return;
+            if($link.is('[data-modal],[data-toggle][data-toggle!="tooltip"],.iframe,.not-in-app')) return;
             var url = $link.hasClass('show-in-app') ? '' : ($link.attr('href') || $link.data('url'));
             if(url && url.indexOf('onlybody=yes') > 0) return;
             if(openApp(url, $link.data('app')))

module/my/control.php

@@ -1019,7 +1019,7 @@ class my extends control
         $this->view->programLink      = isset($this->config->programLink)   ? $this->config->programLink   : 'program-browse';
         $this->view->productLink      = isset($this->config->productLink)   ? $this->config->productLink   : 'product-all';
         $this->view->projectLink      = isset($this->config->projectLink)   ? $this->config->projectLink   : 'project-browse';
-        $this->view->executionLink    = isset($this->config->executionLink) ? $this->config->executionLink : 'execution-executionkanban';
+        $this->view->executionLink    = isset($this->config->executionLink) ? $this->config->executionLink : 'execution-task';
         $this->view->preferenceSetted = isset($this->config->preferenceSetted) ? true : false;
 
         $this->display();

module/my/lang/de.php

@@ -102,6 +102,7 @@ $lang->my->projectLinkList['project-index']     = 'By default, go to the most re
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
+    $lang->my->executionLinkList['execution-all']             = 'Enter the execution list by default, you can view all executions';
     $lang->my->executionLinkList['execution-task']            = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
     $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
 }

module/my/lang/en.php

@@ -109,6 +109,7 @@ $lang->my->projectLinkList['project-index']     = 'By default, go to the most re
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
+    $lang->my->executionLinkList['execution-all']             = 'Enter the execution list by default, you can view all executions';
     $lang->my->executionLinkList['execution-task']            = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
     $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
 }

module/my/lang/fr.php

@@ -102,6 +102,7 @@ $lang->my->projectLinkList['project-index']     = 'By default, go to the most re
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
+    $lang->my->executionLinkList['execution-all']             = 'Enter the execution list by default, you can view all executions';
     $lang->my->executionLinkList['execution-task']            = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
     $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
 }

module/my/lang/vi.php

@@ -102,6 +102,7 @@ $lang->my->projectLinkList['project-index']     = 'By default, go to the most re
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
+    $lang->my->executionLinkList['execution-all']             = 'Enter the execution list by default, you can view all executions';
     $lang->my->executionLinkList['execution-task']            = 'By default, enter the list of the most recently executed task, and you can view the task information under the current iteration';
     $lang->my->executionLinkList['execution-executionkanban'] = 'By default, you can enter the execution Kanban to view the execution status of projects in progress';
 }

module/my/lang/zh-cn.php

@@ -109,6 +109,7 @@ $lang->my->projectLinkList['project-index']     = '默认进入最近一个项
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
+    $lang->my->executionLinkList['execution-all']             = '默认进入执行列表，可以查看所有的执行';
     $lang->my->executionLinkList['execution-task']            = '默认进入最近一个执行的任务列表，可以查看当前迭代下的任务信息';
     $lang->my->executionLinkList['execution-executionkanban'] = '默认进入执行看板，可以查看进行中项目的执行情况';
 }

module/my/lang/zh-tw.php

@@ -109,6 +109,7 @@ $lang->my->projectLinkList['project-index']     = '預設進入最近一個項
 $lang->my->executionLinkList = array();
 if($config->systemMode == 'new')
 {
+    $lang->my->executionLinkList['execution-all']             = '默認進入執行清單，可以查看所有的執行';
     $lang->my->executionLinkList['execution-task']            = '預設進入最近一個執行的任務列表，可以查看當前迭代下的任務信息';
     $lang->my->executionLinkList['execution-executionkanban'] = '默認進入執行看板，可以查看進行中項目的執行情况';
 }

module/task/view/edit.html.php

@@ -131,6 +131,7 @@
                     $teamAccounts = array_keys($task->team);
                     foreach($teamAccounts as $teamAccount)
                     {
+                        if(!isset($members[$teamAccount])) continue;
                         $taskMembers[$teamAccount] = $members[$teamAccount];
                     }
                 }