From 9691ae8a735cffe61738b3d5bedce045fdddb417 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 14 Sep 2021 15:07:38 +0800 Subject: [PATCH 001/163] * Fix bug #15160,15159. --- module/product/model.php | 2 +- module/qa/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/product/model.php b/module/product/model.php index ed1443a4ae..9f78b9598a 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1984,7 +1984,7 @@ class productModel extends model */ public function setMenu($productID, $branch = 0, $module = 0, $moduleType = '', $extra = '') { - if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0) die(js::error($this->lang->product->accessDenied) . js::locate('back')); + if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0 and !defined('TUTORIAL')) die(js::error($this->lang->product->accessDenied) . js::locate('back')); $product = $this->getByID($productID); $params = array('branch' => $branch); diff --git a/module/qa/model.php b/module/qa/model.php index 4d917fbf75..195735848a 100644 --- a/module/qa/model.php +++ b/module/qa/model.php @@ -23,7 +23,7 @@ class qaModel extends model */ public function setMenu($products, $productID, $branch = 0, $extra = '') { - if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0) + if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0 and !defined('TUTORIAL')) { $this->app->loadLang('product'); die(js::error($this->lang->product->accessDenied) . js::locate('back')); From 825184e665cf286a022e6da957261acc63e1615a Mon Sep 17 00:00:00 2001 From: liyuchun Date: Tue, 14 Sep 2021 15:08:38 +0800 Subject: [PATCH 002/163] * Adjust new feature style. --- module/misc/css/features.css | 4 ++-- module/misc/view/features.html.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/misc/css/features.css b/module/misc/css/features.css index 84860397e5..7d53ba6739 100644 --- a/module/misc/css/features.css +++ b/module/misc/css/features.css @@ -2,7 +2,7 @@ #features > header {text-align: center;} #features > footer {text-align: center; padding-top: 18px; border-top: 1px solid #eee} -#featuresNav {display: inline-block; font-size: 15px; margin-bottom: 15px;} +#featuresNav {display: inline-block; font-size: 15px; margin-bottom: 5px;} #featuresNav > li > a {opacity: .5;} #featuresNav > li > a:hover {opacity: 1;} #featuresNav > li.active > a {background-color: transparent; font-weight: bold; opacity: .7;} @@ -13,7 +13,7 @@ #featuresCarousel .carousel-indicators li {border-color: #d8d8d8; background-color: #d8d8d8; width: 12px; height: 12px;} #featuresCarousel .carousel-indicators li + li {margin-left: 10px !important;} #featuresCarousel .carousel-indicators .active {border-color: #73b1df; background-color: #73b1df; margin: 1px;} -#featuresCarousel .carousel-inner .download-file {position: absolute; right: 95px; bottom: 0; font-size: 12px;} +#featuresCarousel .carousel-inner .download-file {position: absolute; right: 110px; bottom: 0; font-size: 12px;} #features [data-slide-to] {pointer-events: none;} #features.enabled [data-slide-to] {pointer-events: auto;} diff --git a/module/misc/view/features.html.php b/module/misc/view/features.html.php index 842c513515..c4632195cc 100644 --- a/module/misc/view/features.html.php +++ b/module/misc/view/features.html.php @@ -21,7 +21,7 @@
$feature): ?> -
' style='height: 400px'> +
' style='height: 395px'>
From 7f748cfa0e8fb0a1829c06654b70d9fdcb009667 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 14 Sep 2021 15:13:35 +0800 Subject: [PATCH 003/163] * Fix bug #15101. --- module/tutorial/lang/en.php | 14 +++++++------- module/tutorial/lang/zh-cn.php | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index 908f244282..90c8cf2a60 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -54,28 +54,28 @@ $lang->tutorial->tasks['createStory']['desc'] = "

Create a story:

  • tutorial->tasks['createProject'] = array('title' => 'Create a ' . $lang->executionCommon); $lang->tutorial->tasks['createProject']['mode'] = 'new'; -$lang->tutorial->tasks['createProject']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->projectCommon); -$lang->tutorial->tasks['createProject']['desc'] = "

    Create a {$lang->projectCommon}:

    • Open {$lang->projectCommon} New Page;
    • Fill the form with {$lang->projectCommon} information;
    • Save
    "; +$lang->tutorial->tasks['createProject']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create Project'); +$lang->tutorial->tasks['createProject']['desc'] = "

    Create a project:

    • Open Project New Page;
    • Fill the form with project information;
    • Save
    "; -$lang->tutorial->tasks['manageTeam'] = array('title' => "Manage {$lang->projectCommon} Team"); +$lang->tutorial->tasks['manageTeam'] = array('title' => "Manage Project Team"); $lang->tutorial->tasks['manageTeam']['mode'] = 'new'; $lang->tutorial->tasks['manageTeam']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'vars' => 'projectID=0', 'form' => '#teamForm', 'requiredFields' => 'accounts1,accounts', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); -$lang->tutorial->tasks['manageTeam']['desc'] = "

    Manage {$lang->projectCommon} team members:

    • Open {$lang->projectCommon} Team Manage Team Members Page；
    • Choose users for the team.
    • Save
    "; +$lang->tutorial->tasks['manageTeam']['desc'] = "

    Manage project team members:

    • Open Project Team Manage Team Members Page；
    • Choose users for the team.
    • Save
    "; $lang->tutorial->tasks['createProjectExecution'] = array('title' => 'Create a ' . $lang->executionCommon); $lang->tutorial->tasks['createProjectExecution']['mode'] = 'new'; $lang->tutorial->tasks['createProjectExecution']['nav'] = array('app' => 'project', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="execution"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => 'Create' . $lang->executionCommon); -$lang->tutorial->tasks['createProjectExecution']['desc'] = "

    Create a new {$lang->executionCommon}：

    • Open {$lang->projectCommon} {$lang->executionCommon} list Create {$lang->executionCommon};
    • Fill the form with {$lang->executionCommon} information；
    • Save {$lang->executionCommon}
    "; +$lang->tutorial->tasks['createProjectExecution']['desc'] = "

    Create a new {$lang->executionCommon}：

    • Open Project {$lang->executionCommon} list Create {$lang->executionCommon};
    • Fill the form with {$lang->executionCommon} information；
    • Save {$lang->executionCommon}
    "; $lang->tutorial->tasks['createExecution'] = array('title' => 'Create a ' . $lang->executionCommon); $lang->tutorial->tasks['createExecution']['mode'] = 'classic'; $lang->tutorial->tasks['createExecution']['nav'] = array('app' => 'execution', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => 'Create ' . $lang->executionCommon); -$lang->tutorial->tasks['createExecution']['desc'] = "

    Create a new {$lang->executionCommon}：

    • Open {$lang->projectCommon} {$lang->executionCommon} list Create {$lang->executionCommon};
    • Fill the form with {$lang->executionCommon} information；
    • Save {$lang->executionCommon}
    "; +$lang->tutorial->tasks['createExecution']['desc'] = "

    Create a new {$lang->executionCommon}：

    • Open Project {$lang->executionCommon} list Create {$lang->executionCommon};
    • Fill the form with {$lang->executionCommon} information；
    • Save {$lang->executionCommon}
    "; $lang->tutorial->tasks['manageExecutionTeam'] = array('title' => "Manage Team"); $lang->tutorial->tasks['manageExecutionTeam']['mode'] = 'classic'; $lang->tutorial->tasks['manageExecutionTeam']['nav'] = array('app' => 'execution', 'module' => 'execution', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#executionTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="team"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); -$lang->tutorial->tasks['manageExecutionTeam']['desc'] = "

    Manage {$lang->projectCommon} team members:

    • Open {$lang->projectCommon} Team Manage Team Members Page；
    • Choose users for the team.
    • Save
    "; +$lang->tutorial->tasks['manageExecutionTeam']['desc'] = "

    Manage project team members:

    • Open Project Team Manage Team Members Page；
    • Choose users for the team.
    • Save
    "; $lang->tutorial->tasks['linkStory'] = array('title' => 'Link a Story'); $lang->tutorial->tasks['linkStory']['mode'] = 'new'; diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index 2337d17285..3cc72ca6bf 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -52,25 +52,25 @@ $lang->tutorial->tasks['createStory'] = array('title' => "创建{$lang-> $lang->tutorial->tasks['createStory']['nav'] = array('app' => 'product', 'module' => 'story', 'method' => 'create', 'menuModule' => 'story', 'menu' => '#productTableList>tr:not(.has-nest-child):first>.c-name>a,#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-story-btn', 'target' => '.create-story-btn', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => "提{$lang->SRCommon}"); $lang->tutorial->tasks['createStory']['desc'] = "

    在系统创建一个新的{$lang->SRCommon}：

    • 打开 {$lang->productCommon} {$lang->SRCommon} 提{$lang->SRCommon} 页面；
    • 在{$lang->productCommon}表单中填写要创建的{$lang->SRCommon}信息；
    • 保存{$lang->SRCommon}信息。
    "; -$lang->tutorial->tasks['createProject'] = array('title' => '创建' . $lang->projectCommon); +$lang->tutorial->tasks['createProject'] = array('title' => '创建项目'); $lang->tutorial->tasks['createProject']['mode'] = 'new'; -$lang->tutorial->tasks['createProject']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->projectCommon); -$lang->tutorial->tasks['createProject']['desc'] = "

    在系统创建一个新的{$lang->projectCommon}：

    • 打开 {$lang->projectCommon} {$lang->projectCommon}列表 创建{$lang->projectCommon} 页面；
    • 在{$lang->projectCommon}表单中填写要创建的{$lang->projectCommon}信息；
    • 保存{$lang->projectCommon}信息。
    "; +$lang->tutorial->tasks['createProject']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加项目'); +$lang->tutorial->tasks['createProject']['desc'] = "

    在系统创建一个新的项目：

    • 打开 项目 项目列表 创建项目 页面；
    • 在项目表单中填写要创建的项目信息；
    • 保存项目信息。
    "; -$lang->tutorial->tasks['manageTeam'] = array('title' => "管理{$lang->projectCommon}团队"); +$lang->tutorial->tasks['manageTeam'] = array('title' => '管理项目团队'); $lang->tutorial->tasks['manageTeam']['mode'] = 'new'; $lang->tutorial->tasks['manageTeam']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'vars' => 'projectID=0', 'form' => '#teamForm', 'requiredFields' => 'accounts1', 'submit' => '#submit', 'targetPageName' => '团队管理'); -$lang->tutorial->tasks['manageTeam']['desc'] = "

    管理{$lang->projectCommon}团队成员：

    • 打开 {$lang->projectCommon} 设置 团队 团队管理 页面；
    • 选择要加入{$lang->projectCommon}团队的成员；
    • 保存团队成员信息。
    "; +$lang->tutorial->tasks['manageTeam']['desc'] = "

    管理项目团队成员：

    • 打开 项目 设置 团队 团队管理 页面；
    • 选择要加入项目团队的成员；
    • 保存团队成员信息。
    "; $lang->tutorial->tasks['createProjectExecution'] = array('title' => '添加' . $lang->executionCommon); $lang->tutorial->tasks['createProjectExecution']['mode'] = 'new'; $lang->tutorial->tasks['createProjectExecution']['nav'] = array('app' => 'project', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="execution"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => '添加' . $lang->executionCommon); -$lang->tutorial->tasks['createProjectExecution']['desc'] = "

    在系统创建一个新的{$lang->executionCommon}：

    • 打开 {$lang->projectCommon} {$lang->executionCommon} 添加{$lang->executionCommon} 页面；
    • 在{$lang->executionCommon}表单中填写要创建的{$lang->executionCommon}信息；
    • 保存{$lang->executionCommon}信息。
    "; +$lang->tutorial->tasks['createProjectExecution']['desc'] = "

    在系统创建一个新的{$lang->executionCommon}：

    • 打开 项目 {$lang->executionCommon} 添加{$lang->executionCommon} 页面；
    • 在{$lang->executionCommon}表单中填写要创建的{$lang->executionCommon}信息；
    • 保存{$lang->executionCommon}信息。
    "; $lang->tutorial->tasks['createExecution'] = array('title' => '创建' . $lang->executionCommon); $lang->tutorial->tasks['createExecution']['mode'] = 'classic'; $lang->tutorial->tasks['createExecution']['nav'] = array('app' => 'execution', 'module' => 'execution', 'method' => 'create', 'menuModule' => 'browse', 'menu' => '#heading>.header-btn:first,#navbar>.nav>li[data-id="all"],.create-execution-btn', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-execution-btn', 'targetPageName' => '添加' . $lang->executionCommon); -$lang->tutorial->tasks['createExecution']['desc'] = "

    在系统创建一个新的{$lang->executionCommon}：

    • 打开 {$lang->projectCommon} {$lang->executionCommon}列表 添加{$lang->executionCommon} 页面；
    • 在表单中填写要创建的{$lang->executionCommon}信息；
    • 保存{$lang->executionCommon}信息。
    "; +$lang->tutorial->tasks['createExecution']['desc'] = "

    在系统创建一个新的{$lang->executionCommon}：

    • 打开 项目 {$lang->executionCommon}列表 添加{$lang->executionCommon} 页面；
    • 在表单中填写要创建的{$lang->executionCommon}信息；
    • 保存{$lang->executionCommon}信息。
    "; $lang->tutorial->tasks['manageExecutionTeam'] = array('title' => "管理团队"); $lang->tutorial->tasks['manageExecutionTeam']['mode'] = 'classic'; From 7e4e07d82cbf01dc071d6e1c7839b3701cc038af Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 14 Sep 2021 15:15:41 +0800 Subject: [PATCH 004/163] * Fix bug #14892. --- module/block/view/projectblock.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index 99560cca63..64d8750cc1 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -27,7 +27,7 @@ createLink('project', 'index', "programID={$project->id}");?> name);?> - PM, $project->PM)?> + PM, $project->PM)?> project->statusList, $project->status);?> From 47da26c5c84a18b8f984e0acc1fbe9ea9a55ab3d Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 14 Sep 2021 15:39:36 +0800 Subject: [PATCH 005/163] * Fix bug#15149. --- module/execution/css/executionkanban.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/execution/css/executionkanban.css b/module/execution/css/executionkanban.css index 9312d4b9a4..f941cab7f2 100644 --- a/module/execution/css/executionkanban.css +++ b/module/execution/css/executionkanban.css @@ -1,4 +1,4 @@ -.main-table .table {cursor: default;} +.main-table .table {cursor: default; border-collapse: unset;} .boards {display: table; table-layout: fixed; width: 100%; min-width: 140px;} .board {display: table-cell; width: 25%; padding: 10px;} @@ -12,7 +12,7 @@ #kanban thead > tr > th:not(:last-child) {border-right: 2px solid #efefef;} #kanban tbody > tr > td {line-height: 24px;} #kanban tbody > tr > td {background-color: #F5F5F5;} -#kanban tbody > tr:not(:last-child) {border-bottom: 5px solid #fff !important;} +#kanban tbody > tr:not(:last-child) > td {border-bottom: 5px solid #fff !important;} .s-doing .table-row .table-col:last-child, .c-progress {width: 30px; padding-left: 3px; padding-top: 1px;} .table-row .table-col:first-child, .board-project {overflow: hidden; white-space: nowrap;} From b7696df6ce10f26a18378739b6cf1c62949718af Mon Sep 17 00:00:00 2001 From: liyuchun Date: Tue, 14 Sep 2021 15:48:07 +0800 Subject: [PATCH 006/163] * Update skip guide key. --- db/update15.4.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/db/update15.4.sql b/db/update15.4.sql index d9043824ac..5fe0aa4e68 100644 --- a/db/update15.4.sql +++ b/db/update15.4.sql @@ -1,6 +1,7 @@ UPDATE `zt_action` SET `action` = 'reviewpassed' WHERE `action` = 'passreviewed'; UPDATE `zt_action` SET `action` = 'reviewrejected' WHERE `action` = 'reviewclosed'; UPDATE `zt_action` SET `action` = 'reviewclarified' WHERE `action` = 'clarifyreviewed'; +UPDATE `zt_config` SET `key` = 'skipYoungBlueTheme' WHERE `key` = 'skipThemeGuide' and `section` = 'global'; DELETE FROM `zt_score` WHERE `module` = 'tutorial' AND `method` = 'finish'; CREATE TABLE `zt_mr` ( `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT, From 14993337dbf0625e1907a774496f4dcaa3ad13cd Mon Sep 17 00:00:00 2001 From: lichengjun Date: Tue, 14 Sep 2021 07:52:11 +0000 Subject: [PATCH 007/163] * Fix bug#14177. --- module/jenkins/view/browse.html.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/module/jenkins/view/browse.html.php b/module/jenkins/view/browse.html.php index 33db142196..9f8011b9da 100644 --- a/module/jenkins/view/browse.html.php +++ b/module/jenkins/view/browse.html.php @@ -15,7 +15,17 @@
    " . $lang->jenkins->create, '', "class='btn btn-primary'");?>
    + +
    +

    + noData;?> + + createLink('jenkins', 'create'), " " . $lang->jenkins->create, '', "class='btn btn-info'");?> + +

    +
