From c3244b958ff0a0cc89854342b1eb46d2a0bf0c6b Mon Sep 17 00:00:00 2001 From: Lufei Date: Mon, 19 Dec 2022 16:36:14 +0800 Subject: [PATCH 52/59] * Fix search style error in execution view page. --- module/execution/view/view.html.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php index 6178455394..91a3cf4d8d 100644 --- a/module/execution/view/view.html.php +++ b/module/execution/view/view.html.php @@ -10,9 +10,9 @@ * @link http://www.zentao.net */ ?> -config->webRoot . 'js/echarts/echarts.common.min.js'); ?> +config->webRoot . 'js/echarts/echarts.common.min.js'); ?> execution->count); ?> From c093724f9d4b859eb815246739f4ff7af7deed0c Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 19 Dec 2022 10:35:02 +0800 Subject: [PATCH 53/59] * fix bug #80463. --- 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 1ae9044709..1e5072e1a9 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -1314,7 +1314,7 @@ class productModel extends model ->fetchAll('id'); /* Determine how to display the name of the program. */ - $programList = $this->loadModel('program')->getParentPairs('', 'noclosed'); + $programList = $this->loadModel('program')->getParentPairs('', ''); foreach($projectList as $id => $project) { $projectList[$id]->programName = $project->parent ? zget($programList, $project->parent, '') : ''; From d28ea77f0d9fc4d3766b08bdc49192d8d35a633f Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 19 Dec 2022 14:50:11 +0800 Subject: [PATCH 54/59] * code for task #80461. --- module/my/model.php | 2 +- module/task/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/my/model.php b/module/my/model.php index 38b1fd9612..bb6ae26b4b 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -344,7 +344,7 @@ class myModel extends model ->andWhere('t2.deleted')->eq(0) ->andWhere('t1.id')->in(array_keys($objectIDList)) ->orderBy($orderBy) - ->page($pager) + ->page($pager, 't1.id') ->fetchAll('id'); } elseif($objectType == 'requirement' or $objectType == 'story' or $objectType == 'bug') diff --git a/module/task/model.php b/module/task/model.php index 21044959c4..29c8185f55 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2635,7 +2635,7 @@ class taskModel extends model ->beginIF($type == 'assignedTo' and $this->app->rawModule == 'my' and $this->app->rawMethod == 'work')->andWhere('t1.status')->notin('closed,cancel,pause')->fi() ->orderBy($orderBy) ->beginIF($limit > 0)->limit($limit)->fi() - ->page($pager) + ->page($pager, 't1.id') ->fetchAll('id'); $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', false); From b670a052de0e62c45ccb87cf9b81f9f9bddbbcbc Mon Sep 17 00:00:00 2001 From: chaideqing Date: Tue, 20 Dec 2022 10:10:33 +0800 Subject: [PATCH 55/59] * Fix feedback1752. --- module/doc/model.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/doc/model.php b/module/doc/model.php index 9c08b6d366..693334b946 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -306,6 +306,7 @@ class docModel extends model if($lib->acl == 'private' and $lib->acl == 'custom') $lib->users .= ',' . $libCreatedBy ? $libCreatedBy : $openedBy; } } + if($oldLib->acl != $lib->acl and $lib->acl == 'open') $lib->users = ''; $lib->name = trim($lib->name); //Temporary treatment: Code for bug #15528. $this->dao->update(TABLE_DOCLIB)->data($lib)->autoCheck() @@ -1528,6 +1529,7 @@ class docModel extends model ->where("CONCAT(',', t2.users, ',')")->like("%,{$this->app->user->account},%") ->andWhere('t1.vision')->eq($this->config->vision) ->andWhere('t1.deleted')->eq(0) + ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->projects)->fi() ->fetchPairs(); } From 58efe7b0115f99cbbf7c5f922ef0b17cc685f4f4 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 20 Dec 2022 11:31:15 +0800 Subject: [PATCH 56/59] * code task #80458,80463. --- module/bug/view/view.html.php | 5 ++--- module/product/model.php | 2 +- module/program/model.php | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index b886a25ba9..1c79244ca7 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -19,12 +19,11 @@ branch);?> bug->noExecution);?> bug->noProject);?> -session->bugList ? $app->session->bugList : inlink('browse', "productID=$bug->product");?>