diff --git a/module/index/js/index.js b/module/index/js/index.js index b76963b645..77b720a634 100644 --- a/module/index/js/index.js +++ b/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'))) diff --git a/module/my/control.php b/module/my/control.php index 9194ec88ec..53f016724a 100644 --- a/module/my/control.php +++ b/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(); diff --git a/module/my/lang/de.php b/module/my/lang/de.php index 686967d4f7..b70fb5fe7c 100644 --- a/module/my/lang/de.php +++ b/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'; } diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 62b0311a4e..5795a6a935 100644 --- a/module/my/lang/en.php +++ b/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'; } diff --git a/module/my/lang/fr.php b/module/my/lang/fr.php index 686967d4f7..b70fb5fe7c 100644 --- a/module/my/lang/fr.php +++ b/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'; } diff --git a/module/my/lang/vi.php b/module/my/lang/vi.php index 686967d4f7..b70fb5fe7c 100644 --- a/module/my/lang/vi.php +++ b/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'; } diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 5a20a1e225..6fd0e3f26e 100644 --- a/module/my/lang/zh-cn.php +++ b/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'] = '默认进入执行看板,可以查看进行中项目的执行情况'; } diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php index 35b1995570..3dab622dd5 100644 --- a/module/my/lang/zh-tw.php +++ b/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'] = '默認進入執行看板,可以查看進行中項目的執行情况'; } diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 57ca6fd300..7f8a9f9ce3 100644 --- a/module/task/view/edit.html.php +++ b/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]; } } diff --git a/www/js/zui/min.js b/www/js/zui/min.js index 7c19c6841c..5c3e624550 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -76,4 +76,4 @@ function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"= */ function(t){function e(e){if("string"==typeof e.data){var i=e.handler,n=e.data.toLowerCase().split(" ");e.handler=function(e){if(this===e.target||!/textarea|select/i.test(e.target.nodeName)&&"text"!==e.target.type){var o="keypress"!==e.type&&t.hotkeys.specialKeys[e.which],a=String.fromCharCode(e.which).toLowerCase(),s="",r={};e.altKey&&"alt"!==o&&(s+="alt+"),e.ctrlKey&&"ctrl"!==o&&(s+="ctrl+"),e.metaKey&&!e.ctrlKey&&"meta"!==o&&(s+="meta+"),e.shiftKey&&"shift"!==o&&(s+="shift+"),o?r[s+o]=!0:(r[s+a]=!0,r[s+t.hotkeys.shiftNums[a]]=!0,"shift+"===s&&(r[t.hotkeys.shiftNums[a]]=!0));for(var l=0,h=n.length;l","/":"?","\\":"|"}},t.each(["keydown","keyup","keypress"],function(){t.event.special[this]={add:e}})}(jQuery),function(t){"use strict";function e(e,i){if(e===!1)return e;if(!e)return i;e===!0?e={add:!0,"delete":!0,edit:!0,sort:!0}:"string"==typeof e&&(e=e.split(","));var n;return Array.isArray(e)&&(n={},t.each(e,function(e,i){t.isPlainObject(i)?n[i.action]=i:n[i]=!0}),e=n),t.isPlainObject(e)&&(n={},t.each(e,function(e,i){i?n[e]=t.extend({type:e},s[e],t.isPlainObject(i)?i:null):n[e]=!1}),e=n),i?t.extend(!0,{},i,e):e}function i(e,i,n){return i=i||e.type,t(n||e.template).addClass("tree-action").attr(t.extend({"data-type":i,title:e.title||""},e.attr)).data("action",e)}var n="zui.tree",o=0,a=function(e,i){this.name=n,this.$=t(e),this.getOptions(i),this._init()},s={sort:{template:''},add:{template:''},edit:{template:''},"delete":{template:''}};a.DEFAULTS={animate:null,initialState:"normal",toggleTemplate:''},a.prototype.add=function(e,i,n,o,a){var s,r=t(e),l=this.options;if(r.is("li")?(s=r.children("ul"),s.length||(s=t("