+
@@ -49,4 +59,5 @@ + From dd454a6bc30ef740d97b0b05da565c727964571a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Tue, 14 Sep 2021 16:08:50 +0800 Subject: [PATCH 008/163] * fix for flow. --- framework/router.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/framework/router.class.php b/framework/router.class.php index a137f1faba..0bb6ac5132 100755 --- a/framework/router.class.php +++ b/framework/router.class.php @@ -513,12 +513,14 @@ class router extends baseRouter extract($params); // $path = '/index.php'; $query = 'm=$module&f=browse&mode=search&label=1'; parse_str($query, $params); // $params = array('m' => $module, 'f' => 'browse', 'mode' = 'search', 'label' => 1); + $params = array_reverse($params); // $params = array('label' => 1, 'mode' => 'search'); + if($methodName == 'operate') $params['action'] = $params[$this->config->methodVar]; + if($methodName == 'batchOperate') $params['action'] = $params[$this->config->methodVar]; + /* Remove module and method. */ unset($params[$this->config->moduleVar]); // $params = array('f' => 'browse', 'mode' => 'search', 'label' => 1); unset($params[$this->config->methodVar]); // $params = array('mode' => 'search', 'label' => 1); - $params = array_reverse($params); // $params = array('label' => 1, 'mode' => 'search'); - /* Prepend other params. */ if($methodName == 'browse') { From 321b257bad258c50bae658681f7ff7ba204ec112 Mon Sep 17 00:00:00 2001 From: zenggang Date: Tue, 14 Sep 2021 16:19:41 +0800 Subject: [PATCH 009/163] * Fix bug#14587 --- module/project/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/project/model.php b/module/project/model.php index ee68fe0c37..c31a42e922 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -803,6 +803,7 @@ class projectModel extends model ->autoCheck() ->batchcheck($requiredFields, 'notempty') ->checkIF(!empty($project->code), 'code', 'unique', "type='project'") + ->checkIF($project->end != '', 'end', 'gt', $project->begin) ->check('name', 'unique', "type='project' AND deleted='0'") ->exec(); From d0c7c58f180a01178f79e9670506930f37c225fe Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 14 Sep 2021 16:27:56 +0800 Subject: [PATCH 010/163] * Fix bug #15172. --- module/story/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/control.php b/module/story/control.php index 8d531ad5b2..c25a197da5 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -576,7 +576,7 @@ class story extends control $this->action->logHistory($actionID, $changes); $story = $this->dao->findById($storyID)->from(TABLE_STORY)->fetch(); - if(isset($this->post->reviewer)) $this->story->recordReviewAction($story); + if(isset($_POST['reviewer'])) $this->story->recordReviewAction($story); } $this->executeHooks($storyID); From 3d5ff75decbb832840fd55eff93b5602bb5a682e Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 14 Sep 2021 16:42:39 +0800 Subject: [PATCH 011/163] * Fix the problem of upgrade build error. --- module/upgrade/model.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/upgrade/model.php b/module/upgrade/model.php index cdf346fddd..0564304f12 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -4543,7 +4543,6 @@ class upgradeModel extends model $this->dao->update(TABLE_BUG)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec(); $this->dao->update(TABLE_TESTREPORT)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec(); $this->dao->update(TABLE_TESTSUITE)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec(); - $this->dao->update(TABLE_BUILD)->set('project')->eq($projectID)->where('product')->in($productIdList)->exec(); /* Project linked objects. */ $this->dao->update(TABLE_TASK)->set('project')->eq($projectID)->where('execution')->in($sprintIdList)->exec(); From 626c95b0957aa474652bfc9cd534cfa17e0812ee Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 14 Sep 2021 17:24:42 +0800 Subject: [PATCH 012/163] * Fix bug #15162. --- module/bug/control.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/module/bug/control.php b/module/bug/control.php index 8412b26f41..0d956a7e07 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -574,9 +574,8 @@ class bug extends control /* Set custom. */ foreach(explode(',', $this->config->bug->list->customCreateFields) as $field) $customFields[$field] = $this->lang->bug->$field; - $title = isset($this->products[$productID]) ? $this->products[$productID] . $this->lang->colon . $this->lang->bug->create : $this->lang->bug->create; - $this->view->title = $title; + $this->view->title = isset($this->products[$productID]) ? $this->products[$productID] . $this->lang->colon . $this->lang->bug->create : $this->lang->bug->create; $this->view->customFields = $customFields; $this->view->showFields = $this->config->bug->custom->createFields; From 1085bc1288535b48a7d8775d1df048c5f1d2f193 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 14 Sep 2021 17:27:56 +0800 Subject: [PATCH 013/163] * Fix bug#15020. --- module/program/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/program/model.php b/module/program/model.php index 258552fb55..76f7bff9bb 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -182,7 +182,7 @@ class programModel extends model ->on('t1.project = t2.id') ->where('t2.deleted')->eq(0) ->andWhere('t1.product')->in($productPairs) - ->andWhere('t2.status')->ne('closed') + ->andWhere('t2.status')->eq('doing') ->andWhere('t2.type')->eq('project') ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi() ->fetchGroup('product'); From 89cd8317442453fefc9191ac4b40a31644586e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Tue, 14 Sep 2021 17:33:43 +0800 Subject: [PATCH 014/163] * adjust for 15.5. --- module/common/view/kanban.html.php | 2 +- module/gitlab/control.php | 6 +++--- www/js/zui/kanban/min.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php index af7f856fbb..d4eabbd19f 100644 --- a/module/common/view/kanban.html.php +++ b/module/common/view/kanban.html.php @@ -400,7 +400,7 @@ $.extend($.fn.kanban.Constructor.DEFAULTS, /* laneItemsClass: 'scrollbar-hover', */ // only show scrollbar on mouse hover itemRender: renderKanbanItem, useFlex: false, - showZeroCount: true, + showCount: false, onRenderHeaderCol: function($col, col) { if(col.type === 'doingProject') $col.attr('data-span-text', doingText); diff --git a/module/gitlab/control.php b/module/gitlab/control.php index fc46a8057c..28eaf84610 100644 --- a/module/gitlab/control.php +++ b/module/gitlab/control.php @@ -71,7 +71,7 @@ class gitlab extends control if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->loadModel('action'); - $actionID = $this->action->create('gitlab', $gitlabID, 'create'); + $actionID = $this->action->create('gitlab', $gitlabID, 'created'); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'))); } @@ -117,7 +117,7 @@ class gitlab extends control if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); $this->loadModel('action'); - $actionID = $this->action->create('gitlab', $id, 'edit'); + $actionID = $this->action->create('gitlab', $id, 'edited'); $changes = common::createChanges($oldGitLab, $gitLab); $this->action->logHistory($actionID, $changes); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'))); @@ -222,7 +222,7 @@ class gitlab extends control $this->gitlab->delete(TABLE_PIPELINE, $id); $gitLab = $this->gitlab->getByID($id); - $actionID = $this->action->create('gitlab', $id, 'delete'); + $actionID = $this->action->create('gitlab', $id, 'deleted'); $changes = common::createChanges($oldGitLab, $gitLab); $this->action->logHistory($actionID, $changes); die(js::reload('parent')); diff --git a/www/js/zui/kanban/min.js b/www/js/zui/kanban/min.js index c27ab2cbb5..5cf7eee888 100644 --- a/www/js/zui/kanban/min.js +++ b/www/js/zui/kanban/min.js @@ -4,4 +4,4 @@ * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2021 cnezsoft.com; Licensed MIT */ -!function(a){"use strict";var n="zui.kanban",e="object"==typeof CSS&&CSS.supports("display","flex"),t=function(i,d){var o=this;o.name=n,o.$=a(i),o.options=d=a.extend({},t.DEFAULTS,this.$.data(),d),o.data=d.data||[],o.render(o.data);var s=function(n){if(d.onAction){var e=a(this);d.onAction(e.data("action"),e,n,o)}};if(o.$.on("click",".action",s).on("dblclick",".action-dbc",s),"auto"===d.droppable&&(d.droppable=!d.readonly),d.droppable){var r={selector:".kanban-item",target:'.kanban-lane-col:not([data-type="EMPTY"])',drop:function(a){"function"==typeof d.droppable?d.droppable(a):d.onAction&&d.onAction("dropItem",a.element,a,o)}};"object"==typeof d.droppable&&a.extend(r,d.droppable),o.$.droppable(r)}e&&d.useFlex||a(window).on("resize",function(){o.adjustSize()}),d.useFlex&&e||o.$.addClass("not-use-flex")};t.prototype.render=function(a){var n=this;a&&(n.data=a),n.data&&!Array.isArray(n.data)&&(n.data=[n.data]);var t=n.data||[];n.options.beforeRender&&n.options.beforeRender(n,t),n.$.toggleClass("kanban-readonly",!!n.options.readonly).toggleClass("kanban-no-lane-name",!!n.options.noLaneName),n.$.children(".kanban-board").addClass("kanban-expired");for(var i=0;i-1){var i=this.data[t];n=a.extend(i,n),this.data[t]=n}else this.data.push(n)}n.id||(n.id=a.zui.uuid());var d=this,o=d.$,s=o.children('.kanban-board[data-id="'+n.id+'"]');s.length?s.removeClass("kanban-expired"):(s=a('
').appendTo(o),e||s.addClass("no-flex")),d.renderKanbanHeader(n,s),s.children(".kanban-lane").addClass("kanban-expired");for(var r=n.lanes||[],l=0;l .kanban-lane-items .kanban-item').length;s.find('.kanban-header-col[data-id="'+c+'"] > .title > .count').text(p||(d.options.showZeroCount?0:""))}d.adjustKanbanSize(n,s),d.options.onRenderKanban&&d.options.onRenderKanban(s,n,d)},t.prototype.renderKanbanHeader=function(n,t){var i=this;t=t||i.$.children('.kanban-board[data-id="'+n.id+'"]');var d=t.children(".kanban-header");d.length||(d=a('
').prependTo(t),e||d.addClass("clearfix")),d.children(".kanban-col").addClass("kanban-expired");for(var o=n.columns,s=0;s',"<"+(d?"a":"div")+' class="title">','','','',"",""].join("")).appendTo(e),d?i.children(".title").addClass("action").attr("data-action","addCol"):(i.children(".title").addClass("action-dbc").attr("data-action","editCol"),t.options.readonly||i.append(['
','',"
"].join("")));var o=t.options.minColumnWidth;o&&i.css("min-width",o)}i.data("col",n),i.attr("data-type",n.type),i.find(".title>.icon").attr("class","icon icon-"+(n.icon||"")),i.find(".title>.text").text(n.name),i.find(".title>.count").text(n.count||(t.options.showZeroCount?0:"")),t.options.onRenderHeaderCol&&t.options.onRenderHeaderCol(i,n,e)},t.prototype.renderLane=function(n,t,i){var d=this;i=i||d.$.children('.kanban-board[data-id="'+n.kanban+'"]');var o=i.children('.kanban-lane[data-id="'+n.id+'"]');if(o.length?o.removeClass("kanban-expired"):(o=a('
').appendTo(i),e||o.addClass("clearfix")),o.data("lane",n),!d.options.noLaneName){var s=o.children('.kanban-lane-name[data-id="'+n.id+'"]');s.length||(s=a('
').appendTo(o)),s.empty().attr("title",n.name).append(a('').text(n.name)),n.color&&s.css("background-color",n.color),d.options.onRenderLaneName&&d.options.onRenderLaneName(s,n,i,t)}o.children(".kanban-col,.kanban-sub-lanes").addClass("kanban-expired"),o.toggleClass("has-sub-lane",!!n.subLanes),n.subLanes?d.renderSubLanes(n,t,o):d.renderLaneItems(t,n.items,o),d.options.readonly||d.renderLaneCol({id:"EMPTY",type:"EMPTY"},o),o.children(".kanban-expired").remove()},t.prototype.renderSubLanes=function(n,e,t){var i=this,d=t.children('.kanban-sub-lanes[data-id="'+n.id+'"]');d.length?d.removeClass("kanban-expired"):d=a('
').appendTo(t),d.children(".kanban-sub-lane").addClass("kanban-expired");for(var o=0;o').appendTo(i),e||d.addClass("clearfix")),d.children(".kanban-col").addClass("kanban-expired"),this.renderLaneItems(t,n.items,d),d.children(".kanban-expired").remove()},t.prototype.renderLaneItems=function(a,n,e){for(var t=this,i=0;i').appendTo(e),"EMPTY"!==n.id&&(i.append('
'),t.options.readonly||i.append(['
','","
"].join("")));var d=t.options;d.minColumnWidth&&i.css("min-width",d.minColumnWidth),d.maxColHeight&&i.find(".kanban-lane-items").css("max-height",d.maxColHeight),d.laneItemsClass&&i.find(".kanban-lane-items").addClass(d.laneItemsClass),d.laneColClass&&i.addClass(d.laneColClass)}return"EMPTY"===n.id&&i.appendTo(e),i.attr("data-type",n.type),i},t.prototype.renderLaneItem=function(n,e,t){var i=e.children('.kanban-item[data-id="'+n.id+'"]');if(i.length?i.removeClass("kanban-expired"):i=a('
').appendTo(e),this.options.itemRender)this.options.itemRender(n,i,t);else{var d=i.find(".title");d.length||(d=a('
').appendTo(i)),d.text(n.name||n.title)}return i},t.prototype.adjustKanbanSize=function(n,t){var i=this,d=i.options.noLaneName?0:i.options.laneNameWidth,o=n.columns.length+(i.options.readonly?0:1),s=i.options.minColumnWidth*o+d;if(t=t||i.$.children('.kanban-board[data-id="'+n.id+'"]'),t.removeClass("kanban-size-inited").css({minWidth:s}),!i.options.useFlex||!e){var r=Math.max(s,i.$.width()),l=Math.floor((r-d)/o);t.find(".kanban-col").css("width",l),i.options.maxColHeight&&"auto"!==i.options.maxColHeight&&(t.children(".kanban-lane").each(function(){var n=a(this),e=n.height();n.children(".kanban-col,.kanban-sub-lanes").css("min-height",e)}),t.find(".kanban-lane:not(.has-sub-lane),.kanban-sub-lane").each(function(){var n=a(this),e=n.height(),t=n.children(".kanban-lane-col").css("height","auto");t.each(function(){e=Math.max(e,a(this).outerHeight()+1)}),t.css("height",e)})),t.addClass("kanban-size-inited")}},t.prototype.adjustSize=function(){for(var a=0;a-1){var i=this.data[t];n=a.extend(i,n),this.data[t]=n}else this.data.push(n)}n.id||(n.id=a.zui.uuid());var d=this,o=d.$,s=o.children('.kanban-board[data-id="'+n.id+'"]');s.length?s.removeClass("kanban-expired"):(s=a('
').appendTo(o),e||s.addClass("no-flex")),d.renderKanbanHeader(n,s),s.children(".kanban-lane").addClass("kanban-expired");for(var r=n.lanes||[],l=0;l .kanban-lane-items .kanban-item').length;s.find('.kanban-header-col[data-id="'+c+'"] > .title > .count').text(p||(d.options.showZeroCount?0:""))}d.adjustKanbanSize(n,s),d.options.onRenderKanban&&d.options.onRenderKanban(s,n,d)},t.prototype.renderKanbanHeader=function(n,t){var i=this;t=t||i.$.children('.kanban-board[data-id="'+n.id+'"]');var d=t.children(".kanban-header");d.length||(d=a('
').prependTo(t),e||d.addClass("clearfix")),d.children(".kanban-col").addClass("kanban-expired");for(var o=n.columns,s=0;s',"<"+(d?"a":"div")+' class="title">','','',t.options.showCount?'':"","",""].join("")).appendTo(e),d?i.children(".title").addClass("action").attr("data-action","addCol"):(i.children(".title").addClass("action-dbc").attr("data-action","editCol"),t.options.readonly||i.append(['
','',"
"].join("")));var o=t.options.minColumnWidth;o&&i.css("min-width",o)}i.data("col",n),i.attr("data-type",n.type),i.find(".title>.icon").attr("class","icon icon-"+(n.icon||"")),i.find(".title>.text").text(n.name),t.options.showCount&&i.find(".title>.count").text(n.count||(t.options.showZeroCount?0:"")),t.options.onRenderHeaderCol&&t.options.onRenderHeaderCol(i,n,e)},t.prototype.renderLane=function(n,t,i){var d=this;i=i||d.$.children('.kanban-board[data-id="'+n.kanban+'"]');var o=i.children('.kanban-lane[data-id="'+n.id+'"]');if(o.length?o.removeClass("kanban-expired"):(o=a('
').appendTo(i),e||o.addClass("clearfix")),o.data("lane",n),!d.options.noLaneName){var s=o.children('.kanban-lane-name[data-id="'+n.id+'"]');s.length||(s=a('
').appendTo(o)),s.empty().attr("title",n.name).append(a('').text(n.name)),n.color&&s.css("background-color",n.color),d.options.onRenderLaneName&&d.options.onRenderLaneName(s,n,i,t)}o.children(".kanban-col,.kanban-sub-lanes").addClass("kanban-expired"),o.toggleClass("has-sub-lane",!!n.subLanes),n.subLanes?d.renderSubLanes(n,t,o):d.renderLaneItems(t,n.items,o),d.options.readonly||d.renderLaneCol({id:"EMPTY",type:"EMPTY"},o),o.children(".kanban-expired").remove()},t.prototype.renderSubLanes=function(n,e,t){var i=this,d=t.children('.kanban-sub-lanes[data-id="'+n.id+'"]');d.length?d.removeClass("kanban-expired"):d=a('
').appendTo(t),d.children(".kanban-sub-lane").addClass("kanban-expired");for(var o=0;o').appendTo(i),e||d.addClass("clearfix")),d.children(".kanban-col").addClass("kanban-expired"),this.renderLaneItems(t,n.items,d),d.children(".kanban-expired").remove()},t.prototype.renderLaneItems=function(a,n,e){for(var t=this,i=0;i').appendTo(e),"EMPTY"!==n.id&&(i.append('
'),t.options.readonly||i.append(['
','","
"].join("")));var d=t.options;d.minColumnWidth&&i.css("min-width",d.minColumnWidth),d.maxColHeight&&i.find(".kanban-lane-items").css("max-height",d.maxColHeight),d.laneItemsClass&&i.find(".kanban-lane-items").addClass(d.laneItemsClass),d.laneColClass&&i.addClass(d.laneColClass)}return"EMPTY"===n.id&&i.appendTo(e),i.attr("data-type",n.type),i},t.prototype.renderLaneItem=function(n,e,t){var i=e.children('.kanban-item[data-id="'+n.id+'"]');if(i.length?i.removeClass("kanban-expired"):i=a('
').appendTo(e),this.options.itemRender)this.options.itemRender(n,i,t);else{var d=i.find(".title");d.length||(d=a('
').appendTo(i)),d.text(n.name||n.title)}return i},t.prototype.adjustKanbanSize=function(n,t){var i=this,d=i.options.noLaneName?0:i.options.laneNameWidth,o=n.columns.length+(i.options.readonly?0:1),s=i.options.minColumnWidth*o+d;if(t=t||i.$.children('.kanban-board[data-id="'+n.id+'"]'),t.removeClass("kanban-size-inited").css({minWidth:s}),!i.options.useFlex||!e){var r=Math.max(s,i.$.width()),l=Math.floor((r-d)/o);t.find(".kanban-col").css("width",l),i.options.maxColHeight&&"auto"!==i.options.maxColHeight&&(t.children(".kanban-lane").each(function(){var n=a(this),e=n.height();n.children(".kanban-col,.kanban-sub-lanes").css("min-height",e)}),t.find(".kanban-lane:not(.has-sub-lane),.kanban-sub-lane").each(function(){var n=a(this),e=n.height(),t=n.children(".kanban-lane-col").css("height","auto");t.each(function(){e=Math.max(e,a(this).outerHeight()+1)}),t.css("height",e)})),t.addClass("kanban-size-inited")}},t.prototype.adjustSize=function(){for(var a=0;a Date: Wed, 15 Sep 2021 08:33:40 +0800 Subject: [PATCH 015/163] * fix lang. --- module/tutorial/lang/en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index 90c8cf2a60..55e7917de8 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -92,7 +92,7 @@ $lang->tutorial->tasks['createTask']['mode'] = 'new'; $lang->tutorial->tasks['createTask']['nav'] = array('app' => 'execution', 'module' => 'task', 'method' => 'create', 'menuModule' => 'story', 'menu' => '', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task'); $lang->tutorial->tasks['createTask']['desc'] = "

Task breakdown for a story:

  • Open Execution Story WBS;
  • Fill the form with task information;
  • Save
"; -$lang->tutorial->tasks['createExecutionTask'] = array('title' => '分解任务'); +$lang->tutorial->tasks['createExecutionTask'] = array('title' => 'Task Breakdown'); $lang->tutorial->tasks['createExecutionTask']['mode'] = 'classic'; $lang->tutorial->tasks['createExecutionTask']['nav'] = array('app' => 'execution', 'module' => 'task', 'method' => 'create', 'menuModule' => 'story', 'menu' => '', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task'); $lang->tutorial->tasks['createExecutionTask']['desc'] = "

Task breakdown for a story:

  • Open {$lang->executionCommon} Story WBS;
  • Fill the form with task information;
  • Save
"; From 723e921b6e585010427069b2b2bea232001dc987 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Wed, 15 Sep 2021 08:36:18 +0800 Subject: [PATCH 016/163] * Fix bug #15169. --- module/tutorial/js/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/tutorial/js/index.js b/module/tutorial/js/index.js index 370bec15ff..5577a03dc9 100644 --- a/module/tutorial/js/index.js +++ b/module/tutorial/js/index.js @@ -194,7 +194,7 @@ $(function() } else { - $e.parent().addClass('tooltip-tutorial').after("
" + options.title + "
"); + $e.parent().addClass('tooltip-tutorial').append("
" + options.title + "
"); } }; From 7e2632fdece079fa1b2db2babcf9f60bc531d741 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 15 Sep 2021 09:06:53 +0800 Subject: [PATCH 017/163] * Fix bug #15151. --- module/common/view/kanban.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/view/kanban.html.php b/module/common/view/kanban.html.php index d4eabbd19f..5eb9569d67 100644 --- a/module/common/view/kanban.html.php +++ b/module/common/view/kanban.html.php @@ -47,7 +47,7 @@ #kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-item:hover {box-shadow: none;} #kanbanList .kanban-col[data-type="unclosedProduct"] .kanban-item > .title {white-space: normal;} #kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title {display: flex; flex-direction: row; flex-wrap: nowrap; align-items: center; height: 38px;} -#kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title > .text {display: block; white-space: nowrap; text-overflow: ellipsis; overflow: hidden;} +#kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title > .text {display: block; white-space: nowrap; text-overflow: clip; overflow: hidden;} #kanbanList .kanban-col[data-type="normalRelease"] .kanban-item > .title.has-icon > .text {margin-right: 5px; max-width: calc(100% - 20px);} #kanbanList .no-flex .kanban-col[data-type="normalRelease"] .kanban-item > .title {display: block; height: 38px;} #kanbanList .no-flex .kanban-col[data-type="normalRelease"] .kanban-item > .title > .text {display: inline-block;} From 9ff54e47388186713134757255c4d9be30def33a Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 15 Sep 2021 09:12:28 +0800 Subject: [PATCH 018/163] * Fix bug #15150. --- module/product/control.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/module/product/control.php b/module/product/control.php index e250013ccc..dee50d1939 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -1156,6 +1156,10 @@ class product extends control */ public function kanban() { + $this->session->set('projectList', $this->app->getURI(true), 'project'); + $this->session->set('productPlanList', $this->app->getURI(true), 'product'); + $this->session->set('releaseList', $this->app->getURI(true), 'product'); + $kanbanGroup = $this->product->getStats4Kanban(); extract($kanbanGroup); From 77cab3ad10b27e71b229cbc9aac25249f0e3ce67 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Wed, 15 Sep 2021 09:14:16 +0800 Subject: [PATCH 019/163] * Fix bug #15184. --- module/install/lang/en.php | 2 +- module/install/lang/zh-cn.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 934401687b..dbe7d1659d 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -58,7 +58,7 @@ $lang->install->introductionContent = <<Project is used to organize the manpower for development, track and manage the project process, and complete the project in a faster, better, and less costly way.

-

Execution

+

Execution

Execution is used to decompose, assign, and track tasks to ensure that project goals can be implemented by manpower.

diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index 2764d11265..ab9eaae020 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -58,7 +58,7 @@ $lang->install->introductionContent = <<项目用来组织相应的人力进行研发，做好项目过程的跟踪管理，多快好省地完成项目。

-

执行

+

执行

执行用来做任务的分解、指派和跟踪，保证项目目标可以落实到人来执行。

From d2ef694ea6246d32ff761e599149b979085d96c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Wed, 15 Sep 2021 10:04:28 +0800 Subject: [PATCH 020/163] * fix for set realStart when edit task. --- module/task/view/edit.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index d84696e06b..2f281bc080 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -211,7 +211,7 @@ - + From 7757da97f50b7023a274c456b765933cd4049a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Wed, 15 Sep 2021 10:28:46 +0800 Subject: [PATCH 021/163] * adjust for get wait project in program kanban. --- module/program/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/program/model.php b/module/program/model.php index 76f7bff9bb..7525d37122 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -182,7 +182,7 @@ class programModel extends model ->on('t1.project = t2.id') ->where('t2.deleted')->eq(0) ->andWhere('t1.product')->in($productPairs) - ->andWhere('t2.status')->eq('doing') + ->andWhere('t2.status')->in('wait,doing') ->andWhere('t2.type')->eq('project') ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi() ->fetchGroup('product'); From afb19a3a14c1abfbff5da9135721669d8765f016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Wed, 15 Sep 2021 10:36:14 +0800 Subject: [PATCH 022/163] * Merge for userbind btn. --- module/gitlab/view/browse.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php index 1943eb0ef9..07ebd9f40d 100644 --- a/module/gitlab/view/browse.html.php +++ b/module/gitlab/view/browse.html.php @@ -48,7 +48,7 @@ isAdminToken) ? '' : 'disabled'; common::printLink('gitlab', 'edit', "gitlabID=$id", " ", '',"title={$lang->gitlab->edit} class='btn btn-primary'"); - common::printLink('gitlab', 'bindUser', "id=$id", " ", '', "title={$lang->gitlab->bindUser} class='btn btn-primary {$disabled}' ,'disabled'"); + common::printLink('gitlab', 'bindUser', "id=$id", " ", '', "title={$lang->gitlab->bindUser} class='btn {$disabled}' ,'disabled'"); if(common::hasPriv('gitlab', 'delete')) echo html::a($this->createLink('gitlab', 'delete', "gitlabID=$id"), '', 'hiddenwin', "title='{$lang->gitlab->delete}' class='btn'"); ?> From 9cedf76f8ca884fbc29905fadfe3387e8eb9c324 Mon Sep 17 00:00:00 2001 From: dingguodong Date: Wed, 15 Sep 2021 10:36:36 +0800 Subject: [PATCH 023/163] * Fix bug for the job with gitlab type, merged from master. --- module/ci/model.php | 21 ++++++++++++++++----- module/compile/control.php | 8 ++++---- module/job/model.php | 1 + module/job/view/edit.html.php | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/module/ci/model.php b/module/ci/model.php index 2af08d66f9..9943a6fcaa 100644 --- a/module/ci/model.php +++ b/module/ci/model.php @@ -118,7 +118,7 @@ class ciModel extends model /** * Sync gitlab task status. - * + * * @param object $compile * @access public * @return void @@ -127,10 +127,21 @@ class ciModel extends model { $this->loadModel('gitlab'); - $now = helper::now(); - $pipeline = $this->gitlab->apiGetSinglePipeline($compile->server, $compile->pipeline, $compile->queue); - $jobs = $this->gitlab->apiGetJobs($compile->server, $compile->pipeline, $compile->queue); + $now = helper::now(); + /* The value of `$compile->pipeline` is like `'{"project":"46","reference":"master"}'` in current design. */ + $pipeline = json_decode($compile->pipeline); + $compile->project = isset($pipeline->project) ? $pipeline->project : $compile->pipeline; + + $pipeline = $this->gitlab->apiGetSinglePipeline($compile->server, $compile->project, $compile->queue); + if(!isset($pipeline->id) or isset($pipeline->message)) /* The pipeline is not available. */ + { + $pipeline->status = 'create_fail'; /* Set the status to fail. */ + $this->dao->update(TABLE_JOB)->set('lastExec')->eq($now)->set('lastStatus')->eq($pipeline->status)->where('id')->eq($compile->job)->exec(); + return false; + } + + $jobs = $this->gitlab->apiGetJobs($compile->server, $compile->project, $compile->queue); $data = new stdclass; $data->status = $pipeline->status; $data->updateDate = $now; @@ -140,7 +151,7 @@ class ciModel extends model if(empty($job->duration) or $job->duration == '') $job->duration = '-'; $data->logs = ">>> Job: $job->name, Stage: $job->stage, Status: $job->status, Duration: $job->duration Sec\r\n "; $data->logs .= "Job URL: web_url\" target='_blank'>$job->web_url \r\n"; - $data->logs .= $this->transformAnsiToHtml($this->gitlab->apiGetJobLog($compile->server, $compile->pipeline, $job->id)); + $data->logs .= $this->transformAnsiToHtml($this->gitlab->apiGetJobLog($compile->server, $compile->project, $job->id)); } $this->dao->update(TABLE_COMPILE)->data($data)->where('id')->eq($compile->id)->exec(); diff --git a/module/compile/control.php b/module/compile/control.php index d40e36798b..aa81b14e1d 100644 --- a/module/compile/control.php +++ b/module/compile/control.php @@ -12,10 +12,10 @@ class compile extends control { /** - * Construct - * - * @param string $moduleName - * @param string $methodName + * Construct + * + * @param string $moduleName + * @param string $methodName * @access public * @return void */ diff --git a/module/job/model.php b/module/job/model.php index 3195bd5179..c9344e89a4 100644 --- a/module/job/model.php +++ b/module/job/model.php @@ -24,6 +24,7 @@ class jobModel extends model if(strtolower($job->engine) == 'gitlab') { $pipeline = json_decode($job->pipeline); + if(!isset($pipeline->reference)) return $job; $job->project = $pipeline->project; $job->reference = $pipeline->reference; } diff --git a/module/job/view/edit.html.php b/module/job/view/edit.html.php index 9c06425b7a..863e03f716 100644 --- a/module/job/view/edit.html.php +++ b/module/job/view/edit.html.php @@ -44,7 +44,7 @@ - + From 32213e6266be8621cf107f8b64c665228bd40ae5 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 15 Sep 2021 10:59:09 +0800 Subject: [PATCH 024/163] * Fix bug #15187. --- www/js/my.full.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www/js/my.full.js b/www/js/my.full.js index 35c7ab77fd..ef085c9a27 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -552,6 +552,10 @@ function checkTutorial() window.location.reload(); }).error(function(){alert(lang.timeout)}); } + else + { + window.location.href = createLink('tutorial', 'index'); + } } } From 342a0335b13943be3d7983b45c2fea6e9e66c0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Wed, 15 Sep 2021 11:19:54 +0800 Subject: [PATCH 025/163] * Merge for bug #15187. --- www/js/my.full.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/www/js/my.full.js b/www/js/my.full.js index 35c7ab77fd..8f0b20a086 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -553,6 +553,10 @@ function checkTutorial() }).error(function(){alert(lang.timeout)}); } } + else + { + window.location.href = createLink('tutorial', 'index'); + } } /* Remove 'ditto' in first row when batch create or edit. */ From fc887d625a8852075d0d73d345f38b1c45e8f1ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Wed, 15 Sep 2021 11:26:29 +0800 Subject: [PATCH 026/163] * revert for bug #15187. --- www/js/my.full.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/www/js/my.full.js b/www/js/my.full.js index d3a728d51f..ef085c9a27 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -557,10 +557,6 @@ function checkTutorial() window.location.href = createLink('tutorial', 'index'); } } - else - { - window.location.href = createLink('tutorial', 'index'); - } } /* Remove 'ditto' in first row when batch create or edit. */ From 4c0319296ca9052016d6e9814c6917c0ea9c2ac5 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Wed, 15 Sep 2021 13:58:52 +0800 Subject: [PATCH 027/163] * Fix bug #15183. --- module/task/control.php | 4 ++-- module/task/model.php | 5 ++--- module/task/view/edit.html.php | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/module/task/control.php b/module/task/control.php index 51ec0bc928..4ab35b56bd 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -385,9 +385,9 @@ class task extends control $task = $this->task->getById($taskID); if($this->post->comment != '' or !empty($changes) or !empty($files)) { - $action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented'; + $action = (!empty($changes) or !empty($files)) ? 'Edited' : 'Commented'; $fileAction = !empty($files) ? $this->lang->addFiles . join(',', $files) . "\n" : ''; - $actionID = $this->action->create('task', $taskID, $action, $fileAction . $this->post->comment); + $actionID = $this->action->create('task', $taskID, $action, $fileAction . $this->post->comment); if(!empty($changes)) $this->action->logHistory($actionID, $changes); } diff --git a/module/task/model.php b/module/task/model.php index 9e87c22359..d59db80472 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -848,8 +848,7 @@ class taskModel extends model $now = helper::now(); $task = fixer::input('post') ->setDefault('story, estimate, left, consumed', 0) - ->setDefault('estStarted', '0000-00-00') - ->setDefault('deadline', '0000-00-00') + ->setDefault('realStarted', '0000-00-00 00:00:00') ->setIF(is_numeric($this->post->estimate), 'estimate', (float)$this->post->estimate) ->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed) ->setIF(is_numeric($this->post->left), 'left', (float)$this->post->left) @@ -1922,7 +1921,7 @@ class taskModel extends model if($task->assignedTo == 'closed') $task->assignedToRealName = 'Closed'; foreach($task as $key => $value) { - if(strpos($key, 'Date') !== false and !(int)substr($value, 0, 4)) $task->$key = ''; + if((strpos($key, 'Date') !== false or strpos('estStarted|deadline', $key) !== false) and !(int)substr($value, 0, 4)) $task->$key = ''; } $task->files = $this->loadModel('file')->getByObject('task', $taskID); diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index 2f281bc080..5c3862a9c4 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -176,11 +176,11 @@
task->realStarted;?>realStarted) ? helper::now() : $task->realStarted, "class='form-control form-datetime'");?>realStarted) ? '' : $task->realStarted, "class='form-control form-datetime'");?>
task->finishedBy;?>
job->repo; ?> repo, "class='chosen form-control'");?> reference, "class='chosen form-control'");?> reference) ? $job->reference : '', "class='chosen form-control'");?>
job->product;?>
- + - + From e6ed9fba46ab1b7873e2cd69ec6f6abe63b86c84 Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 15 Sep 2021 14:19:01 +0800 Subject: [PATCH 028/163] * Fix bug#14654 --- module/project/model.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/module/project/model.php b/module/project/model.php index c31a42e922..1adebc2bff 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1017,6 +1017,14 @@ class projectModel extends model if($oldProject->parent != $project->parent) $this->loadModel('program')->processNode($projectID, $project->parent, $oldProject->path, $oldProject->grade); + /* Fix whitelist changes. */ + $oldWhitelist = explode(',', $oldProject->whitelist) and $oldWhitelist = array_filter($oldWhitelist); + $newWhitelist = explode(',', $project->whitelist) and $newWhitelist = array_filter($newWhitelist); + if(count($oldWhitelist) == count($newWhitelist) and count(array_diff($oldWhitelist, $newWhitelist)) == 0) unset($project->whitelist); + /* Add linkedproducts changes. */ + $oldProject->linkedProducts = implode(',', $linkedProducts); + $project->linkedProducts = implode(',', $_POST['products']); + return common::createChanges($oldProject, $project); } } From 77d501887d9e06575cce1ee252a9506ce1d90393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Wed, 15 Sep 2021 14:34:13 +0800 Subject: [PATCH 029/163] * fix bug for save execution session. --- module/execution/model.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/execution/model.php b/module/execution/model.php index b9108f8aa1..ef7045ea0c 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -239,24 +239,24 @@ class executionModel extends model /* When the cookie and session do not exist, get it from the database. */ if(empty($executionID) and isset($this->config->execution->lastExecution) and isset($executions[$this->config->execution->lastExecution])) { - $this->session->set('execution', $this->config->execution->lastExecution); + $this->session->set('execution', $this->config->execution->lastExecution, $this->app->tab); $this->setProjectSession($this->session->execution); return $this->session->execution; } - if($executionID > 0) $this->session->set('execution', (int)$executionID, $this->app->tab); if($executionID == 0 and $this->cookie->lastExecution) { /* Execution link is execution-task. */ $executionID = (int)$this->cookie->lastExecution; $executionID = in_array($executionID, array_keys($executions)) ? $executionID : key($executions); - $this->session->set('execution', $executionID); } - if($executionID == 0 and $this->session->execution == '') $this->session->set('execution', key($executions)); - if(!isset($executions[$this->session->execution])) + if($executionID == 0 and $this->session->execution == '') $executionID = key($executions); + $this->session->set('execution', (int)$executionID, $this->app->tab); + + if(!isset($executions[$executionID])) { - $this->session->set('execution', key($executions)); - if($executionID && strpos(",{$this->app->user->view->sprints},", ",{$this->session->execution},") === false) $this->accessDenied(); + $this->session->set('execution', key($executions), $this->app->tab); + if($executionID && strpos(",{$this->app->user->view->sprints},", ",{$executionID},") === false) $this->accessDenied(); } $this->setProjectSession($this->session->execution); @@ -273,7 +273,7 @@ class executionModel extends model public function setProjectSession($executionID) { $execution = $this->getByID($executionID); - if(!empty($execution)) $this->session->set('project', $execution->project); + if(!empty($execution)) $this->session->set('project', $execution->project, $this->app->tab); } /** From a8c37fa1deed1dbd26e1a8e4931c0537e11457ab Mon Sep 17 00:00:00 2001 From: lichengjun Date: Wed, 15 Sep 2021 06:55:09 +0000 Subject: [PATCH 030/163] * Fix bug#15073. --- module/mr/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/mr/model.php b/module/mr/model.php index db71b79297..cdd895ed7e 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -327,7 +327,7 @@ class mrModel extends model $todo->assignedBy = $this->app->user->account; $todo->date = date("Y-m-d", strtotime($rawTodo->target->created_at)); $todo->assignedDate = $rawTodo->target->created_at; - $todo->begin = date("Hi", strtotime($rawTodo->target->created_at)); + $todo->begin = ceil(date("Hi", strtotime($rawTodo->target->created_at))/10)*10; $todo->end = '2400'; /* 2400 means end is 'undefined'. */ $todo->type = 'custom'; $todo->idvalue = $rawTodo->id; From 8847360d3853a1b5d9819f47b24116dc37a340cc Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 15 Sep 2021 15:06:02 +0800 Subject: [PATCH 031/163] * Fix bug #15197. --- module/product/model.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/product/model.php b/module/product/model.php index 9f78b9598a..25256181bd 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1592,7 +1592,11 @@ class productModel extends model $hourList = $this->loadModel('project')->computerProgress($latestExecutionList); - $releaseList = $this->dao->select('id,product,name,marker')->from(TABLE_RELEASE)->where('product')->in(array_keys($productList))->fetchGroup('product', 'id'); + $releaseList = $this->dao->select('id,product,name,marker')->from(TABLE_RELEASE) + ->where('product')->in(array_keys($productList)) + ->andWhere('deleted')->eq('0') + ->andWhere('status')->eq('normal') + ->fetchGroup('product', 'id'); return array('programList' => $programList, 'productList' => $productList, 'planList' => $planList, 'projectList' => $projectList, 'executionList' => $executionList, 'projectProduct' => $projectProduct, 'projectLatestExecutions' => $projectLatestExecutions, 'hourList' => $hourList, 'releaseList' => $releaseList); } From 9c2cd403d71cdedac8cdaf583ab8fafc5d26581e Mon Sep 17 00:00:00 2001 From: liyuchun Date: Wed, 15 Sep 2021 15:08:47 +0800 Subject: [PATCH 032/163] * Fix bug #14558. --- module/doc/js/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/doc/js/edit.js b/module/doc/js/edit.js index e2e43fde11..8c5c3451c3 100644 --- a/module/doc/js/edit.js +++ b/module/doc/js/edit.js @@ -6,7 +6,7 @@ $(function() { $('#content').html(draft); editor = KindEditor.instances[0]; - editor.html(draft); + editor.html('' + draft); $('.kindeditor-ph').remove(); } }, 100) From da6ed899ac6051af0e88e8be81e30f3738f9652f Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 15 Sep 2021 15:09:39 +0800 Subject: [PATCH 033/163] * Fix bug 14926 --- module/execution/js/task.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/js/task.js b/module/execution/js/task.js index 032f77cbbe..013627478d 100644 --- a/module/execution/js/task.js +++ b/module/execution/js/task.js @@ -9,7 +9,7 @@ $(function() $td.find('a').eq(0).css('max-width', $td.width() - labelWidth - 60); }); - toggleFold('#projectTaskForm', unfoldTasks, executionID, 'project'); + toggleFold('#executionTaskForm', unfoldTasks, executionID, 'project'); adjustTableFooter(); $('body').on('click', '#toggleFold', adjustTableFooter); From dd00b9801a22d311d0b53de2a5b006c064c0f4d0 Mon Sep 17 00:00:00 2001 From: lichengjun Date: Wed, 15 Sep 2021 07:10:28 +0000 Subject: [PATCH 034/163] * Fix bug#15073. --- module/mr/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/mr/model.php b/module/mr/model.php index cdd895ed7e..d86e635062 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -327,7 +327,7 @@ class mrModel extends model $todo->assignedBy = $this->app->user->account; $todo->date = date("Y-m-d", strtotime($rawTodo->target->created_at)); $todo->assignedDate = $rawTodo->target->created_at; - $todo->begin = ceil(date("Hi", strtotime($rawTodo->target->created_at))/10)*10; + $todo->begin = '2400'; /* 2400 means begin is 'undefined'. */; $todo->end = '2400'; /* 2400 means end is 'undefined'. */ $todo->type = 'custom'; $todo->idvalue = $rawTodo->id; From 441cda176d0b57aec4f3708d988ab6c709813a07 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 15 Sep 2021 15:56:19 +0800 Subject: [PATCH 035/163] * Modify the global creation return link. --- module/bug/control.php | 1 + module/bug/view/create.html.php | 3 ++- module/common/model.php | 10 +++++++++- module/execution/control.php | 7 ++++++- module/execution/view/create.html.php | 2 +- module/product/control.php | 7 ++++++- module/product/view/create.html.php | 2 +- module/program/control.php | 9 +++++++-- module/program/view/create.html.php | 2 +- module/project/control.php | 7 ++++++- module/project/view/create.html.php | 2 +- module/story/control.php | 1 + module/story/view/create.html.php | 2 +- module/task/control.php | 6 +++++- module/task/view/create.html.php | 2 +- module/testcase/control.php | 4 ++++ module/testcase/view/create.html.php | 2 +- module/todo/view/create.html.php | 3 ++- 18 files changed, 56 insertions(+), 16 deletions(-) diff --git a/module/bug/control.php b/module/bug/control.php index 0d956a7e07..569e47945c 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -579,6 +579,7 @@ class bug extends control $this->view->customFields = $customFields; $this->view->showFields = $this->config->bug->custom->createFields; + $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('bug', 'browse', "productID=$productID") : ''; $this->view->products = $products; $this->view->productID = $productID; $this->view->productName = isset($this->products[$productID]) ? $this->products[$productID] : ''; diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php index 373db1cbbc..7af9d2793b 100644 --- a/module/bug/view/create.html.php +++ b/module/bug/view/create.html.php @@ -328,7 +328,8 @@ js::set('moduleID', $moduleID); session->bugList ? $this->session->bugList : $this->inlink('browse', "productID=$productID");?> goback, '', 'class="btn btn-wide"');?> - + goback, '', 'class="btn btn-wide"');?> + id);?> diff --git a/module/common/model.php b/module/common/model.php index 135d734ca1..a46f4423e1 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -392,13 +392,21 @@ class commonModel extends model $attr = $objectType == 'doc' ? "class='iframe' data-width='650px'" : ''; $params = ''; - if(strpos('bug|testcase|story', $objectType) !== false) $params = "productID=$productID"; if($objectType == 'doc') { $params = "objectType=&objectID=0&libID=0"; $createMethod = 'selectLibType'; } + if($objectType == 'bug') $params = "productID=$productID&branch=&extras=from=global"; + if($objectType == 'story') $params = "productID=$productID&branch=0&moduleID=0&storyID=0&objectID=0&bugID=0&planID=0&todoID=0&extra=from=global"; + if($objectType == 'task') $params = "executionID=0&storyID=0&moduleID=0&taskID=0&todoID=0&extra=from=global"; + if($objectType == 'testcase') $params = "productID=$productID&branch=&moduleID=0&from=¶m=0&storyID=0&extras=from=global"; + if($objectType == 'execution') $params = "projectID=&executionID=0©ExecutionID=0&planID=0&confirm=no&productID=0&extra=from=global"; + if($objectType == 'project') $params = "model=scrum&programID=0©ProjectID=0&extra=from=global"; + if($objectType == 'product') $params = "programID=0&extra=from=global"; + if($objectType == 'program') $params = "parentProgramID=0&extra=from=global"; + $html .= '
  • ' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), " " . $lang->createObjects[$objectType], '', $isOnlyBody ? $attr : '') . '
    • '; } } diff --git a/module/execution/control.php b/module/execution/control.php index b71cf5abfd..a94dae521c 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1206,11 +1206,12 @@ class execution extends control * @param int $planID * @param string $confirm * @param string $productID + * @param string $extra * * @access public * @return void */ - public function create($projectID = '', $executionID = '', $copyExecutionID = '', $planID = 0, $confirm = 'no', $productID = 0) + public function create($projectID = '', $executionID = '', $copyExecutionID = '', $planID = 0, $confirm = 'no', $productID = 0, $extra = '') { /* Set menu. */ if($this->app->tab == 'project') @@ -1231,6 +1232,9 @@ class execution extends control unset($this->lang->doc->menu->execution['subMenu']); } + $extra = str_replace(array(',', ' '), array('&', ''), $extra); + parse_str($extra, $output); + $this->app->loadLang('program'); $this->app->loadLang('stage'); $this->app->loadLang('programplan'); @@ -1338,6 +1342,7 @@ class execution extends control $this->view->title = (($this->app->tab == 'execution') and ($this->config->systemMode == 'new')) ? $this->lang->execution->createExec : $this->lang->execution->create; $this->view->position[] = $this->view->title; + $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('execution', 'all') : ''; $this->view->executions = array('' => '') + $this->execution->getList($projectID); $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->allProducts = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($projectID, 'noclosed'); diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php index 54510c4bd4..92b36db039 100644 --- a/module/execution/view/create.html.php +++ b/module/execution/view/create.html.php @@ -176,7 +176,7 @@
    task->estStarted;?>estStarted) ? '' : $task->estStarted, "class='form-control form-date'");?>estStarted, "class='form-control form-date'");?>
    task->deadline;?>deadline) ? '' : $task->deadline, "class='form-control form-date'");?>deadline, "class='form-control form-date'");?>
    task->estimate;?>
    - + goback, '', 'class="btn btn-wide"') : html::backButton();?>
    diff --git a/module/product/control.php b/module/product/control.php index dee50d1939..5f510d60e3 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -312,10 +312,11 @@ class product extends control * Create a product. * * @param int $programID + * @param string $extra * @access public * @return void */ - public function create($programID = 0) + public function create($programID = 0, $extra = '') { if(!empty($_POST)) { @@ -348,6 +349,9 @@ class product extends control } } + $extra = str_replace(array(',', ' '), array('&', ''), $extra); + parse_str($extra, $output); + $this->loadModel('user'); $poUsers = $this->user->getPairs('nodeleted|pofirst|noclosed', '', $this->config->maxCount); if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PO"] = $this->config->user->moreLink; @@ -366,6 +370,7 @@ class product extends control $this->view->title = $this->lang->product->create; $this->view->position[] = $this->view->title; + $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('product', 'all') : ''; $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->programID = $programID; $this->view->poUsers = $poUsers; diff --git a/module/product/view/create.html.php b/module/product/view/create.html.php index 845e7267f4..f728b63cc5 100644 --- a/module/product/view/create.html.php +++ b/module/product/view/create.html.php @@ -104,7 +104,7 @@ - + goback, '', 'class="btn btn-wide"') : html::backButton();?> diff --git a/module/program/control.php b/module/program/control.php index 063f78ff77..70523428cc 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -141,11 +141,12 @@ class program extends control /** * Create a program. * - * @param int $parentProgramID + * @param int $parentProgramID + * @param string $extra * @access public * @return void */ - public function create($parentProgramID = 0) + public function create($parentProgramID = 0, $extra = '') { $parentProgram = $this->program->getByID($parentProgramID); @@ -159,9 +160,13 @@ class program extends control return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse'))); } + $extra = str_replace(array(',', ' '), array('&', ''), $extra); + parse_str($extra, $output); + $this->view->title = $this->lang->program->create; $this->view->position[] = $this->lang->program->create; + $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('program', 'browse') : ''; $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst'); $this->view->poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst'); $this->view->users = $this->user->getPairs('noclosed|nodeleted'); diff --git a/module/program/view/create.html.php b/module/program/view/create.html.php index c3f59398a1..8146ad15a0 100644 --- a/module/program/view/create.html.php +++ b/module/program/view/create.html.php @@ -121,7 +121,7 @@ - + goback, '', 'class="btn btn-wide"') : html::backButton();?> diff --git a/module/project/control.php b/module/project/control.php index 30bad63ff0..742494a529 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -337,10 +337,11 @@ class project extends control * @param string $model * @param int $programID * @param int $copyProjectID + * @param string $extra * @access public * @return void */ - public function create($model = 'scrum', $programID = 0, $copyProjectID = 0) + public function create($model = 'scrum', $programID = 0, $copyProjectID = 0, $extra = '') { $this->loadModel('execution'); @@ -402,6 +403,9 @@ class project extends control if($this->app->tab == 'program') $this->loadModel('program')->setMenu($programID); $this->session->set('projectModel', $model); + $extra = str_replace(array(',', ' '), array('&', ''), $extra); + parse_str($extra, $output); + $name = ''; $code = ''; $team = ''; @@ -437,6 +441,7 @@ class project extends control $this->view->title = $this->lang->project->create; $this->view->position[] = $this->lang->project->create; + $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('project', 'browse') : ''; $this->view->pmUsers = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst'); $this->view->users = $this->user->getPairs('noclosed|nodeleted'); $this->view->copyProjects = $this->project->getPairsByModel(); diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index 55c9dd002f..8bea4b3391 100644 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -168,7 +168,7 @@ goback, '', 'class="btn btn-wide"') : html::backButton(); ?> diff --git a/module/story/control.php b/module/story/control.php index c25a197da5..af11b695bd 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -301,6 +301,7 @@ class story extends control $this->view->position[] = html::a($this->createLink('product', 'browse', "product=$productID&branch=$branch"), $product->name); $this->view->position[] = $this->lang->story->common; $this->view->position[] = $this->lang->story->create; + $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('product', 'browse', "productID=$productID") : ''; $this->view->products = $products; $this->view->users = $users; $this->view->moduleID = $moduleID ? $moduleID : (int)$this->cookie->lastStoryModule; diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php index 8e46723c86..296bc4fb49 100644 --- a/module/story/view/create.html.php +++ b/module/story/view/create.html.php @@ -256,7 +256,7 @@ - + goback, '', 'class="btn btn-wide"') : html::backButton();?> diff --git a/module/task/control.php b/module/task/control.php index 51ec0bc928..5251bc74d9 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -34,12 +34,15 @@ class task extends control * @param int $moduleID * @param int $taskID * @param int $todoID + * @param string $extra * @access public * @return void */ - public function create($executionID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $todoID = 0) + public function create($executionID = 0, $storyID = 0, $moduleID = 0, $taskID = 0, $todoID = 0, $extra = '') { if(empty($this->app->user->view->sprints) and !$executionID) $this->locate($this->createLink('execution', 'create')); + $extra = str_replace(array(',', ' '), array('&', ''), $extra); + parse_str($extra, $output); $executions = $this->execution->getPairs(); $executionID = $this->execution->saveState($executionID, $executions); @@ -226,6 +229,7 @@ class task extends control $this->view->title = $title; $this->view->position = $position; + $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('execution', 'task', "executionID=$executionID") : ''; $this->view->execution = $execution; $this->view->executions = $this->config->systemMode == 'classic' ? $executions : $this->execution->getByProject(0, 'all', 0, true); $this->view->task = $task; diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php index 7d83737290..8803c62b25 100644 --- a/module/task/view/create.html.php +++ b/module/task/view/create.html.php @@ -248,7 +248,7 @@ - + goback, '', 'class="btn btn-wide"') : html::backButton();?> diff --git a/module/testcase/control.php b/module/testcase/control.php index 74bff877f3..c153710fcc 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -303,6 +303,9 @@ class testcase extends control $testcaseID = ($from and strpos('testcase|work|contribute', $from) !== false) ? $param : 0; $bugID = $from == 'bug' ? $param : 0; + $extras = str_replace(array(',', ' '), array('&', ''), $extras); + parse_str($extras, $output); + $this->loadModel('story'); if(!empty($_POST)) { @@ -454,6 +457,7 @@ class testcase extends control $this->view->productName = $this->products[$productID]; $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $branch); $this->view->currentModuleID = $currentModuleID ? $currentModuleID : (int)$this->cookie->lastCaseModule; + $this->view->gobackLink = (isset($output['from']) and $output['from'] == 'global') ? $this->createLink('testcase', 'browse', "productID=$productID") : ''; $this->view->stories = $stories; $this->view->caseTitle = $caseTitle; $this->view->color = $color; diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php index 0d3b3b7319..1b8435d113 100644 --- a/module/testcase/view/create.html.php +++ b/module/testcase/view/create.html.php @@ -233,7 +233,7 @@ - + goback, '', 'class="btn btn-wide"') : html::backButton();?> diff --git a/module/todo/view/create.html.php b/module/todo/view/create.html.php index 9be124941b..67edfa0e2b 100644 --- a/module/todo/view/create.html.php +++ b/module/todo/view/create.html.php @@ -168,7 +168,8 @@ - + + createLink('my', 'todo', 'type=all'), $lang->goback, '', "class='btn btn-back btn-wide'");?> From 2d636f7ab9d18911c7e157261b4a50312cfc276b Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Wed, 15 Sep 2021 18:12:05 +0800 Subject: [PATCH 036/163] * Fix the upload avatar. --- module/user/view/cropavatar.html.php | 1 + www/js/zui/min.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/user/view/cropavatar.html.php b/module/user/view/cropavatar.html.php index 7322ff4229..973c9bd348 100644 --- a/module/user/view/cropavatar.html.php +++ b/module/user/view/cropavatar.html.php @@ -11,6 +11,7 @@ */ ?> + app->getWebRoot() . 'js/zui/imgcutter/min.js');?> app->getWebRoot() . 'js/zui/imgcutter/min.css');?> diff --git a/www/js/zui/min.js b/www/js/zui/min.js index 7d030ccd8d..cd2015b609 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -1,5 +1,5 @@ /*! - * ZUI: ZUI for Zentao - v1.9.2 - 2021-09-13 + * ZUI: ZUI for Zentao - v1.9.2 - 2021-09-15 * http://openzui.com * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2021 cnezsoft.com; Licensed MIT @@ -75,5 +75,5 @@ function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"= * Binny V A, http://www.openjs.com/scripts/events/keyboard_shortcuts/ */ 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("
    ");i.$.addClass("load-indicator loading"),s.load(window.location.href+" #"+o,function(r){if(a===o)i.$.empty().html(s.children().html()),i.$.find('[data-ride="pager"]').pager();else{i.$.find("#"+o).empty().html(s.children().html());try{var l=t(r),h=l.find("#"+o).closest('[data-ride="table"],#'+a);if(h.length){var c=h.find(".table-statistic");c.length&&(i.defaultStatistic=c.html());var d=i.$.find('[data-ride="pager"]').data("zui.pager"),u=h.find('[data-ride="pager"]');d&&u.length&&d.set(u.data())}}catch(f){console.error(f)}}i.$.removeClass("load-indicator loading").trigger("beforeTableReload"),delete i.defaultStatistic,i.updateStatistic(),i.initModals(),i.$.datepickerAll();var p=i.$.find("tbody>tr"),g=!1;t.each(i.checkItems,function(t,e){e&&(i.checkRow(p.filter('[data-id="'+t+'"]'),!0,!0),g=!0)}),g&&i.updateCheckUI(),i.$.trigger("tableReload");var m=t("#mainMenu>.btn-toolbar>.btn-active-text>.label");if(m.length){var u=i.$.find(".pager[data-rec-total]"),v=u.length?u.attr("data-rec-total"):i.getTable().find("tbody:first>tr:not(.table-children)").length;m.text(v)}e&&e(),n.afterReload&&n.afterReload()})},r.prototype.initModals=function(){var e=this,i=e.options,n=e.$.find(i.iframeModalTrigger);if(n.length){var o={type:"iframe",onHide:i.replaceId?function(){var n=t.cookie("selfClose");(1==n||i.hot)&&(t("#triggerModal").data("cancel-reload",1),e.reload(function(){t.cookie("selfClose",0)}))}:null};n.modalTrigger(o)}},r.prototype.getTable=function(){var t=this.$;if(this.isDataTable)return t.find("div.datatable");var e=t.is("table")?t:t.find("table:not(.fixed-header-copy)").first();return e.is(".datatable")&&(this.isDataTable=!0,e.data("zui.datatable")||window.initDatatable(e),e=t.find("div.datatable")),e},r.prototype.toggleGroups=function(e){var i=this,n={};i.$.find("tbody>tr").each(function(){var o=t(this).closest("tr").data("id");n[o]||i.toggleRowGroup(o,e)})},r.prototype.toggleRowGroup=function(i,n){var o=this.$.find('tbody>tr[data-id="'+i+'"]'),a=o.filter(".group-summary"),s=n===e?!a.hasClass("hidden"):!!n; -o.not(".group-summary").toggleClass("hidden",!s),a.toggleClass("hidden",s),t("body").toggleClass("table-group-collapsed",!this.$.find("tbody>tr.group-summary.hidden").length)},r.prototype.updateStatistic=function(){var i=this,n=i.$.find(".table-statistic");if(n.length){if(i.defaultStatistic===e&&(i.defaultStatistic=n.html()),i.options.statisticCreator)return void n.html(i.options.statisticCreator(i)||i.defaultStatistic);var o=i.statisticCols;if(!o&&o!==!1){o={};var a=!1;i.getTable().find("thead th").each(function(e){var i=t(this),n=i.data("statistic");n&&(a=!0,o[e]={format:n,name:i.text()})}),i.statisticCols=!!a&&o}var s=0;o&&t.each(o,function(t){o[t].total=0,o[t].checkedTotal=0}),i.$.find(i.isDataTable?".fixed-left tbody>tr":"tbody>tr").each(function(){var e=t(this),i=e.hasClass("checked"),n=e.children("td");i&&s++,o&&t.each(o,function(t){var e=parseFloat(n.eq(t).text());isNaN(e)&&(e=0),o[t].total+=e,i&&(o[t].checkedTotal+=e)})});var r=[];if(s)r.push(i.lang.selectedItems.format(s));else if(i.defaultStatistic)return void n.html(i.defaultStatistic);o&&t.each(o,function(t){var e=o[t],n=e[s?"checkedTotal":"total"];e.format&&(n=e.format.format(n)),r.push(i.lang.attrTotal.format(e.name,n))}),n.html(r.join(", "))}},r.prototype.updateFixUI=function(e){var i=this,n=(new Date).getTime();if(!e&&(i.lastUpdateCall&&clearTimeout(i.lastUpdateCall),!i.lastUpdateTime||n-i.lastUpdateTime
    ').append(t('
    ').addClass(i.attr("class")).append(n.clone())).insertAfter(i)),c){var d=h[0].getBoundingClientRect();l.css({left:d.left,width:h.width(),overflow:"hidden"}),l.find(".fixed-header-copy").css({left:o.left-d.left,position:"relative",minWidth:i.width()}),a||h.data("fixHeaderScroll")||(h.data("fixHeaderScroll",1),i.width()>h.width()&&h.on("scroll",function(){e.fixHeader()}))}else l.css({left:o.left,width:o.width});var u=l.find("th");n.find("th").each(function(e){u.eq(e).css("width",t(this).outerWidth())})}else l.remove()},r.prototype.fixFooter=function(){var e,i=this,n=i.getTable(),o=i.$.find(".table-footer");if(i.isDataTable)e=n[0].getBoundingClientRect();else{var a=n.find("tbody");if(!a.length)return;e=a[0].getBoundingClientRect()}var s=i.options.fixFooter;o.toggleClass("fixed-footer",!!r);var r="function"==typeof s?s(e,o):e.bottom>window.innerHeight-50-("number"==typeof s?s:i.pageFooterHeight||5);o.toggleClass("fixed-footer",!!r),n.toggleClass("with-footer-fixed",!!r),n.trigger("fixFooter",r);var l=t("body"),h=l.hasClass("body-modal");if(r){var c=n.parent(),d=c.is(".table-responsive");o.css({bottom:i.pageFooterHeight||0,left:d?c[0].getBoundingClientRect().left:e.left,width:d?c.width():e.width}),h&&l.css("padding-bottom",40)}else o.css({width:"",left:0,bottom:0}),h&&l.css("padding-bottom",0)},r.prototype.checkAll=function(e){var i=this,n=i.$.find(i.isDataTable?".fixed-left tbody>tr":"tbody>tr");n.each(function(){i.checkRow(t(this),e,!0)}),i.updateCheckUI()},r.prototype.checkRow=function(t,i,n){var o=this;o.isDataTable&&!t.is(".datatable-row-left")&&(t=o.getTable().find('.datatable-row-left[data-index="'+t.data("index")+'"]'));var a=t.find('input[type="checkbox"]');a.length&&!a.is(":disabled")&&(i===e&&(i=!a.is(":checked")),o.isDataTable?o.getTable().find('.datatable-row[data-index="'+t.data("index")+'"]').toggleClass("checked",i):t.toggleClass("checked",i),this.checkItems[t.data("id")]=i,a.prop("checked",i).trigger("change"),n||o.updateCheckUI())},r.prototype.updateCheckUI=function(){var e=this,i=e.getTable(),n=i.find(e.isDataTable?".fixed-left tbody>tr":"tbody>tr").not(".group-summary"),o=!1,a=null,s=0,r=!1,l=n.length;n.each(function(n){var h=t(this),c=h.find('input[type="checkbox"]');if(!c.length)return void l--;r=c.is(":checked");var d=e.isDataTable?i.find('.datatable-row[data-index="'+h.data("index")+'"]'):h;d.toggleClass("checked",r),d.toggleClass("row-check-begin",r&&!o),a&&a.toggleClass("row-check-end",!r&&o),r&&(s+=1),a=d,o=r,l===n+1&&d.toggleClass("row-check-end",r)}),e.$.toggleClass("has-row-checked",s>0).find(".check-all").toggleClass("checked",!(!l||s!==l)),e.updateStatistic(),e.options.onCheckChange&&e.options.onCheckChange(),i.trigger("checkChange")},r.DEFAULTS={checkable:!0,checkOnClickRow:!0,ajaxForm:!1,selectable:!0,fixHeader:!a,fixFooter:!a,iframeWidth:900,replaceId:"self",nestLevelIndent:18,nested:!1,preserveNested:!0,hot:!1,iframeModalTrigger:".iframe"},t.fn.table=function(e){return this.each(function(){var n=t(this),o=n.data(i),a="object"==typeof e&&e;o||n.data(i,o=new r(this,a)),"string"==typeof e&&o[e]()})},r.NAME=i,t.fn.table.Constructor=r,t(function(){t('[data-ride="table"]').table()})}(jQuery,void 0),function(t,e,i){t.fn._ajaxForm=t.fn.ajaxForm;var n={timeout:e.config?e.config.timeout:0,dataType:"json",method:"post"},o="";t.fn.enableForm=function(e,n,o){return e===i&&(e=!0),this.each(function(){var i=t(this);n||i.find('[type="submit"]').attr("disabled",e?null:"disabled"),!o&&i.hasClass("load-indicator")&&i.toggleClass("loading",!e),i.toggleClass("form-disabled",!e)})},t.enableForm=function(e,i,n,o){"string"==typeof e||e instanceof t?e=t(e):(o=n,n=i,i=e,e=t("form")),e.enableForm(i!==!1,n,o)},t.disableForm=function(e,i,n){t.enableForm(e,!1,i,n)};var a=function(e,i,n){"string"==typeof i&&(n=i,i=null),n=n||"show",t.zui.messager?t.zui.messager[n](e,i):alert(e)};t.ajaxForm=function(s,r){var l=t(s);if(l.length>1)return l.each(function(){t.ajaxForm(this,r)});"function"==typeof r&&(r={complete:r}),r=t.extend({},n,l.data(),r);var h=r.beforeSubmit,c=r.error,d=r.success,u=r.finish;delete r.finish,delete r.success,delete r.onError,delete r.beforeSubmit,r=t.extend({beforeSubmit:function(n,a,s){if(l.removeClass("form-watched").enableForm(!1),(h&&h(n,a,s))!==!1){var r={},c=a.find('[type="file"]');r.fileapi=c.length&&c[0].files!==i,r.formdata=e.FormData!==i;var d=r.fileapi&&a.find('input[type="file"]:enabled').filter(function(){return""!==t(this).val()}),u=d.length,f="multipart/form-data",p=a.attr("enctype")==f||a.attr("encoding")==f,g=r.fileapi&&r.formdata,m=u&&!g||p&&!r.formdata;m&&(""==o&&(o=s.url),s.url!=o&&(s.url=o),s.url=s.url.indexOf("&")>=0?s.url+"&HTTP_X_REQUESTED_WITH=XMLHttpRequest":s.url+"?HTTP_X_REQUESTED_WITH=XMLHttpRequest")}},success:function(i,n,o){if((d&&d(i,n,o,l))!==!1){try{"string"==typeof i&&(i=JSON.parse(i))}catch(s){}if(null===i||"object"!=typeof i)return i?alert(i):a("No response.","danger");var h=r.responser?t(r.responser):l.find(".form-responser");h.length||(h=t("#responser"));var c=i.message,f=function(){var n=i.callback;if(n){var o=n.indexOf("("),a=(o>0?n.substr(0,o):n).split("."),s=e,r=a[0];a.length>1&&(r=a[1],"top"===a[0]?s=e.top:"parent"===a[0]&&(s=e.parent));var h=s[r];if("function"==typeof h){var c=[];return o>0&&")"==n[n.length-1]&&(c=t.parseJSON("["+n.substring(o+1,n.length-1)+"]")),c.push(i),h.apply(l,c)}}};if("success"===i.result){var p=r.locate||i.locate;if(l.enableForm(!0,!!p),c){var g=l.find('[type="submit"]').first(),m=!1;g.length&&(g.popover({container:"body",trigger:"manual",content:c,tipClass:"popover-in-modal popover-success popover-form-result",placement:i.placement||g.data("placement")||r.popoverPlacement||"right"}).popover("show"),setTimeout(function(){g.popover("destroy")},r.popoverTime||2e3),m=!0),h.length&&(h.html(''+c+"").show().delay(3e3).fadeOut(100),m=!0),m||a(c,"success")}if(u)return u(i,!0,l);if((r.closeModal||i.closeModal)&&setTimeout(t.zui.closeModal,r.closeModalTime||2e3),f()===!1)return;if(p)if("loadInModal"==p){var v=t(".modal");setTimeout(function(){v.load(v.attr("ref"),function(){t(this).find(".modal-dialog").css("width",t(this).data("width")),t.zui.ajustModalPosition()})},1e3)}else"parent"===p||"top"===p?e[p]&&setTimeout(function(){e[p].location.reload()},1200):"reload"===p?setTimeout(function(){e.location.href=e.location.href},1200):setTimeout(function(){t.tabs?t.tabs.open(p):e.location.href=p},1200);var y=r.ajaxReload||i.ajaxReload;if(y){var b=t(y);b.length&&b.load(e.location.href+" "+y,function(){b.find('[data-toggle="modal"]').modalTrigger()})}}else{if(l.enableForm(),"string"==typeof c)h.length?h.html(''+c+"").show().delay(3e3).fadeOut(100):a(c,"danger");else if("object"==typeof c){var w=!1,x=[];t.each(c,function(e,i){var n=t.isArray(i)?i.join(""):i,o=t("#"+e);if(!o.length)return void x.push(n);var a=e+"Label",s=t("#"+a);if(!s.length){var r=o.closest(".input-group").length,l=o.closest("td").length;s=t('
    ').appendTo(l?o.closest("td"):r?o.closest(".input-group").parent():o.parent())}s.empty().append(n),o.addClass("has-error");var h=function(){var e=t("#"+a);if(e.length)return e.remove(),o.removeClass("has-error"),!0};o.on("change input mousedown",h);var c=t("#"+e+"_chosen");if(c.length&&c.find(".chosen-single,.chosen-choices").addClass("has-error").on("mousedown",function(){h()===!0&&t(this).removeClass("has-error")}),!w){if(o.hasClass("chosen"))o.trigger("chosen:activate");else if(o.is("textarea")&&o.data("keditor")){var d=o.data("keditor");d.focus(),d.edit.doc.body.focus()}else o.focus();w=!0}}),x.length&&a(x.join(";"),"danger")}if(u)return u(i,!1,l);if(f()===!1)return}}},error:function(t,i,n){if((c&&c(t,i,n,l))!==!1){l.enableForm();var o="timeout"==i||"error"==i?e.lang?e.lang.timeout:i:t.responseText+i+n;a(o,"danger")}}},r),l._ajaxForm(r).data("zui.ajaxform",!0),l.on("click","[data-form-action]",function(){l.attr("action",t(this).data("formAction")).submit()})},t.setAjaxForm=function(e,i,n){t.ajaxForm(e,t.isPlainObject(i)?i:{finish:i,beforeSubmit:n})},t.fn.ajaxForm=function(e){return this.each(function(){t.ajaxForm(this,e)})},t.fn.setInputRequired=function(){return this.each(function(){var e=t(this),i=e.parent();i.is(".input-control,td")?i.addClass("required"):e.is(".chosen")?e.attr("required",null).next(".chosen-container").addClass("required"):i.addClass("required"),e.attr("required",null);var n=i.closest(".input-group");n.length&&1===n.find(".required,input[required],select[required]").length&&n.addClass("required")})},t(function(){t('.form-ajax,form[data-type="ajax"]').ajaxForm(),setTimeout(function(){var i=e.config.requiredFields,n=t("form");i&&(i=i.split(",")),i&&i.length&&t.each(i,function(t,e){n.find("#"+e).attr("required","required")}),n.find("input[required],select[required],textarea[required]").setInputRequired()},400),t('form[target="hiddenwin"]').on("submit",function(){var e=t(this);e.data("zui.ajaxform")||e.enableForm(!1).data("disabledTime",(new Date).getTime())}).on("click",function(){var e=t(this),i=e.data("disabledTime");i&&(new Date).getTime()-i>1e4&&e.enableForm(!0).data("disabledTime",null)})})}(jQuery,window,void 0),function(t){"use strict";var e="zui.searchList",i=function(t,e){if(t&&t.length)for(var i=0;i
    ').append(s)),i.$menu.append(s),i.$menu.removeClass("loading"),i.isLoaded=!0,e&&e(!0)},error:function(){i.$menu.removeClass("loading").append('
    '+(n.errorText||window.lang&&window.lang.timeout)+"
    "),e&&e(!1)}},n.ajax))},n.prototype.scrollTo=function(t){t.length&&t[0].scrollIntoViewIfNeeded&&t[0].scrollIntoViewIfNeeded({behavior:"smooth"})},n.prototype.getItems=function(){return this.$.find(this.options.selector).addClass("search-list-item")},n.prototype.getActiveItem=function(){return this.getItems().filter(".active:first")},n.prototype.search=function(e){var n=this,o=void 0===e||null===e||""===e;n.$.toggleClass("has-search-text",!o);var a=n.getItems().removeClass("active");if(o)a.removeClass("hidden");else{var s=t.trim(e).split(" ");a.each(function(){var e=t(this),n=e.text()+" "+(e.data("key")||e.data("filter"));e.toggleClass("hidden",!i(s,n))})}n.scrollTo(a.not(".hidden").first().addClass("active"))},n.DEFAULTS={selector:".list-group a:not(.not-list-item)",searchBox:".search-box",onSelectItem:null},t.fn.searchList=function(i){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof i&&i;a||o.data(e,a=new n(this,s)),"string"==typeof i&&a[i]()})},n.NAME=e,t.fn.searchList.Constructor=n,t(function(){t('[data-ride="searchList"]').searchList()})}(jQuery),function(t){"use strict";var e="zui.labelSelector",i=function(n,o){var a=this;a.name=e,a.$=t(n),o=a.options=t.extend({},i.DEFAULTS,this.$.data(),o),a.$.hide(),a.update()};i.prototype.select=function(t){t+="",this.$wrapper.find(".label.active").removeClass("active"),this.$wrapper.find('.label[data-value="'+t+'"]').addClass("active"),this.$.val(t).trigger("change")},i.prototype.update=function(){var e=this,i=e.options,n=e.$wrapper;if(!n){if(i.wrapper)n=t(i.wrapper);else{var o=e.$.next();n=o.hasClass(".label-selector")?o:t('
    ')}n.parent().length||e.$.after(n),e.$wrapper=n,n.on("click",".label",function(i){var n=e.$.val(),o=t(this).data("value");e.hasEmptyValue!==!1&&o==n&&(o=e.hasEmptyValue),e.select(o),i.preventDefault()})}n.empty();var a=e.$.val();e.hasEmptyValue=!1,e.$.children("option").each(function(){var e=t(this),o={label:e.text(),value:e.val()},s=""===o.value||"0"===o.value,r=t(i.labelTemplate||'');i.labelClass&&!s&&r.addClass(i.labelClass),i.labelCreator?r=i.labelCreator(r):(r.data("option",o).attr("data-value",o.value),s&&!o.label?r.addClass("empty").append(''):r.text(o.label).toggleClass("active",a===o.value)),n.append(r)})},i.DEFAULTS={},t.fn.labelSelector=function(n){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof n&&n;a||o.data(e,a=new i(this,s)),"string"==typeof n&&a[n]()})},i.NAME=e,t.fn.labelSelector.Constructor=i,t(function(){t('[data-provide="labelSelector"]').labelSelector()})}(jQuery),function(t){"use strict";var e="zui.fileInput",i=t.BYTE_UNITS={B:1,KB:1024,MB:1048576,GB:1073741824,TB:1099511627776},n=t.formatBytes=function(t,e,n){return void 0===e&&(e=2),n||(n=ts.fileMaxSize&&(h.val(""),(window.bootbox||window).alert(s.fileSizeError.format(n(s.fileMaxSize)))),r.update()}),r.update()};a.prototype.getFile=function(){var t=this.$input.prop("files");return t&&t[0]},a.prototype.update=function(){var t=this,e=t.$,i=t.getFile(),o=!i;e.toggleClass("normal",!o).toggleClass("empty",o),i?(t.oldName=i.name,e.find(".file-title").text(i.name).attr("title",i.name),e.find(".file-size").text(n(i.size)),e.find(".file-editbox").val(i.name).attr("size",i.name.length),t.options.onSelect&&t.options.onSelect(i,t)):e.find(".file-editbox").val("")},a.DEFAULTS={fileMaxSize:0,fileSizeError:"无法上传大于 {0} 的文件。"},t.fn.fileInput=function(i){return this.each(function(){var n=t(this),o=n.data(e),s="object"==typeof i&&i;o||n.data(e,o=new a(this,s)),"string"==typeof i&&o[i]()})},a.NAME=e,t.fn.fileInput.Constructor=a,t(function(){t('[data-provide="fileInput"]').fileInput()});var s="zui.fileInputList",r=function(e,i){var n=this;n.name=s;var o=n.$=t(e);i=n.options=t.extend({},r.DEFAULTS,this.$.data(),i),n.$template=o.find(".file-input").detach(),n.add()};r.prototype.add=function(){var t=this,e=t.options,i=t.$template.clone();"before"===e.appendWay?t.$.prepend(i):t.$.append(i),i.fileInput({fileMaxSize:e.eachFileMaxSize,fileSizeError:e.fileSizeError,onDelete:function(e){e.$.remove(),t.options.onDelete&&t.options.onDelete(e,t)},onSelect:function(e,i){t.add(),t.options.onSelect&&t.options.onSelect(e,i,t)}})},r.DEFAULTS={fileMaxSize:0,eachFileMaxSize:0,appendWay:"after",fileSizeError:"无法上传大于 {0} 的文件。"},t.fn.fileInputList=function(e){return this.each(function(){var i=t(this),n=i.data(s),o="object"==typeof e&&e;n||i.data(s,n=new r(this,o)),"string"==typeof e&&n[e]()})},r.NAME=s,t.fn.fileInputList.Constructor=r,t(function(){t('[data-provide="fileInputList"]').fileInputList()})}(jQuery),function(t){window.config||(window.config={}),t.createLink=window.createLink=function(e,n,o,a,s,r,l){if("object"==typeof e)return t.createLink(e.moduleName,e.methodName,e.vars,e.viewType,e.isOnlyBody,e.hash,e.tid);if(t.tabSession&&!l&&(l=t.tabSession.getTid()),a||(a=config.defaultView),s||(s=!1),o)for("string"==typeof o&&(o=o.split("&")),i=0;i'+d+"")}}t.val()||(time=e(a.format("hh:mm")),time=time-time%10+10,t.val(n(time)))};t.fn.timeSpanControl=function(i){return this.each(function(){var s=t(this),r=t.extend({},i,s.data()),l=s.find('[name="begin"],.control-time-begin'),h=s.find('[name="end"],.control-time-end'),c=function(){var t=l.val();if(s.find(".hide-empty-begin").toggleClass("hide",!t),t){var i=n(e(t)+30);h.find('option[value="'+i+'"]').length&&h.val(i),r.onChange&&r.onChange(h,i)}};if(s.data("timeSpanControlInit")){if(r.begin){var d=o(r.begin).format("hh:mm");l.find('option[value="'+d+'"]').length&&l.val(d),r.onChange&&r.onChange(l,d)}if(r.end){var u=o(r.end).format("hh:mm");h.find('option[value="'+u+'"]').length&&h.val(u),r.onChange&&r.onChange(h,u)}}else l.on("change",c),a(l,r.begin),a(h,r.end),s.data("timeSpanControlInit",!0);r.end||c()})},t.timeSpanControl={convertTimeToNum:e,convertNumToTime:n,initTimeSelect:a,createTime:o};var s=t.setSearchType=function(e,i){var n=t("#searchType");e||(e=n.val()),e=e||"bug",n.val(e);var o=t("#searchTypeMenu");o.find("li.selected").removeClass("selected");var a=o.find('a[data-value="'+e+'"]'),s=a.text();a.parent().addClass("selected"),t("#searchTypeName").text(s),i||t("#searchInput").focus()};t.gotoObject=function(e,i){if(e||(e=t("#searchType").val()),i||(i=t("#searchInput").val()),i&&e)if(i=i.replace(/[^\d]/g,"")){var n=e.split("-");e=n[0];var o=n.length>1?n[1]:"testsuite"===e?"library":"view",a=t.createLink(e,o,"id="+i);t.apps?t.apps.open(a):window.location.href=a}else{var s={zh_cn:"请输入数字ID进行搜索",zh_tw:"請輸入數值ID行搜索"};alert(lang.searchTip||s[t.zui.clientLang()]||"Please enter a numberic id to search")}t("#searchInput").val(i).focus()},t(function(){s(null,!0),t(document).on("keydown",function(e){e.ctrlKey&&71===e.keyCode&&(t("#searchInput").val("").focus(),e.stopPropagation(),e.preventDefault())})}),t.removeAnchor=window.removeAnchor=function(t){var e=t.lastIndexOf("#");return e>-1?t.substr(0,e):t},t.refreshPage=function(t){t?window.parent.location.reload():window.location.reload()},t.selectLang=window.selectLang=function(e){t.cookie("lang",e,{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("selectLang"),t.refreshPage(1)},t.selectTheme=window.selectTheme=function(e){t.cookie("theme",e,{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("selectTheme"),t.refreshPage(1)},t.zui.Picker&&t.zui.Picker.enableChosen(),t.chosenDefaultOptions={middle_highlight:!0,disable_search_threshold:1,compact_search:!0,allow_single_deselect:!0,placeholder_text_single:" ",placeholder_text_multiple:" ",search_contains:!0,max_drop_width:500,max_drop_height:245,no_wrap:!0,drop_direction:function(){var e=t(this.container).closest(".table-responsive:not(.scroll-none)");if(e.length){if(this.drop_directionFixed)return this.drop_directionFixed;e.css("position","relative");var i="down",n=this.container.find(".chosen-drop"),o=this.container.position(),a=n.outerHeight();return o.top>=a&&o.top+31+a>e.outerHeight()&&(i="up"),this.drop_directionFixed=i,i}return"auto"}},t.chosenSimpleOptions=t.extend({},t.chosenDefaultOptions,{disable_search_threshold:6}),t.fn._chosen=t.fn.chosen,t.fn.chosen=function(e){return"string"==typeof e?this._chosen(e):this.each(function(){var i=t(this).addClass("chosen-controled");return i._chosen(t.extend({},i.hasClass("chosen-simple")?t.chosenSimpleOptions:t.chosenDefaultOptions,i.data(),e))})},t.fn.chosen.Constructor=t.fn._chosen.Constructor,t(function(){t(".chosen,.chosen-simple").each(function(){var e=t(this);e.closest(".template").length||e.chosen()})}),t.extend(t.fn.pager.Constructor.DEFAULTS,{maxNavCount:8,prevIcon:"icon-angle-left",nextIcon:"icon-angle-right",firstIcon:"icon-first-page",lastIcon:"icon-last-page",navEllipsisItem:"…",menuDirection:"dropup",pageSizeOptions:[5,10,15,20,25,30,35,40,45,50,100,200,500,1e3,2e3],elements:["total_text","size_menu","first_icon","prev_icon",'
    {page}/{totalPage}
    ',"next_icon","last_icon"],onPageChange:function(e,i){e.recPerPage!==i.recPerPage&&t.cookie(this.options.pageCookie,e.recPerPage,{expires:config.cookieLife,path:config.webRoot}),e.recPerPage!==i.recPerPage&&(window.location.href=this.createLink())}}),t.extend(!0,t.zui.Messager.DEFAULTS,{cssClass:"messagger-zt",icons:{success:"check-circle",info:"chat-line",warning:"exclamation-sign",danger:"exclamation-sign"}}),t.fn.reverseOrder=function(){return this.each(function(){var e=t(this);e.prependTo(e.parent())})};var r=function(e,i){var n=t(e);if(!n.data("historiesInited")){n.data("historiesInited",1),i=t.extend({},n.data(),i);var o=n.find(".histories-list"),a=!0,s=!1;n.on("click",".btn-reverse",function(){o.children("li").reverseOrder(),a=!a,t(this).find(".icon").toggleClass("icon-arrow-up",a).toggleClass("icon-arrow-down",!a);var e="#lastComment",i=t(e);i.length&&window.KindEditor&&(window.KindEditor.remove(e),i.kindeditor())}).on("click",".btn-expand-all",function(){var e=t(this).find(".icon");s=!s,e.toggleClass("icon-plus",!s).toggleClass("icon-minus",s),o.children("li").toggleClass("show-changes",s)}).on("click",".btn-expand",function(){t(this).closest("li").toggleClass("show-changes")}).on("click",".btn-strip",function(){var e=t(this),n=e.find(".icon"),o=n.hasClass("icon-code");n.toggleClass("icon-code",!o).toggleClass("icon-text",o),e.attr("title",o?i.original:i.textdiff),e.closest("li").toggleClass("show-original",o)}),o.find(".btn-strip").attr("title",i.original);var r=n.find(".modal-comment").modal({show:!1}).on("shown.zui.modal",function(){var t=r.find("#comment");t.length&&(t.focus(),window.editor&&window.editor.comment&&window.editor.comment.focus())}).on("show.zui.modal",function(){var e=r.find("#comment");e.length&&!e.data("keditor")&&t.fn.kindeditor&&e.kindeditor()});n.on("click",".btn-comment",function(t){r.modal("toggle"),t.preventDefault()}).on("click",".btn-edit-comment,.btn-hide-form",function(){t(this).closest("li").toggleClass("show-form")});var l=n.find(".comment-edit-form");l.ajaxForm({success:function(t,e,i,n){setTimeout(function(){l.closest("li").removeClass("show-form")},2e3)}})}};t.fn.histories=function(t){return this.each(function(){r(this,t)})},t(function(){t(".histories").histories()});var l=0,h=0;t.toggleSidebar=function(e){var i=t("#sidebar");if(i.length){var n=t("main");if(void 0===e)e=n.hasClass("hide-sidebar");else if(e&&!n.hasClass("hide-sidebar"))return;n.toggleClass("hide-sidebar",!e),clearTimeout(l),t.zui.store.set(h,e);var o=i.children(".cell"),a={overflow:"visible",maxHeight:"initial"};e?(i.addClass("showing"),l=setTimeout(function(){i.removeClass("showing"),i.trigger("sidebar.toggle",e)},210)):(i.trigger("sidebar.toggle",e),t(window).width()<1900&&(a={overflow:"hidden",maxHeight:t(window).height()-45})),o.css(a)}};var c=t.initSidebar=function(){var e=t("#sidebar");if(e.length){if(e.data("init"))return!0;h="sidebar:"+(e.data("id")||config.currentModule+"/"+config.currentMethod);var i=t("main");if(i.length){i.on("click",".sidebar-toggle",function(){t.toggleSidebar(i.hasClass("hide-sidebar"))});var n=t.zui.store.get(h,e.data("hide")!==!1);n===!1&&e.addClass("no-animate"),t.toggleSidebar(n),n===!1&&setTimeout(function(){e.removeClass("no-animate")},500);var o=e.find(".sidebar-toggle");if(o.length){var a=function(){var e=o[0].getBoundingClientRect(),i=t(window).height(),n=Math.max(0,Math.floor(Math.min(i-40,e.top+e.height)-Math.max(e.top,0))/2)+(e.top<0?0-e.top:0);o.removeClass("fade").find(".icon").css("top",n+(t.zui.browser.isIE()?(i-80)/2:0))};a(),e.data("init",1).on("sidebar.toggle",a);var s=t.zui.browser.isIE()?1500:0,r=0,l=null,c=function(){var t=Date.now();return l&&(clearTimeout(l),l=null),t-rtr input[type="checkbox"]:checked');i.each(function(){var i=parseInt(t(this).val(),10);NaN!==i&&e.push(i)}),t.cookie("checkedItem",e.join(","),{expires:config.cookieLife,path:config.webRoot})},t.extend(t.fn.modal.bs.Constructor.DEFAULTS,{scrollInside:!0,backdrop:"static",headerHeight:100}),t.extend(t.zui.ModalTrigger.DEFAULTS,{scrollInside:!0,backdrop:"static",headerHeight:40}),t.fn.initIframeModal=function(){return this.each(function(){var e=t(this);if(!e.parents('[data-ride="table"],.skip-iframe-modal').length){var i={type:"iframe"};e.hasClass("export")&&t.extend(i,{width:800,shown:setCheckedCookie},e.data()),e.modalTrigger(i)}})},t(function(){t("a.iframe,.export").initIframeModal()});var d=function(){var e,i,n=t(this),o=t.extend({limitSize:40,suffix:"…"},n.data()),a=n.text();if(a.length>o.limitSize){e=a,i=a.substr(0,o.limitSize)+o.suffix,n.text(i).addClass("limit-text-on");var s=o.toggleBtn?t(o.toggleBtn):n.next(".text-limit-toggle");s.text(s.data("textExpand")),s.on("click",function(){var t=n.toggleClass("limit-text-on").hasClass("limit-text-on");n.text(t?i:e),s.text(s.data(t?"textExpand":"textCollapse"))})}else(o.toggleBtn?t(o.toggleBtn):n.next(".text-limit-toggle")).hide()};t.fn.textLimit=function(){return this.each(d)},t(function(){t(".text-limit").textLimit()}),t.fixedTableHead=window.fixedTableHead=function(e,i){var n=t(e);if(n.is("table")||(n=n.find("table")),n.length){var o=t(i||window),a=null,s=function(){var e=n.children("thead"),i=e[0].getBoundingClientRect(),o=n.next(".fixed-head-table");if(i.top<0){var s=e.width();if(o.length){if(a!==s){a=s;var r=o.find("th"); +o.not(".group-summary").toggleClass("hidden",!s),a.toggleClass("hidden",s),t("body").toggleClass("table-group-collapsed",!this.$.find("tbody>tr.group-summary.hidden").length)},r.prototype.updateStatistic=function(){var i=this,n=i.$.find(".table-statistic");if(n.length){if(i.defaultStatistic===e&&(i.defaultStatistic=n.html()),i.options.statisticCreator)return void n.html(i.options.statisticCreator(i)||i.defaultStatistic);var o=i.statisticCols;if(!o&&o!==!1){o={};var a=!1;i.getTable().find("thead th").each(function(e){var i=t(this),n=i.data("statistic");n&&(a=!0,o[e]={format:n,name:i.text()})}),i.statisticCols=!!a&&o}var s=0;o&&t.each(o,function(t){o[t].total=0,o[t].checkedTotal=0}),i.$.find(i.isDataTable?".fixed-left tbody>tr":"tbody>tr").each(function(){var e=t(this),i=e.hasClass("checked"),n=e.children("td");i&&s++,o&&t.each(o,function(t){var e=parseFloat(n.eq(t).text());isNaN(e)&&(e=0),o[t].total+=e,i&&(o[t].checkedTotal+=e)})});var r=[];if(s)r.push(i.lang.selectedItems.format(s));else if(i.defaultStatistic)return void n.html(i.defaultStatistic);o&&t.each(o,function(t){var e=o[t],n=e[s?"checkedTotal":"total"];e.format&&(n=e.format.format(n)),r.push(i.lang.attrTotal.format(e.name,n))}),n.html(r.join(", "))}},r.prototype.updateFixUI=function(e){var i=this,n=(new Date).getTime();if(!e&&(i.lastUpdateCall&&clearTimeout(i.lastUpdateCall),!i.lastUpdateTime||n-i.lastUpdateTime
    ').append(t('
    ').addClass(i.attr("class")).append(n.clone())).insertAfter(i)),c){var d=h[0].getBoundingClientRect();l.css({left:d.left,width:h.width(),overflow:"hidden"}),l.find(".fixed-header-copy").css({left:o.left-d.left,position:"relative",minWidth:i.width()}),a||h.data("fixHeaderScroll")||(h.data("fixHeaderScroll",1),i.width()>h.width()&&h.on("scroll",function(){e.fixHeader()}))}else l.css({left:o.left,width:o.width});var u=l.find("th");n.find("th").each(function(e){u.eq(e).css("width",t(this).outerWidth())})}else l.remove()},r.prototype.fixFooter=function(){var e,i=this,n=i.getTable(),o=i.$.find(".table-footer");if(i.isDataTable)e=n[0].getBoundingClientRect();else{var a=n.find("tbody");if(!a.length)return;e=a[0].getBoundingClientRect()}var s=i.options.fixFooter;o.toggleClass("fixed-footer",!!r);var r="function"==typeof s?s(e,o):e.bottom>window.innerHeight-50-("number"==typeof s?s:i.pageFooterHeight||5);o.toggleClass("fixed-footer",!!r),n.toggleClass("with-footer-fixed",!!r),n.trigger("fixFooter",r);var l=t("body"),h=l.hasClass("body-modal");if(r){var c=n.parent(),d=c.is(".table-responsive");o.css({bottom:i.pageFooterHeight||0,left:d?c[0].getBoundingClientRect().left:e.left,width:d?c.width():e.width}),h&&l.css("padding-bottom",40)}else o.css({width:"",left:0,bottom:0}),h&&l.css("padding-bottom",0)},r.prototype.checkAll=function(e){var i=this,n=i.$.find(i.isDataTable?".fixed-left tbody>tr":"tbody>tr");n.each(function(){i.checkRow(t(this),e,!0)}),i.updateCheckUI()},r.prototype.checkRow=function(t,i,n){var o=this;o.isDataTable&&!t.is(".datatable-row-left")&&(t=o.getTable().find('.datatable-row-left[data-index="'+t.data("index")+'"]'));var a=t.find('input[type="checkbox"]');a.length&&!a.is(":disabled")&&(i===e&&(i=!a.is(":checked")),o.isDataTable?o.getTable().find('.datatable-row[data-index="'+t.data("index")+'"]').toggleClass("checked",i):t.toggleClass("checked",i),this.checkItems[t.data("id")]=i,a.prop("checked",i).trigger("change"),n||o.updateCheckUI())},r.prototype.updateCheckUI=function(){var e=this,i=e.getTable(),n=i.find(e.isDataTable?".fixed-left tbody>tr":"tbody>tr").not(".group-summary"),o=!1,a=null,s=0,r=!1,l=n.length;n.each(function(n){var h=t(this),c=h.find('input[type="checkbox"]');if(!c.length)return void l--;r=c.is(":checked");var d=e.isDataTable?i.find('.datatable-row[data-index="'+h.data("index")+'"]'):h;d.toggleClass("checked",r),d.toggleClass("row-check-begin",r&&!o),a&&a.toggleClass("row-check-end",!r&&o),r&&(s+=1),a=d,o=r,l===n+1&&d.toggleClass("row-check-end",r)}),e.$.toggleClass("has-row-checked",s>0).find(".check-all").toggleClass("checked",!(!l||s!==l)),e.updateStatistic(),e.options.onCheckChange&&e.options.onCheckChange(),i.trigger("checkChange")},r.DEFAULTS={checkable:!0,checkOnClickRow:!0,ajaxForm:!1,selectable:!0,fixHeader:!a,fixFooter:!a,iframeWidth:900,replaceId:"self",nestLevelIndent:18,nested:!1,preserveNested:!0,hot:!1,iframeModalTrigger:".iframe"},t.fn.table=function(e){return this.each(function(){var n=t(this),o=n.data(i),a="object"==typeof e&&e;o||n.data(i,o=new r(this,a)),"string"==typeof e&&o[e]()})},r.NAME=i,t.fn.table.Constructor=r,t(function(){t('[data-ride="table"]').table()})}(jQuery,void 0),function(t,e,i){t.fn._ajaxForm=t.fn.ajaxForm;var n={timeout:e.config?e.config.timeout:0,dataType:"json",method:"post"},o="";t.fn.enableForm=function(e,n,o){return e===i&&(e=!0),this.each(function(){var i=t(this);n||i.find('[type="submit"]').attr("disabled",e?null:"disabled"),!o&&i.hasClass("load-indicator")&&i.toggleClass("loading",!e),i.toggleClass("form-disabled",!e)})},t.enableForm=function(e,i,n,o){"string"==typeof e||e instanceof t?e=t(e):(o=n,n=i,i=e,e=t("form")),e.enableForm(i!==!1,n,o)},t.disableForm=function(e,i,n){t.enableForm(e,!1,i,n)};var a=function(e,i,n){"string"==typeof i&&(n=i,i=null),n=n||"show",t.zui.messager?t.zui.messager[n](e,i):alert(e)};t.ajaxForm=function(s,r){var l=t(s);if(l.length>1)return l.each(function(){t.ajaxForm(this,r)});"function"==typeof r&&(r={complete:r}),r=t.extend({},n,l.data(),r);var h=r.beforeSubmit,c=r.error,d=r.success,u=r.finish;delete r.finish,delete r.success,delete r.onError,delete r.beforeSubmit,r=t.extend({beforeSubmit:function(n,a,s){if(l.removeClass("form-watched").enableForm(!1),(h&&h(n,a,s))!==!1){var r={},c=a.find('[type="file"]');r.fileapi=c.length&&c[0].files!==i,r.formdata=e.FormData!==i;var d=r.fileapi&&a.find('input[type="file"]:enabled').filter(function(){return""!==t(this).val()}),u=d.length,f="multipart/form-data",p=a.attr("enctype")==f||a.attr("encoding")==f,g=r.fileapi&&r.formdata,m=u&&!g||p&&!r.formdata;m&&(""==o&&(o=s.url),s.url!=o&&(s.url=o),s.url=s.url.indexOf("&")>=0?s.url+"&HTTP_X_REQUESTED_WITH=XMLHttpRequest":s.url+"?HTTP_X_REQUESTED_WITH=XMLHttpRequest")}},success:function(i,n,o){if((d&&d(i,n,o,l))!==!1){try{"string"==typeof i&&(i=JSON.parse(i))}catch(s){}if(null===i||"object"!=typeof i)return i?alert(i):a("No response.","danger");var h=r.responser?t(r.responser):l.find(".form-responser");h.length||(h=t("#responser"));var c=i.message,f=function(){var n=i.callback;if(n){var o=n.indexOf("("),a=(o>0?n.substr(0,o):n).split("."),s=e,r=a[0];a.length>1&&(r=a[1],"top"===a[0]?s=e.top:"parent"===a[0]&&(s=e.parent));var h=s[r];if("function"==typeof h){var c=[];return o>0&&")"==n[n.length-1]&&(c=t.parseJSON("["+n.substring(o+1,n.length-1)+"]")),c.push(i),h.apply(l,c)}}};if("success"===i.result){var p=r.locate||i.locate;if(l.enableForm(!0,!!p),c){var g=l.find('[type="submit"]').first(),m=!1;g.length&&(g.popover({container:"body",trigger:"manual",content:c,tipClass:"popover-in-modal popover-success popover-form-result",placement:i.placement||g.data("placement")||r.popoverPlacement||"right"}).popover("show"),setTimeout(function(){g.popover("destroy")},r.popoverTime||2e3),m=!0),h.length&&(h.html(''+c+"").show().delay(3e3).fadeOut(100),m=!0),m||a(c,"success")}if(u)return u(i,!0,l);if((r.closeModal||i.closeModal)&&setTimeout(t.zui.closeModal,r.closeModalTime||2e3),f()===!1)return;if(p)if("loadInModal"==p){var v=t(".modal");setTimeout(function(){v.load(v.attr("ref"),function(){t(this).find(".modal-dialog").css("width",t(this).data("width")),t.zui.ajustModalPosition()})},1e3)}else"parent"===p||"top"===p?e[p]&&setTimeout(function(){e[p].location.reload()},1200):"reload"===p?setTimeout(function(){e.location.href=e.location.href},1200):setTimeout(function(){t.tabs?t.tabs.open(p):e.location.href=p},1200);var y=r.ajaxReload||i.ajaxReload;if(y){var b=t(y);b.length&&b.load(e.location.href+" "+y,function(){b.find('[data-toggle="modal"]').modalTrigger()})}}else{if(l.enableForm(),"string"==typeof c)h.length?h.html(''+c+"").show().delay(3e3).fadeOut(100):a(c,"danger");else if("object"==typeof c){var w=!1,x=[];t.each(c,function(e,i){var n=t.isArray(i)?i.join(""):i,o=t("#"+e);if(!o.length)return void x.push(n);var a=e+"Label",s=t("#"+a);if(!s.length){var r=o.closest(".input-group").length,l=o.closest("td").length;s=t('
    ').appendTo(l?o.closest("td"):r?o.closest(".input-group").parent():o.parent())}s.empty().append(n),o.addClass("has-error");var h=function(){var e=t("#"+a);if(e.length)return e.remove(),o.removeClass("has-error"),!0};o.on("change input mousedown",h);var c=t("#"+e+"_chosen");if(c.length&&c.find(".chosen-single,.chosen-choices").addClass("has-error").on("mousedown",function(){h()===!0&&t(this).removeClass("has-error")}),!w){if(o.hasClass("chosen"))o.trigger("chosen:activate");else if(o.is("textarea")&&o.data("keditor")){var d=o.data("keditor");d.focus(),d.edit.doc.body.focus()}else o.focus();w=!0}}),x.length&&a(x.join(";"),"danger")}if(u)return u(i,!1,l);if(f()===!1)return}}},error:function(t,i,n){if((c&&c(t,i,n,l))!==!1){l.enableForm();var o="timeout"==i||"error"==i?e.lang?e.lang.timeout:i:t.responseText+i+n;a(o,"danger")}}},r),l._ajaxForm(r).data("zui.ajaxform",!0),l.on("click","[data-form-action]",function(){l.attr("action",t(this).data("formAction")).submit()})},t.setAjaxForm=function(e,i,n){t.ajaxForm(e,t.isPlainObject(i)?i:{onFinish:i,beforeSubmit:n})},t.fn.ajaxForm=function(e){return this.each(function(){t.ajaxForm(this,e)})},t.fn.setInputRequired=function(){return this.each(function(){var e=t(this),i=e.parent();i.is(".input-control,td")?i.addClass("required"):e.is(".chosen")?e.attr("required",null).next(".chosen-container").addClass("required"):i.addClass("required"),e.attr("required",null);var n=i.closest(".input-group");n.length&&1===n.find(".required,input[required],select[required]").length&&n.addClass("required")})},t(function(){t('.form-ajax,form[data-type="ajax"]').ajaxForm(),setTimeout(function(){var i=e.config.requiredFields,n=t("form");i&&(i=i.split(",")),i&&i.length&&t.each(i,function(t,e){n.find("#"+e).attr("required","required")}),n.find("input[required],select[required],textarea[required]").setInputRequired()},400),t('form[target="hiddenwin"]').on("submit",function(){var e=t(this);e.data("zui.ajaxform")||e.enableForm(!1).data("disabledTime",(new Date).getTime())}).on("click",function(){var e=t(this),i=e.data("disabledTime");i&&(new Date).getTime()-i>1e4&&e.enableForm(!0).data("disabledTime",null)})})}(jQuery,window,void 0),function(t){"use strict";var e="zui.searchList",i=function(t,e){if(t&&t.length)for(var i=0;i
    ').append(s)),i.$menu.append(s),i.$menu.removeClass("loading"),i.isLoaded=!0,e&&e(!0)},error:function(){i.$menu.removeClass("loading").append('
    '+(n.errorText||window.lang&&window.lang.timeout)+"
    "),e&&e(!1)}},n.ajax))},n.prototype.scrollTo=function(t){t.length&&t[0].scrollIntoViewIfNeeded&&t[0].scrollIntoViewIfNeeded({behavior:"smooth"})},n.prototype.getItems=function(){return this.$.find(this.options.selector).addClass("search-list-item")},n.prototype.getActiveItem=function(){return this.getItems().filter(".active:first")},n.prototype.search=function(e){var n=this,o=void 0===e||null===e||""===e;n.$.toggleClass("has-search-text",!o);var a=n.getItems().removeClass("active");if(o)a.removeClass("hidden");else{var s=t.trim(e).split(" ");a.each(function(){var e=t(this),n=e.text()+" "+(e.data("key")||e.data("filter"));e.toggleClass("hidden",!i(s,n))})}n.scrollTo(a.not(".hidden").first().addClass("active"))},n.DEFAULTS={selector:".list-group a:not(.not-list-item)",searchBox:".search-box",onSelectItem:null},t.fn.searchList=function(i){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof i&&i;a||o.data(e,a=new n(this,s)),"string"==typeof i&&a[i]()})},n.NAME=e,t.fn.searchList.Constructor=n,t(function(){t('[data-ride="searchList"]').searchList()})}(jQuery),function(t){"use strict";var e="zui.labelSelector",i=function(n,o){var a=this;a.name=e,a.$=t(n),o=a.options=t.extend({},i.DEFAULTS,this.$.data(),o),a.$.hide(),a.update()};i.prototype.select=function(t){t+="",this.$wrapper.find(".label.active").removeClass("active"),this.$wrapper.find('.label[data-value="'+t+'"]').addClass("active"),this.$.val(t).trigger("change")},i.prototype.update=function(){var e=this,i=e.options,n=e.$wrapper;if(!n){if(i.wrapper)n=t(i.wrapper);else{var o=e.$.next();n=o.hasClass(".label-selector")?o:t('
    ')}n.parent().length||e.$.after(n),e.$wrapper=n,n.on("click",".label",function(i){var n=e.$.val(),o=t(this).data("value");e.hasEmptyValue!==!1&&o==n&&(o=e.hasEmptyValue),e.select(o),i.preventDefault()})}n.empty();var a=e.$.val();e.hasEmptyValue=!1,e.$.children("option").each(function(){var e=t(this),o={label:e.text(),value:e.val()},s=""===o.value||"0"===o.value,r=t(i.labelTemplate||'');i.labelClass&&!s&&r.addClass(i.labelClass),i.labelCreator?r=i.labelCreator(r):(r.data("option",o).attr("data-value",o.value),s&&!o.label?r.addClass("empty").append(''):r.text(o.label).toggleClass("active",a===o.value)),n.append(r)})},i.DEFAULTS={},t.fn.labelSelector=function(n){return this.each(function(){var o=t(this),a=o.data(e),s="object"==typeof n&&n;a||o.data(e,a=new i(this,s)),"string"==typeof n&&a[n]()})},i.NAME=e,t.fn.labelSelector.Constructor=i,t(function(){t('[data-provide="labelSelector"]').labelSelector()})}(jQuery),function(t){"use strict";var e="zui.fileInput",i=t.BYTE_UNITS={B:1,KB:1024,MB:1048576,GB:1073741824,TB:1099511627776},n=t.formatBytes=function(t,e,n){return void 0===e&&(e=2),n||(n=ts.fileMaxSize&&(h.val(""),(window.bootbox||window).alert(s.fileSizeError.format(n(s.fileMaxSize)))),r.update()}),r.update()};a.prototype.getFile=function(){var t=this.$input.prop("files");return t&&t[0]},a.prototype.update=function(){var t=this,e=t.$,i=t.getFile(),o=!i;e.toggleClass("normal",!o).toggleClass("empty",o),i?(t.oldName=i.name,e.find(".file-title").text(i.name).attr("title",i.name),e.find(".file-size").text(n(i.size)),e.find(".file-editbox").val(i.name).attr("size",i.name.length),t.options.onSelect&&t.options.onSelect(i,t)):e.find(".file-editbox").val("")},a.DEFAULTS={fileMaxSize:0,fileSizeError:"无法上传大于 {0} 的文件。"},t.fn.fileInput=function(i){return this.each(function(){var n=t(this),o=n.data(e),s="object"==typeof i&&i;o||n.data(e,o=new a(this,s)),"string"==typeof i&&o[i]()})},a.NAME=e,t.fn.fileInput.Constructor=a,t(function(){t('[data-provide="fileInput"]').fileInput()});var s="zui.fileInputList",r=function(e,i){var n=this;n.name=s;var o=n.$=t(e);i=n.options=t.extend({},r.DEFAULTS,this.$.data(),i),n.$template=o.find(".file-input").detach(),n.add()};r.prototype.add=function(){var t=this,e=t.options,i=t.$template.clone();"before"===e.appendWay?t.$.prepend(i):t.$.append(i),i.fileInput({fileMaxSize:e.eachFileMaxSize,fileSizeError:e.fileSizeError,onDelete:function(e){e.$.remove(),t.options.onDelete&&t.options.onDelete(e,t)},onSelect:function(e,i){t.add(),t.options.onSelect&&t.options.onSelect(e,i,t)}})},r.DEFAULTS={fileMaxSize:0,eachFileMaxSize:0,appendWay:"after",fileSizeError:"无法上传大于 {0} 的文件。"},t.fn.fileInputList=function(e){return this.each(function(){var i=t(this),n=i.data(s),o="object"==typeof e&&e;n||i.data(s,n=new r(this,o)),"string"==typeof e&&n[e]()})},r.NAME=s,t.fn.fileInputList.Constructor=r,t(function(){t('[data-provide="fileInputList"]').fileInputList()})}(jQuery),function(t){window.config||(window.config={}),t.createLink=window.createLink=function(e,n,o,a,s,r,l){if("object"==typeof e)return t.createLink(e.moduleName,e.methodName,e.vars,e.viewType,e.isOnlyBody,e.hash,e.tid);if(t.tabSession&&!l&&(l=t.tabSession.getTid()),a||(a=config.defaultView),s||(s=!1),o)for("string"==typeof o&&(o=o.split("&")),i=0;i'+d+"")}}t.val()||(time=e(a.format("hh:mm")),time=time-time%10+10,t.val(n(time)))};t.fn.timeSpanControl=function(i){return this.each(function(){var s=t(this),r=t.extend({},i,s.data()),l=s.find('[name="begin"],.control-time-begin'),h=s.find('[name="end"],.control-time-end'),c=function(){var t=l.val();if(s.find(".hide-empty-begin").toggleClass("hide",!t),t){var i=n(e(t)+30);h.find('option[value="'+i+'"]').length&&h.val(i),r.onChange&&r.onChange(h,i)}};if(s.data("timeSpanControlInit")){if(r.begin){var d=o(r.begin).format("hh:mm");l.find('option[value="'+d+'"]').length&&l.val(d),r.onChange&&r.onChange(l,d)}if(r.end){var u=o(r.end).format("hh:mm");h.find('option[value="'+u+'"]').length&&h.val(u),r.onChange&&r.onChange(h,u)}}else l.on("change",c),a(l,r.begin),a(h,r.end),s.data("timeSpanControlInit",!0);r.end||c()})},t.timeSpanControl={convertTimeToNum:e,convertNumToTime:n,initTimeSelect:a,createTime:o};var s=t.setSearchType=function(e,i){var n=t("#searchType");e||(e=n.val()),e=e||"bug",n.val(e);var o=t("#searchTypeMenu");o.find("li.selected").removeClass("selected");var a=o.find('a[data-value="'+e+'"]'),s=a.text();a.parent().addClass("selected"),t("#searchTypeName").text(s),i||t("#searchInput").focus()};t.gotoObject=function(e,i){if(e||(e=t("#searchType").val()),i||(i=t("#searchInput").val()),i&&e)if(i=i.replace(/[^\d]/g,"")){var n=e.split("-");e=n[0];var o=n.length>1?n[1]:"testsuite"===e?"library":"view",a=t.createLink(e,o,"id="+i);t.apps?t.apps.open(a):window.location.href=a}else{var s={zh_cn:"请输入数字ID进行搜索",zh_tw:"請輸入數值ID行搜索"};alert(lang.searchTip||s[t.zui.clientLang()]||"Please enter a numberic id to search")}t("#searchInput").val(i).focus()},t(function(){s(null,!0),t(document).on("keydown",function(e){e.ctrlKey&&71===e.keyCode&&(t("#searchInput").val("").focus(),e.stopPropagation(),e.preventDefault())})}),t.removeAnchor=window.removeAnchor=function(t){var e=t.lastIndexOf("#");return e>-1?t.substr(0,e):t},t.refreshPage=function(t){t?window.parent.location.reload():window.location.reload()},t.selectLang=window.selectLang=function(e){t.cookie("lang",e,{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("selectLang"),t.refreshPage(1)},t.selectTheme=window.selectTheme=function(e){t.cookie("theme",e,{expires:config.cookieLife,path:config.webRoot}),t.ajaxSendScore("selectTheme"),t.refreshPage(1)},t.zui.Picker&&t.zui.Picker.enableChosen(),t.chosenDefaultOptions={middle_highlight:!0,disable_search_threshold:1,compact_search:!0,allow_single_deselect:!0,placeholder_text_single:" ",placeholder_text_multiple:" ",search_contains:!0,max_drop_width:500,max_drop_height:245,no_wrap:!0,drop_direction:function(){var e=t(this.container).closest(".table-responsive:not(.scroll-none)");if(e.length){if(this.drop_directionFixed)return this.drop_directionFixed;e.css("position","relative");var i="down",n=this.container.find(".chosen-drop"),o=this.container.position(),a=n.outerHeight();return o.top>=a&&o.top+31+a>e.outerHeight()&&(i="up"),this.drop_directionFixed=i,i}return"auto"}},t.chosenSimpleOptions=t.extend({},t.chosenDefaultOptions,{disable_search_threshold:6}),t.fn._chosen=t.fn.chosen,t.fn.chosen=function(e){return"string"==typeof e?this._chosen(e):this.each(function(){var i=t(this).addClass("chosen-controled");return i._chosen(t.extend({},i.hasClass("chosen-simple")?t.chosenSimpleOptions:t.chosenDefaultOptions,i.data(),e))})},t.fn.chosen.Constructor=t.fn._chosen.Constructor,t(function(){t(".chosen,.chosen-simple").each(function(){var e=t(this);e.closest(".template").length||e.chosen()})}),t.extend(t.fn.pager.Constructor.DEFAULTS,{maxNavCount:8,prevIcon:"icon-angle-left",nextIcon:"icon-angle-right",firstIcon:"icon-first-page",lastIcon:"icon-last-page",navEllipsisItem:"…",menuDirection:"dropup",pageSizeOptions:[5,10,15,20,25,30,35,40,45,50,100,200,500,1e3,2e3],elements:["total_text","size_menu","first_icon","prev_icon",'
    {page}/{totalPage}
    ',"next_icon","last_icon"],onPageChange:function(e,i){e.recPerPage!==i.recPerPage&&t.cookie(this.options.pageCookie,e.recPerPage,{expires:config.cookieLife,path:config.webRoot}),e.recPerPage!==i.recPerPage&&(window.location.href=this.createLink())}}),t.extend(!0,t.zui.Messager.DEFAULTS,{cssClass:"messagger-zt",icons:{success:"check-circle",info:"chat-line",warning:"exclamation-sign",danger:"exclamation-sign"}}),t.fn.reverseOrder=function(){return this.each(function(){var e=t(this);e.prependTo(e.parent())})};var r=function(e,i){var n=t(e);if(!n.data("historiesInited")){n.data("historiesInited",1),i=t.extend({},n.data(),i);var o=n.find(".histories-list"),a=!0,s=!1;n.on("click",".btn-reverse",function(){o.children("li").reverseOrder(),a=!a,t(this).find(".icon").toggleClass("icon-arrow-up",a).toggleClass("icon-arrow-down",!a);var e="#lastComment",i=t(e);i.length&&window.KindEditor&&(window.KindEditor.remove(e),i.kindeditor())}).on("click",".btn-expand-all",function(){var e=t(this).find(".icon");s=!s,e.toggleClass("icon-plus",!s).toggleClass("icon-minus",s),o.children("li").toggleClass("show-changes",s)}).on("click",".btn-expand",function(){t(this).closest("li").toggleClass("show-changes")}).on("click",".btn-strip",function(){var e=t(this),n=e.find(".icon"),o=n.hasClass("icon-code");n.toggleClass("icon-code",!o).toggleClass("icon-text",o),e.attr("title",o?i.original:i.textdiff),e.closest("li").toggleClass("show-original",o)}),o.find(".btn-strip").attr("title",i.original);var r=n.find(".modal-comment").modal({show:!1}).on("shown.zui.modal",function(){var t=r.find("#comment");t.length&&(t.focus(),window.editor&&window.editor.comment&&window.editor.comment.focus())}).on("show.zui.modal",function(){var e=r.find("#comment");e.length&&!e.data("keditor")&&t.fn.kindeditor&&e.kindeditor()});n.on("click",".btn-comment",function(t){r.modal("toggle"),t.preventDefault()}).on("click",".btn-edit-comment,.btn-hide-form",function(){t(this).closest("li").toggleClass("show-form")});var l=n.find(".comment-edit-form");l.ajaxForm({success:function(t,e,i,n){setTimeout(function(){l.closest("li").removeClass("show-form")},2e3)}})}};t.fn.histories=function(t){return this.each(function(){r(this,t)})},t(function(){t(".histories").histories()});var l=0,h=0;t.toggleSidebar=function(e){var i=t("#sidebar");if(i.length){var n=t("main");if(void 0===e)e=n.hasClass("hide-sidebar");else if(e&&!n.hasClass("hide-sidebar"))return;n.toggleClass("hide-sidebar",!e),clearTimeout(l),t.zui.store.set(h,e);var o=i.children(".cell"),a={overflow:"visible",maxHeight:"initial"};e?(i.addClass("showing"),l=setTimeout(function(){i.removeClass("showing"),i.trigger("sidebar.toggle",e)},210)):(i.trigger("sidebar.toggle",e),t(window).width()<1900&&(a={overflow:"hidden",maxHeight:t(window).height()-45})),o.css(a)}};var c=t.initSidebar=function(){var e=t("#sidebar");if(e.length){if(e.data("init"))return!0;h="sidebar:"+(e.data("id")||config.currentModule+"/"+config.currentMethod);var i=t("main");if(i.length){i.on("click",".sidebar-toggle",function(){t.toggleSidebar(i.hasClass("hide-sidebar"))});var n=t.zui.store.get(h,e.data("hide")!==!1);n===!1&&e.addClass("no-animate"),t.toggleSidebar(n),n===!1&&setTimeout(function(){e.removeClass("no-animate")},500);var o=e.find(".sidebar-toggle");if(o.length){var a=function(){var e=o[0].getBoundingClientRect(),i=t(window).height(),n=Math.max(0,Math.floor(Math.min(i-40,e.top+e.height)-Math.max(e.top,0))/2)+(e.top<0?0-e.top:0);o.removeClass("fade").find(".icon").css("top",n+(t.zui.browser.isIE()?(i-80)/2:0))};a(),e.data("init",1).on("sidebar.toggle",a);var s=t.zui.browser.isIE()?1500:0,r=0,l=null,c=function(){var t=Date.now();return l&&(clearTimeout(l),l=null),t-rtr input[type="checkbox"]:checked');i.each(function(){var i=parseInt(t(this).val(),10);NaN!==i&&e.push(i)}),t.cookie("checkedItem",e.join(","),{expires:config.cookieLife,path:config.webRoot})},t.extend(t.fn.modal.bs.Constructor.DEFAULTS,{scrollInside:!0,backdrop:"static",headerHeight:100}),t.extend(t.zui.ModalTrigger.DEFAULTS,{scrollInside:!0,backdrop:"static",headerHeight:40}),t.fn.initIframeModal=function(){return this.each(function(){var e=t(this);if(!e.parents('[data-ride="table"],.skip-iframe-modal').length){var i={type:"iframe"};e.hasClass("export")&&t.extend(i,{width:800,shown:setCheckedCookie},e.data()),e.modalTrigger(i)}})},t(function(){t("a.iframe,.export").initIframeModal()});var d=function(){var e,i,n=t(this),o=t.extend({limitSize:40,suffix:"…"},n.data()),a=n.text();if(a.length>o.limitSize){e=a,i=a.substr(0,o.limitSize)+o.suffix,n.text(i).addClass("limit-text-on");var s=o.toggleBtn?t(o.toggleBtn):n.next(".text-limit-toggle");s.text(s.data("textExpand")),s.on("click",function(){var t=n.toggleClass("limit-text-on").hasClass("limit-text-on");n.text(t?i:e),s.text(s.data(t?"textExpand":"textCollapse"))})}else(o.toggleBtn?t(o.toggleBtn):n.next(".text-limit-toggle")).hide()};t.fn.textLimit=function(){return this.each(d)},t(function(){t(".text-limit").textLimit()}),t.fixedTableHead=window.fixedTableHead=function(e,i){var n=t(e);if(n.is("table")||(n=n.find("table")),n.length){var o=t(i||window),a=null,s=function(){var e=n.children("thead"),i=e[0].getBoundingClientRect(),o=n.next(".fixed-head-table");if(i.top<0){var s=e.width();if(o.length){if(a!==s){a=s;var r=o.find("th"); e.find("th").each(function(e){r.eq(e).width(t(this).width())})}}else{var o=t("
    ").addClass(n.attr("class")),l=e.clone(),r=l.find("th");e.find("th").each(function(e){r.eq(e).width(t(this).width())}),o.append(l).insertAfter(n)}o.css({left:i.left,width:i.width}).show()}else o.hide()};o.on("scroll",s).on("resize",s),s()}},t(document).on("click","tr[data-url]",function(){var e=t(this),i=e.data("href")||e.data("url");i&&(window.location.href=i)}),"yes"===config.onlybody&&self===parent&&(window.location.href=window.location.href.replace("?onlybody=yes","").replace("&onlybody=yes","")),t(function(){t("body").addClass("m-{currentModule}-{currentMethod}".format(config))});var u,f,p,g,m,v=function(){u||(u=t("#subNavbar"),f=t("#pageNav"),p=t("#pageActions"),g=u.children(".nav"),m=g.outerWidth());var e=u.outerWidth(),i=f.outerWidth()||0,n=p.outerWidth()||0;if(i=i?i+15:0,n=n?n+15:0,!i&&!n)return void g.css({maxWidth:null,left:null,position:"static"});var o=Math.max(300,e-i-n),a=Math.min(o,m),s=(e-a)/2,r=i&&s.btn-toolbar");if(e.length){var i,n,o=e.children(),a=o.length,s=!1,r=null;if(a)for(o.each(function(e){i=t(this),n=i.is(".divider"),n&&!r&&i.hide(),s||n||(s=!0),r=n?null:i,!n||e!==a-1&&0!==e||i.hide()});i.length&&i.is(".divider");)i=i.hide().prev();s||e.hide()}};t(function(){t(".input-group,.btn-group").fixInputGroup(),k()}),window.holders&&t.each(window.holders,function(e){var i=t("#"+e);i.length&&i.is("input")&&i.attr("placeholder",window.holders[e])}),t(function(){var e=t(".table-responsive"),i=t.fixTableResponsive=function(){e.each(function(){this.scrollHeight-3<=this.clientHeight&&this.scrollWidth-3<=this.clientWidth?t(this).addClass("scroll-none").css("overflow","visible"):t(this).removeClass("scroll-none").css("overflow","auto")})};e.length&&(t(window).on("resize",i),setTimeout(i,100))});var T=function(){var e=this,i=t(e),n=i.closest("tr").find("textarea");if(n.length){var o=32;n.each(function(){var e=t(this).closest("td"),i=e.css("height");e.css("height",this.style.height),this.style.height="auto";var n=this.value?this.scrollHeight+2:32;o=Math.max(o,n),e.css("height",i)}),n.css("height",o)}else{e.style.height="auto";var a=e.value?e.scrollHeight+2:32;e.style.height=a+"px"}};t.autoResizeTextarea=function(e){t(e).each(T)},t(function(){t("textarea.autosize").each(T),t(document).on("input paste change","textarea.autosize",T)}),t(function(){var e=t("#dropMenu,.drop-menu");e.length&&e.on("click",".toggle-right-col",function(e){t(this).closest("#dropMenu,.drop-menu").toggleClass("show-right-col"),e.stopPropagation(),e.preventDefault()})});var S="undefined"!=typeof InstallTrigger;t.zui.browser.firefox=S,t("html").toggleClass("is-firefox",S).toggleClass("not-firefox",!S),t(function(){var e=t("#mainContent>.main-col"),i=e.children(".main-actions");if(i.length){var n=i.prev();if(i.length&&n.length){t('
    ').css("height",i.outerHeight()).insertAfter(i);var o=0,a=function(){var e=n[0].getBoundingClientRect(),s=e.top+e.height+120>t(window).height();if(t("body").toggleClass("main-actions-fixed",s),s){var r=n.width();r?i.width(r):o<10&&setTimeout(a,1e3)}o++};t.resetToolbarPosition=a,a(),t(window).on("resize scroll",a)}}}),t(document).on("show.zui.modal",function(e){t("body.body-modal").length&&window.parent&&window.parent!==window&&t(e.target).is(".modal")&&window.parent.$("body").addClass("hide-modal-close")}).on("hidden.zui.modal",function(){t("body.body-modal").length&&window.parent&&window.parent!==window&&window.parent.$("body").removeClass("hide-modal-close")}),t(function(){var e=t(".dropdown-menu.with-search");e.length&&(e.find(".menu-search").on("click",function(t){return t.stopPropagation(),!1}),e.on("keyup change paste","input",function(){var e=t(this),i=e.closest(".dropdown-menu.with-search"),n=e.val().toLowerCase(),o=i.find(".option");""==n?o.removeClass("hide"):o.each(function(){var e=t(this);e.toggleClass("hide",e.text().toString().toLowerCase().indexOf(n)<0&&e.data("key").toString().toLowerCase().indexOf(n)<0)})}),e.parents(".dropdown-submenu").one("mouseenter",function(){var e=t(this).find(".dropdown-list")[0];e&&e.getBoundingClientRect&&setTimeout(function(){var t=270,i=e.getBoundingClientRect();i.top<0&&(t=Math.min(270,i.height)+i.top),e.style.maxHeight=Math.min(270,t)+"px"},50)})),t(".dropdown-menu.with-search .menu-search").on("click",function(t){return t.stopPropagation(),!1})})}(jQuery),function(t){function e(){var e=window.parent,i=config.currentModule,n=config.currentMethod,o="index"===i&&"index"===n,a="#_single"===location.hash||o||!t("#mainHeader,#editorNav").length||"tutorial"===i||"install"===i||"upgrade"===i||"user"===i&&("login"===n||"deny"===n)||"my"===i&&"changepassword"===n||t("body").hasClass("allow-self-open"),s=location.href;if(e===window&&!a){var r=location.pathname+location.search+location.hash,l="";return location.href=t.createLink("index","index",l)+"#app="+encodeURIComponent(r)}if(e!==window&&e.$.apps){o&&e.location.reload();var h=window.name;if(0===h.indexOf("app-")){t.apps=window.apps=e.$.apps;var c=h.substr(4);t.appCode=c,t(document).on("click",function(t){var i=e.document.getElementById(window.name);if(i){var n=e.document.getElementById(i.name)||i;n&&n.dispatchEvent(new Event(t.type,{bubbles:!0}))}}).on("click","a,.open-in-app,.show-in-app",function(e){var i=t(this);if(!i.is("[data-modal],[data-toggle],[data-ride],[data-tab],.iframe,.not-in-app,[target]")&&!i.data("zui.modaltrigger")){var n=i.hasClass("show-in-app")?"":i.attr("href")||(i.is("a")?"":i.data("url")),o=i.data("app")||i.data("group");if(n){if(0===n.indexOf("javascript:")||"#"===n[0])return;var a=t.parseLink(n);if("index"===a.moduleName&&"index"===a.methodName)return window.location.reload(),void e.preventDefault()}else if(!o)return;o||(o=t.apps.getAppCode(n)),o&&("help"===o&&(t.apps.appsMap.help.text=i.text(),t.apps.appsMap.help.url||(t.apps.appsMap.help.url=n)),t.apps.open(n,o)&&e.preventDefault())}}),t.apps.updateUrl(c,s,document.title)}}}function i(){var e=t("#navbar>.nav");if(e.length){var i=t("#heading"),n=+i.css("left").replace("px",""),o=i.outerWidth(),a=e.width(),s=t("#mainHeader>.container").width()-2*n,r=Math.floor((s-a)/2);e.css("marginLeft",r>>0;if(0===o)return!1;for(var a=0|e,s=Math.max(a>=0?a:o-Math.abs(a),0);s1&&("?"===e[0]&&(e=e.substr(1)),e.split("&").forEach(function(t){var e=t.split("=",2);if(e.length>1)try{i[e[0]]=decodeURIComponent(e[1])}catch(n){i[e[0]]=""}else i[e[0]]=""})),t?i[t]:i},t.parseLink=function(e){if(!e)return{};if((0===e.indexOf("http:")||0===e.indexOf("https:"))&&e.indexOf(window.location.origin)<0)return{};var i=e.split("#"),n=i[0].split("?"),o=n[1],a=o?t.getSearchParam("",o):{},s=n[0],r={isOnlyBody:"yes"===a.onlybody,vars:[],hash:i[1]||"",params:a,tid:a.tid||""};if("GET"===config.requestType){r.moduleName=a[config.moduleVar]||"index",r.methodName=a[config.methodVar]||"index",r.viewType=a[config.viewVar]||config.defaultView;for(var l in a)l!==config.moduleVar&&l!==config.methodVar&&l!==config.viewVar&&"onlybody"!==l&&"tid"!==l&&r.vars.push([l,a[l]])}else{var h=s.lastIndexOf("/");h===s.length-1&&(s=s.substr(0,h),h=s.lastIndexOf("/")),h>=0&&(s=s.substr(h+1));var c=s.lastIndexOf(".");c>=0?(r.viewType=s.substr(c+1),s=s.substr(0,c)):r.viewType=config.defaultView;var d=s.split(config.requestFix);if(r.moduleName=d[0]||"index",r.methodName=d[1]||"index",d.length>2)for(var u=2;u.nav>li").length>10&&(i(),t(window).on("resize",i)),setTimeout(n,1e3)})}(jQuery),$.zui.lang("de",{"zui.pager":{pageOfText:"Seite {0}",prev:"Zurück",next:"Nächste Seite",first:"Erste Seite",last:"Letzte Seite","goto":"Goto",pageOf:"Seite {page}",totalPage:"{totalPage} Seiten",totalCount:"Total: {recTotal} Artikel",pageSize:"{recPerPage} Artikel pro Seite",itemsRange:"Seiten {start} bis {end}",pageOfTotal:"Seite {page}/{totalPage}"},"zui.boards":{append2end:"Gehen Sie zum Ende"},"zui.browser":{tip:"Online. Sorgenfrei. Aktualisiere deinen Browser noch heute!"},"zui.calendar":{weekNames:["Son","Mon","Die","Mit","Don","Fri","Sam"],monthNames:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",year:"{0}Jahr",month:"{0}Monat",yearMonth:"{0}-{1}"},"zui.chosenIcons":{emptyIcon:"[Kein Icon]",commonIcons:"Gemeinsame Symbole",webIcons:"Web-Symbol",editorIcons:"Editor-Symbol",directionalIcons:"Pfeil Zusammenfluss",otherIcons:"Andere Symbole"},"zui.colorPicker":{errorTip:"Kein gültiger Farbwert"},"zui.datagrid":{errorCannotGetDataFromRemote:"Daten vom Remote-Server ({0}) können nicht abgerufen werden.",errorCannotHandleRemoteData:"Die vom Remote-Server zurückgegebenen Daten können nicht verarbeitet werden."},"zui.guideViewer":{prevStep:"Vorheriger Schritt",nextStep:"Nächster Schritt"},"zui.tabs":{reload:"Neu laden",close:"Schliessen",closeOthers:"Schließen Sie andere Registerkarten",closeRight:"Schließen Sie die rechte Registerkarte",reopenLast:"Letzten geschlossenen Tab wiederherstellen",errorCannotFetchFromRemote:"Inhalt kann nicht vom Remote-Server abgerufen werden ({0})."},"zui.uploader":{},datetimepicker:{days:["Sonntag","Montag","Diensteg","Mittwoch","Donnerstag","Freitag","Samstag"],daysShort:["Son","Mon","Die","Mit","Don","Fri","Sam"],daysMin:["Son","Mon","Die","Mit","Don","Fri","Sam"],months:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],monthsShort:["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],today:"Heute",suffix:[],meridiem:[]},chosen:{no_results_text:"Nicht gefunden"},bootbox:{OK:"OK",CANCEL:"Stornieren",CONFIRM:"Bestätigen"}}),$.zui.lang("fr",{"zui.pager":{pageOfText:"Page {0}",prev:"Prev",next:"Suivant",first:"First",last:"Last","goto":"Goto",pageOf:"Page {page}",totalPage:"{totalPage} pages",totalCount:"Total: {recTotal} items",pageSize:"{recPerPage} per page",itemsRange:"De {start} à {end}",pageOfTotal:"Page {page} de {totalPage}"},"zui.boards":{append2end:"Aller jusqu'au bout"},"zui.browser":{tip:"Naviguez sans crainte sur Internet. Mettez votre navigateur à jour dès aujourd'hui!"},"zui.calendar":{weekNames:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],monthNames:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],today:"Aujourd'hui",year:"{0} Année",month:"{0} Mois",yearMonth:"{0}-{1}"},"zui.chosenIcons":{emptyIcon:"[Aucune icône]",commonIcons:"Icônes communes",webIcons:"Icône Web",editorIcons:"Icône de l'éditeur",directionalIcons:"Flèche confluence",otherIcons:"Autres icônes"},"zui.colorPicker":{errorTip:"Pas une valeur de couleur valide"},"zui.datagrid":{errorCannotGetDataFromRemote:"Impossible d'obtenir les données du serveur distant ({0}).",errorCannotHandleRemoteData:"Impossible de traiter les données renvoyées par le serveur distant."},"zui.guideViewer":{prevStep:"Étape précédente",nextStep:"Prochaine étape"},"zui.tabs":{reload:"Recharger",close:"Fermer",closeOthers:"Fermez les autres onglets",closeRight:"Fermer l'onglet de droite",reopenLast:"Restaurer le dernier onglet fermé",errorCannotFetchFromRemote:"Impossible d'obtenir le contenu du serveur distant ({0})."},"zui.uploader":{},datetimepicker:{days:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],daysShort:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],daysMin:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],months:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],monthsShort:["Jan","Fév","Mar","Avr","Mai","Juin","Juil","Août","Sep","Oct","Nov","Déc"],today:"Aujourd'hui",suffix:[],meridiem:[]},chosen:{no_results_text:"Pas trouvé"},bootbox:{OK:"D'accord",CANCEL:"Annuler",CONFIRM:"Confirmer"}}); \ No newline at end of file From d708c198a53c13cf2d782ec4415d22fc9120632a Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 16 Sep 2021 08:48:20 +0800 Subject: [PATCH 037/163] * Fix bug #15205. --- module/misc/js/features.js | 3 +++ module/misc/view/features.html.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/module/misc/js/features.js b/module/misc/js/features.js index 13563979b0..0e287f35fa 100644 --- a/module/misc/js/features.js +++ b/module/misc/js/features.js @@ -14,6 +14,9 @@ $(function() $('#featuresCarousel').on('slide.zui.carousel', function(e) { + /* Click next to pause the video play. */ + $('#guideVideo').trigger('pause'); + var $next = $(e.relatedTarget); var $items = $next.parent().children(); var index = $items.index($next); diff --git a/module/misc/view/features.html.php b/module/misc/view/features.html.php index c4632195cc..995a287805 100644 --- a/module/misc/view/features.html.php +++ b/module/misc/view/features.html.php @@ -24,7 +24,7 @@
    ' style='height: 395px'>
    - +

    install->introduction;?>

    From c352c8b9df22c1a6420411b59daada5b014c6fcc Mon Sep 17 00:00:00 2001 From: zenggang Date: Thu, 16 Sep 2021 09:43:41 +0800 Subject: [PATCH 038/163] * Fix bug#14830 --- module/product/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/product/model.php b/module/product/model.php index 25256181bd..3c11df1a76 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -845,7 +845,7 @@ class productModel extends model { $this->config->product->search['actionURL'] = $actionURL; $this->config->product->search['queryID'] = $queryID; - $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs($productID); + $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairs(($this->app->tab == 'project' and empty($productID)) ? array_keys($products) : $productID); $product = ($this->app->tab == 'project' and empty($productID)) ? $products : array($productID => $products[$productID]); $this->config->product->search['params']['product']['values'] = $product + array('all' => $this->lang->product->allProduct); From 70358073e39ae9870c2e6b15b76709aec4ecb35a Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 16 Sep 2021 11:33:53 +0800 Subject: [PATCH 039/163] * Fix bug #42594. --- module/bug/config.php | 2 +- module/bug/control.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/bug/config.php b/module/bug/config.php index 82b51996f6..e85eb78851 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -26,7 +26,7 @@ $config->bug->list->allFields = 'id, module, execution, story, task, $config->bug->list->defaultFields = 'id,severity,pri,title,openedBy,assignedTo,resolvedBy,resolution'; -$config->bug->list->exportFields = 'id, product, branch, module, execution, story, task, +$config->bug->list->exportFields = 'id, product, branch, module, project, execution, story, task, title, keywords, severity, pri, type, os, browser, steps, status, deadline, activatedCount, confirmed, mailto, openedBy, openedDate, openedBuild, diff --git a/module/bug/control.php b/module/bug/control.php index 569e47945c..6515e2e1ff 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -1719,6 +1719,7 @@ class bug extends control /* Get users, products and executions. */ $users = $this->loadModel('user')->getPairs('noletter'); $products = $this->loadModel('product')->getPairs(); + $projects = $this->loadModel('project')->getPairsByProgram(); $executions = $this->loadModel('execution')->getPairs($this->projectID, 'all', 'all'); /* Get related objects id lists. */ @@ -1777,6 +1778,7 @@ class bug extends control /* fill some field with useful value. */ $bug->product = !isset($products[$bug->product]) ? '' : $products[$bug->product] . "(#$bug->product)"; + $bug->project = !isset($projects[$bug->project]) ? '' : $projects[$bug->project] . "(#$bug->project)"; $bug->execution = !isset($executions[$bug->execution]) ? '' : $executions[$bug->execution] . "(#$bug->execution)"; $bug->story = !isset($relatedStories[$bug->story]) ? '' : $relatedStories[$bug->story] . "(#$bug->story)"; $bug->task = !isset($relatedTasks[$bug->task]) ? '' : $relatedTasks[$bug->task] . "($bug->task)"; @@ -1802,7 +1804,7 @@ class bug extends control if(isset($users[$bug->lastEditedBy])) $bug->lastEditedBy = $users[$bug->lastEditedBy]; if(isset($users[$bug->closedBy])) $bug->closedBy = $users[$bug->closedBy]; - $bug->title = htmlspecialchars_decode($bug->title,ENT_QUOTES); + $bug->title = htmlspecialchars_decode($bug->title,ENT_QUOTES); if($bug->linkBug) { From ddd1de7fa9d5f95c7770837e0f91cf34110e3d10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Thu, 16 Sep 2021 14:46:30 +0800 Subject: [PATCH 040/163] * Finish task #42588. --- module/report/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/report/model.php b/module/report/model.php index 05520623d3..547c5d3a82 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -317,9 +317,9 @@ class reportModel extends model $stmt = $this->dao->select('t1.*, t2.name as executionName')->from(TABLE_TASK)->alias('t1') ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id') ->where('t1.deleted')->eq(0) - ->andWhere('t1.status')->in('wait,doing') + ->andWhere('t1.status')->in('wait,pause,doing') ->andWhere('t2.deleted')->eq(0) - ->andWhere('t2.status')->in('wait, doing') + ->andWhere('t2.status')->in('wait,suspended,doing') ->andWhere('assignedTo')->ne(''); $allTasks = $stmt->fetchAll('id'); From b09b80d4e786df1bab92496f74a9336dc13e22db Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Fri, 17 Sep 2021 09:30:11 +0800 Subject: [PATCH 041/163] * Fix an error: Divide the my bug query condition from bug query condition. --- module/my/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/my/control.php b/module/my/control.php index 9f28a6b2bf..859af3765e 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -355,7 +355,7 @@ class my extends control $sort = $this->loadModel('common')->appendOrder($orderBy); $bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $type, $sort, 0, $pager); $bugs = $this->bug->checkDelayedBugs($bugs); - $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug'); + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'myBug'); /* assign. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->bug; From 1a0effc1e65356ddcc5d6695da71f620c99bb77c Mon Sep 17 00:00:00 2001 From: zenggang Date: Fri, 17 Sep 2021 09:51:23 +0800 Subject: [PATCH 042/163] * Fix bug15211,14525 --- module/product/view/all.html.php | 2 +- module/program/model.php | 3 ++- module/user/model.php | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index d4a595a923..11a054af9f 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -112,7 +112,7 @@ $line):?> - + config->systemMode == 'new' and $programID) diff --git a/module/program/model.php b/module/program/model.php index 7525d37122..272280b25d 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -632,11 +632,12 @@ class programModel extends model $whitelist = explode(',', $program->whitelist); $this->loadModel('personnel')->updateWhitelist($whitelist, 'program', $programID); - if($program->acl != 'open') $this->loadModel('user')->updateUserView($programID, 'program'); $this->file->updateObjectID($this->post->uid, $programID, 'program'); $this->setTreePath($programID); + if($program->acl != 'open') $this->loadModel('user')->updateUserView($programID, 'program'); + return $programID; } } diff --git a/module/user/model.php b/module/user/model.php index 949ac329b7..235a5ff082 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1917,8 +1917,12 @@ class userModel extends model $whiteList = zget($whiteListGroup, $program->id, array()); if($program->acl == 'program') { - $stakeholders += zget($parentStakeholderGroup, $program->id, array()); - $stakeholders += zget($parentPMGroup, $program->id, array()); + $parentIds = explode(',', $program->path); + foreach($parentIds as $parentId) + { + $stakeholders += zget($parentStakeholderGroup, $parentId, array()); + $stakeholders += zget($parentPMGroup, $parentId, array()); + } } $authedUsers += $this->getProgramAuthedUsers($program, $stakeholders, $whiteList); } From 555ecdd9a5d8f65b09d49fdfa1720ad594c64bb7 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 17 Sep 2021 10:22:21 +0800 Subject: [PATCH 043/163] * Fix test report run case error. --- module/testreport/control.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/module/testreport/control.php b/module/testreport/control.php index d7b4f6a99e..807802ceef 100644 --- a/module/testreport/control.php +++ b/module/testreport/control.php @@ -530,6 +530,9 @@ class testreport extends control $cases = $this->testreport->getTaskCases($tasks, $report->begin, $report->end); $bugInfo = $this->testreport->getBugInfo($tasks, $report->product, $report->begin, $report->end, $builds); + /* save session .*/ + $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false); + if($report->objectType == 'testtask') { $this->setChartDatas($report->objectID); From 9bcd85907f3a251038c886cf038ee13bf10e6d99 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 17 Sep 2021 10:26:57 +0800 Subject: [PATCH 044/163] * Fix bug #15228. --- module/testreport/view/blockcases.html.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/testreport/view/blockcases.html.php b/module/testreport/view/blockcases.html.php index 9c4cede667..0a63c3bf6e 100644 --- a/module/testreport/view/blockcases.html.php +++ b/module/testreport/view/blockcases.html.php @@ -1,4 +1,5 @@ session->notHead ? common::getSysURL() : '';?> + From ddb583a70715878ddbff1817449abc11ce51f34c Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Fri, 17 Sep 2021 10:53:08 +0800 Subject: [PATCH 045/163] * Fix bug #15230: Added judgment conditions for version when batch review stories. --- module/story/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/model.php b/module/story/model.php index 6ab29fba3b..239ebff8bc 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1327,7 +1327,7 @@ class storyModel extends model $oldStory = $oldStories[$storyID]; if($oldStory->status != 'draft' and $oldStory->status != 'changed') continue; if(!in_array($this->app->user->account, array_keys($reviewerList[$storyID]))) continue; - if(isset($hasResult[$storyID])) continue; + if(isset($hasResult[$storyID]) and $hasResult[$storyID]->version == $oldStories[$storyID]->version) continue; $story = new stdClass(); $story->reviewedDate = $now; From 497bcdb57432eab3c8a5957c42dc72cf3becb3b1 Mon Sep 17 00:00:00 2001 From: zenggang Date: Fri, 17 Sep 2021 11:11:36 +0800 Subject: [PATCH 046/163] * Fix bug#14490 --- module/product/model.php | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/module/product/model.php b/module/product/model.php index 3c11df1a76..6ee8c03633 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -958,13 +958,24 @@ class productModel extends model $emptyHour = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0); /* Get all tasks and compute totalEstimate, totalConsumed, totalLeft, progress according to them. */ - $tasks = $this->dao->select('id, project, estimate, consumed, `left`, status, closedReason') - ->from(TABLE_TASK) - ->where('project')->in($projectKeys) - ->andWhere('parent')->lt(1) - ->andWhere('deleted')->eq(0) - ->fetchGroup('project', 'id'); - + if($this->config->systemMode == 'new') + { + $tasks = $this->dao->select('id, project, estimate, consumed, `left`, status, closedReason') + ->from(TABLE_TASK) + ->where('project')->in($projectKeys) + ->andWhere('parent')->lt(1) + ->andWhere('deleted')->eq(0) + ->fetchGroup('project', 'id'); + } + else + { + $tasks = $this->dao->select('id, execution, estimate, consumed, `left`, status, closedReason') + ->from(TABLE_TASK) + ->where('execution')->in($projectKeys) + ->andWhere('parent')->lt(1) + ->andWhere('deleted')->eq(0) + ->fetchGroup('execution', 'id'); + } /* Compute totalEstimate, totalConsumed, totalLeft. */ foreach($tasks as $projectID => $projectTasks) { From ed613b4377d63202edfd9d722c8373d4ab28b9a1 Mon Sep 17 00:00:00 2001 From: zenggang Date: Fri, 17 Sep 2021 14:59:25 +0800 Subject: [PATCH 047/163] * Fix bug#15202 --- module/company/lang/de.php | 2 +- module/company/lang/en.php | 2 +- module/company/lang/fr.php | 2 +- module/company/lang/vi.php | 2 +- module/company/lang/zh-cn.php | 2 +- module/company/lang/zh-tw.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/company/lang/de.php b/module/company/lang/de.php index 9e6522dbcf..5da8625db2 100644 --- a/module/company/lang/de.php +++ b/module/company/lang/de.php @@ -30,7 +30,7 @@ $lang->company->admins = 'Administratoren'; $lang->company->product = $lang->productCommon; $lang->company->project = 'Project'; -$lang->company->execution = $lang->executionCommon; +$lang->company->execution = 'Execution'; $lang->company->user = 'Benutzer'; $lang->company->guestOptions[0] = 'Verweigern'; diff --git a/module/company/lang/en.php b/module/company/lang/en.php index b8b23f5fed..647871f7fb 100644 --- a/module/company/lang/en.php +++ b/module/company/lang/en.php @@ -30,7 +30,7 @@ $lang->company->admins = 'Administrator'; $lang->company->product = $lang->productCommon; $lang->company->project = 'Project'; -$lang->company->execution = $lang->executionCommon; +$lang->company->execution = 'Execution'; $lang->company->user = 'User'; $lang->company->guestOptions[0] = 'Deny'; diff --git a/module/company/lang/fr.php b/module/company/lang/fr.php index e0da1fcd0f..ac66b9a2dc 100644 --- a/module/company/lang/fr.php +++ b/module/company/lang/fr.php @@ -30,7 +30,7 @@ $lang->company->admins = 'Administrateur'; $lang->company->product = $lang->productCommon; $lang->company->project = 'Project'; -$lang->company->execution = $lang->executionCommon; +$lang->company->execution = 'Execution'; $lang->company->user = 'Utilisateurs'; $lang->company->guestOptions[0] = 'Refusée'; diff --git a/module/company/lang/vi.php b/module/company/lang/vi.php index 328e176471..27f652fa4c 100644 --- a/module/company/lang/vi.php +++ b/module/company/lang/vi.php @@ -30,7 +30,7 @@ $lang->company->admins = 'Quản trị viên'; $lang->company->product = $lang->productCommon; $lang->company->project = 'Project'; -$lang->company->execution = $lang->executionCommon; +$lang->company->execution = 'Execution'; $lang->company->user = 'Người dùng'; $lang->company->guestOptions[0] = 'Từ chối'; diff --git a/module/company/lang/zh-cn.php b/module/company/lang/zh-cn.php index 75e63a4bb1..6f03fd5502 100644 --- a/module/company/lang/zh-cn.php +++ b/module/company/lang/zh-cn.php @@ -30,7 +30,7 @@ $lang->company->admins = '管理员'; $lang->company->product = $lang->productCommon; $lang->company->project = '项目'; -$lang->company->execution = $lang->executionCommon; +$lang->company->execution = '执行'; $lang->company->user = '用户'; $lang->company->guestOptions[0] = '不允许'; diff --git a/module/company/lang/zh-tw.php b/module/company/lang/zh-tw.php index c7634b4304..7d952bea83 100644 --- a/module/company/lang/zh-tw.php +++ b/module/company/lang/zh-tw.php @@ -30,7 +30,7 @@ $lang->company->admins = '管理員'; $lang->company->product = $lang->productCommon; $lang->company->project = '項目'; -$lang->company->execution = $lang->executionCommon; +$lang->company->execution = '執行'; $lang->company->user = '用戶'; $lang->company->guestOptions[0] = '不允許'; From 77232331614618c05cc1a1090d53d220ab382408 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Fri, 17 Sep 2021 15:12:23 +0800 Subject: [PATCH 048/163] * Fix bug #15233. --- module/common/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/model.php b/module/common/model.php index a46f4423e1..6abbf42010 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -404,7 +404,7 @@ class commonModel extends model if($objectType == 'testcase') $params = "productID=$productID&branch=&moduleID=0&from=¶m=0&storyID=0&extras=from=global"; if($objectType == 'execution') $params = "projectID=&executionID=0©ExecutionID=0&planID=0&confirm=no&productID=0&extra=from=global"; if($objectType == 'project') $params = "model=scrum&programID=0©ProjectID=0&extra=from=global"; - if($objectType == 'product') $params = "programID=0&extra=from=global"; + if($objectType == 'product') $params = "programID=&extra=from=global"; if($objectType == 'program') $params = "parentProgramID=0&extra=from=global"; $html .= '
  • ' . html::a(helper::createLink($objectType, $createMethod, $params, '', $isOnlyBody), " " . $lang->createObjects[$objectType], '', $isOnlyBody ? $attr : '') . '
    • '; From b1dfaa21bb46dd6e5e3a56675d65ee93e9f9316a Mon Sep 17 00:00:00 2001 From: lichengjun Date: Fri, 17 Sep 2021 07:14:30 +0000 Subject: [PATCH 049/163] * Fix Bug #15200. --- module/todo/view/view.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php index 9adb6a2d3f..3f8237224e 100644 --- a/module/todo/view/view.html.php +++ b/module/todo/view/view.html.php @@ -49,7 +49,7 @@ session->todoList) { - $browseLink = $this->session->todoList; + $browseLink = empty($todo->deleted) ? $this->session->todoList : $this->createLink('action', 'trash'); } elseif($todo->account == $app->user->account) { From 7603337d74ffb63ece37297b8260da7c78dc3ce8 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Fri, 17 Sep 2021 15:44:06 +0800 Subject: [PATCH 050/163] * Fix bug #15235. --- module/productplan/view/browse.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 997813040e..5f74370493 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -130,7 +130,7 @@ systemMode == 'new' ? '#projects' : $this->createLink('execution', 'create', "projectID=0&executionID=0©ExecutionID=0&plan=$plan->id"); + $executionLink = $config->systemMode == 'new' ? '#projects' : $this->createLink('execution', 'create', "projectID=0&executionID=0©ExecutionID=0&plan=$plan->id&confirm=no&productID=$productID"); if($config->systemMode == 'new') { echo html::a($executionLink, '', '', "data-toggle='modal' data-id='$plan->id' onclick='getPlanID(this)' class='btn' title='{$lang->productplan->createExecution}'"); From bc6f0a2ea8d13ea190ce4e42c5142a4e00fd72ae Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Fri, 17 Sep 2021 16:39:45 +0800 Subject: [PATCH 051/163] * Fix bug #15240. --- module/build/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/build/control.php b/module/build/control.php index 2d9d1d6c36..061a69e357 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -565,7 +565,7 @@ class build extends control /* Set menu. */ $build = $this->build->getByID($buildID); $product = $this->loadModel('product')->getByID($build->product); - $this->loadModel('execution')->setMenu($this->execution->getPairs($build->project), $build->execution); + $this->loadModel('execution')->setMenu($build->execution); /* Load pager. */ $this->app->loadClass('pager', $static = true); From 7650e339886856f8830b05efdaca8b69cf2a33fe Mon Sep 17 00:00:00 2001 From: zenggang Date: Fri, 17 Sep 2021 17:23:15 +0800 Subject: [PATCH 052/163] * Fix bug#15232 --- module/bug/model.php | 2 +- module/custom/config.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 378f3f35eb..24718b5a6b 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -202,7 +202,7 @@ class bugModel extends model foreach(explode(',', $this->config->bug->create->requiredFields) as $field) { $field = trim($field); - if($field and empty($bug->$field)) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->bug->$field))); + if($field and isset($bug->$field) and empty($bug->$field)) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->bug->$field))); } $bugs[$i] = $bug; diff --git a/module/custom/config.php b/module/custom/config.php index 29873486f9..4b000df4ce 100644 --- a/module/custom/config.php +++ b/module/custom/config.php @@ -53,7 +53,7 @@ $config->custom->fieldList['task']['edit'] = 'pri,estimate,estStarted, $config->custom->fieldList['task']['finish'] = 'comment'; $config->custom->fieldList['task']['activate'] = 'assignedTo,comment'; $config->custom->fieldList['build'] = 'scmPath,filePath,desc'; -$config->custom->fieldList['bug']['create'] = 'module,deadline,type,os,browser,severity,pri,steps,keywords'; +$config->custom->fieldList['bug']['create'] = 'module,project,deadline,type,os,browser,severity,pri,steps,keywords'; $config->custom->fieldList['bug']['edit'] = 'plan,assignedTo,deadline,type,os,browser,severity,pri,steps,keywords'; $config->custom->fieldList['bug']['resolve'] = 'resolvedBuild,resolvedDate,assignedTo,comment'; $config->custom->fieldList['testcase']['create'] = 'stage,story,pri,precondition,keywords'; From 33e946e96871466c17e25df4d1e2f4d6d9a58d0b Mon Sep 17 00:00:00 2001 From: liyuchun Date: Sat, 18 Sep 2021 08:33:58 +0800 Subject: [PATCH 053/163] * Fix bug #15183. --- module/task/view/view.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index 0a662bfe6c..c13844f461 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -368,7 +368,7 @@     - + From 4380f4d4b04db2360c871b1e5ee6bfc747943227 Mon Sep 17 00:00:00 2001 From: zenggang Date: Sat, 18 Sep 2021 11:01:08 +0800 Subject: [PATCH 054/163] * Fix bug#14580 --- module/bug/js/browse.js | 10 ++++++++++ module/caselib/js/browse.js | 13 +++++++++++++ module/execution/js/task.js | 10 ++++++++++ module/product/js/browse.js | 10 ++++++++++ module/testcase/js/browse.js | 10 ++++++++++ 5 files changed, 53 insertions(+) diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js index 76bf55c9d3..20a3bab303 100644 --- a/module/bug/js/browse.js +++ b/module/bug/js/browse.js @@ -1,4 +1,14 @@ $(function() { if($('#bugList thead th.c-title').width() < 150) $('#bugList thead th.c-title').width(150); + + /* The display of the adjusting sidebarHeader is synchronized with the sidebar. */ + $(".sidebar-toggle").click(function() + { + $("#sidebarHeader").toggle("fast"); + }); + if($("main").is(".hide-sidebar")) + { + $("#sidebarHeader").hide(); + } }); diff --git a/module/caselib/js/browse.js b/module/caselib/js/browse.js index c0b0581ddc..43514db04c 100644 --- a/module/caselib/js/browse.js +++ b/module/caselib/js/browse.js @@ -20,3 +20,16 @@ function confirmBatchDelete(actionLink) if(confirm(batchDelete)) setFormAction(actionLink); return false; } + +$(function() +{ + /* The display of the adjusting sidebarHeader is synchronized with the sidebar. */ + $(".sidebar-toggle").click(function() + { + $("#sidebarHeader").toggle("fast"); + }); + if($("main").is(".hide-sidebar")) + { + $("#sidebarHeader").hide(); + } +}); \ No newline at end of file diff --git a/module/execution/js/task.js b/module/execution/js/task.js index 013627478d..fe217096b5 100644 --- a/module/execution/js/task.js +++ b/module/execution/js/task.js @@ -14,6 +14,16 @@ $(function() adjustTableFooter(); $('body').on('click', '#toggleFold', adjustTableFooter); $('body').on('click', '.icon.icon-angle-double-right', adjustTableFooter); + + /* The display of the adjusting sidebarHeader is synchronized with the sidebar. */ + $(".sidebar-toggle").click(function() + { + $("#sidebarHeader").toggle("fast"); + }); + if($("main").is(".hide-sidebar")) + { + $("#sidebarHeader").hide(); + } }); $('#module' + moduleID).closest('li').addClass('active'); diff --git a/module/product/js/browse.js b/module/product/js/browse.js index b0beab26e1..ffc9eec594 100644 --- a/module/product/js/browse.js +++ b/module/product/js/browse.js @@ -104,6 +104,16 @@ $(function() { window.location.reload(); }) + + /* The display of the adjusting sidebarHeader is synchronized with the sidebar. */ + $(".sidebar-toggle").click(function() + { + $("#sidebarHeader").toggle("fast"); + }); + if($("main").is(".hide-sidebar")) + { + $("#sidebarHeader").hide(); + } }); /** diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js index c52cd7ecd6..c89b07f076 100644 --- a/module/testcase/js/browse.js +++ b/module/testcase/js/browse.js @@ -14,4 +14,14 @@ function confirmBatchDelete(actionLink) $(function() { if($('#caseList thead th.c-title').width() < 150) $('#caseList thead th.c-title').width(150); + + /* The display of the adjusting sidebarHeader is synchronized with the sidebar. */ + $(".sidebar-toggle").click(function() + { + $("#sidebarHeader").toggle("fast"); + }); + if($("main").is(".hide-sidebar")) + { + $("#sidebarHeader").hide(); + } }); From e4ab2d8a80449c3de4a4d6ee95e697ab2136f85e Mon Sep 17 00:00:00 2001 From: liyuchun Date: Sat, 18 Sep 2021 11:19:12 +0800 Subject: [PATCH 055/163] * Fix bug #15245. --- module/upgrade/control.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/module/upgrade/control.php b/module/upgrade/control.php index b8ed12f735..f65055394f 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -181,25 +181,22 @@ class upgrade extends control if($mode == 'new') $this->locate(inlink('mergeTips')); } + $title = $this->lang->upgrade->toPMS15Guide; if(isset($this->config->maxVersion)) { - $this->lang->upgrade->to15Desc = str_replace('15', 'Max', $this->lang->upgrade->to15Desc); + $this->lang->upgrade->to15Desc = str_replace('15', $this->lang->maxName, $this->lang->upgrade->to15Desc); $title = $this->lang->upgrade->toMAXGuide; } elseif(isset($this->config->bizVersion)) { - $this->lang->upgrade->to15Desc = str_replace('15', 'Biz5', $this->lang->upgrade->to15Desc); + $this->lang->upgrade->to15Desc = str_replace('15', $this->lang->bizName . '5', $this->lang->upgrade->to15Desc); $title = $this->lang->upgrade->toBIZ5Guide; } elseif(isset($this->config->proVersion)) { - $this->lang->upgrade->to15Desc = str_replace('15', 'Pro10', $this->lang->upgrade->to15Desc); + $this->lang->upgrade->to15Desc = str_replace('15', $this->lang->proName . '10', $this->lang->upgrade->to15Desc); $title = $this->lang->upgrade->toPRO10Guide; } - else - { - $title = $this->lang->upgrade->toPMS15Guide; - } $this->view->title = $title; $this->display(); From 435849a9dec94d284a6444a5229a752737fee9e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Sat, 18 Sep 2021 13:09:28 +0800 Subject: [PATCH 056/163] * finish task #42598. --- module/common/view/noticeimport.html.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/common/view/noticeimport.html.php b/module/common/view/noticeimport.html.php index b509f1e70e..5f87dd9b43 100644 --- a/module/common/view/noticeimport.html.php +++ b/module/common/view/noticeimport.html.php @@ -25,6 +25,7 @@ function submitForm(type) { $('.modal-body #insert').val(type == 'insert' ? 1 : 0); + $('#importNoticeModal .form-actions .btn').addClass('disabled'); $("button[data-target='#importNoticeModal']").closest('form').submit(); } From 01b7db1dd66da6ae5412b948346175d28a5bb922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Sat, 18 Sep 2021 13:51:15 +0800 Subject: [PATCH 057/163] * adjust for upgrade. --- db/update15.4.sql | 1 + module/upgrade/model.php | 4 +++- www/theme/default/style.css | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/db/update15.4.sql b/db/update15.4.sql index 5fe0aa4e68..2950c63688 100644 --- a/db/update15.4.sql +++ b/db/update15.4.sql @@ -1,6 +1,7 @@ UPDATE `zt_action` SET `action` = 'reviewpassed' WHERE `action` = 'passreviewed'; UPDATE `zt_action` SET `action` = 'reviewrejected' WHERE `action` = 'reviewclosed'; UPDATE `zt_action` SET `action` = 'reviewclarified' WHERE `action` = 'clarifyreviewed'; +DELETE FROM `zt_config` WHERE `key` = 'skipYoungBlueTheme' and `section` = 'global'; UPDATE `zt_config` SET `key` = 'skipYoungBlueTheme' WHERE `key` = 'skipThemeGuide' and `section` = 'global'; DELETE FROM `zt_score` WHERE `module` = 'tutorial' AND `method` = 'finish'; CREATE TABLE `zt_mr` ( diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 0564304f12..f8f34b1879 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -5294,7 +5294,7 @@ class upgradeModel extends model * Adjust for bug required field. * * @access public - * @return void + * @return bool */ public function adjustBugRequired() { @@ -5304,9 +5304,11 @@ class upgradeModel extends model ->andWhere('section')->eq('create') ->andWhere('`key`')->eq('requiredFields') ->fetch(); + if(empty($data)) return true; $data->value = ',' . $data->value . ','; $data->value = str_replace(',project,', ',', $data->value); $this->dao->update(TABLE_CONFIG)->set('`value`')->eq(trim($data->value, ','))->where('id')->eq($data->id)->exec(); + return true; } } diff --git a/www/theme/default/style.css b/www/theme/default/style.css index 0cc3c5813b..eae2a2de02 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -72,3 +72,5 @@ a.showMoreImage:hover {opacity: 1;} #userNav .dropdown-menu .dropdown-submenu>ul {margin-right: 0px !important;} #userNav .create-list:hover:before {right: 21.5% !important;} #modules li>a, #modules ul>li>a {overflow: hidden; white-space: nowrap;} + +.fixed-head-table{z-index:1000;} From c6b7f25fa3b07273338fd84f15e41fe9d0b46135 Mon Sep 17 00:00:00 2001 From: zenggang Date: Sat, 18 Sep 2021 14:08:31 +0800 Subject: [PATCH 058/163] * Adjust code style. --- module/bug/js/browse.js | 5 +---- module/caselib/js/browse.js | 5 +---- module/execution/js/task.js | 5 +---- module/product/js/browse.js | 5 +---- module/testcase/js/browse.js | 5 +---- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js index 20a3bab303..6d469700d9 100644 --- a/module/bug/js/browse.js +++ b/module/bug/js/browse.js @@ -7,8 +7,5 @@ $(function() { $("#sidebarHeader").toggle("fast"); }); - if($("main").is(".hide-sidebar")) - { - $("#sidebarHeader").hide(); - } + if($("main").is(".hide-sidebar")) $("#sidebarHeader").hide(); }); diff --git a/module/caselib/js/browse.js b/module/caselib/js/browse.js index 43514db04c..001e3ddc52 100644 --- a/module/caselib/js/browse.js +++ b/module/caselib/js/browse.js @@ -28,8 +28,5 @@ $(function() { $("#sidebarHeader").toggle("fast"); }); - if($("main").is(".hide-sidebar")) - { - $("#sidebarHeader").hide(); - } + if($("main").is(".hide-sidebar")) $("#sidebarHeader").hide(); }); \ No newline at end of file diff --git a/module/execution/js/task.js b/module/execution/js/task.js index fe217096b5..d96b1ac4cc 100644 --- a/module/execution/js/task.js +++ b/module/execution/js/task.js @@ -20,10 +20,7 @@ $(function() { $("#sidebarHeader").toggle("fast"); }); - if($("main").is(".hide-sidebar")) - { - $("#sidebarHeader").hide(); - } + if($("main").is(".hide-sidebar")) $("#sidebarHeader").hide(); }); $('#module' + moduleID).closest('li').addClass('active'); diff --git a/module/product/js/browse.js b/module/product/js/browse.js index ffc9eec594..db8128724a 100644 --- a/module/product/js/browse.js +++ b/module/product/js/browse.js @@ -110,10 +110,7 @@ $(function() { $("#sidebarHeader").toggle("fast"); }); - if($("main").is(".hide-sidebar")) - { - $("#sidebarHeader").hide(); - } + if($("main").is(".hide-sidebar")) $("#sidebarHeader").hide(); }); /** diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js index c89b07f076..6ef01b7fc5 100644 --- a/module/testcase/js/browse.js +++ b/module/testcase/js/browse.js @@ -20,8 +20,5 @@ $(function() { $("#sidebarHeader").toggle("fast"); }); - if($("main").is(".hide-sidebar")) - { - $("#sidebarHeader").hide(); - } + if($("main").is(".hide-sidebar")) $("#sidebarHeader").hide(); }); From e62809eabd9738cbd8e9db7fd2a506364ced09bb Mon Sep 17 00:00:00 2001 From: zenggang Date: Sat, 18 Sep 2021 15:38:36 +0800 Subject: [PATCH 059/163] * Fix bug#14360 --- module/task/control.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/module/task/control.php b/module/task/control.php index 4a027260f4..beeaf7b58f 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -423,6 +423,18 @@ class task extends control $tasks = $this->task->getParentTaskPairs($this->view->execution->id, $this->view->task->parent); if(isset($tasks[$taskID])) unset($tasks[$taskID]); + if($this->config->systemMode == 'classic') $executionsPair = $this->execution->getPairs(); + else + { + $executionsPair = array(); + $executions = $this->execution->getByProject(0, 'all', 0); + $projects = $this->project->getPairsByProgram(0, 'noclosed'); + foreach($executions as $executionId => $execution) + { + $executionsPair[$executionId] = (isset($projects[$execution->project]) ? $projects[$execution->project] . ' / ' : '') . $execution->name; + } + } + if(!isset($this->view->members[$this->view->task->assignedTo])) $this->view->members[$this->view->task->assignedTo] = $this->view->task->assignedTo; if(isset($this->view->members['closed']) or $this->view->task->status == 'closed') $this->view->members['closed'] = 'Closed'; @@ -434,7 +446,7 @@ class task extends control $this->view->users = $this->loadModel('user')->getPairs('nodeleted', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}"); $this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : ''; $this->view->modules = $this->tree->getTaskOptionMenu($this->view->task->execution, 0, 0, $this->view->showAllModule ? 'allModule' : ''); - $this->view->executions = $this->config->systemMode == 'classic' ? $this->execution->getPairs() : $this->execution->getByProject(0, 'all', 0, true); + $this->view->executions = $executionsPair; $this->display(); } From 3966f808a32567085c4964242e12090c5f35dc37 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Sat, 18 Sep 2021 15:40:17 +0800 Subject: [PATCH 060/163] * Fix bug #15242. --- module/file/view/buildform.html.php | 46 +++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/module/file/view/buildform.html.php b/module/file/view/buildform.html.php index ee0eebfd20..528e27f1c3 100644 --- a/module/file/view/buildform.html.php +++ b/module/file/view/buildform.html.php @@ -4,6 +4,7 @@ .file-input-list .input-group-btn{float:left} config->file->dangers . ',');?> +
    @@ -32,11 +33,38 @@
    task->realStarted;?>realStarted; ?> realStarted) ? '' : $task->realStarted; ?>
    task->deadline;?>