From 2cbaaa7ddbb341544b10b0ee7c6c49b776c891a5 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 9 Aug 2021 09:38:32 +0800 Subject: [PATCH 1/9] * Fix bug #13991. --- module/bug/css/edit.css | 1 + 1 file changed, 1 insertion(+) diff --git a/module/bug/css/edit.css b/module/bug/css/edit.css index 36613d69d7..7f63e63266 100644 --- a/module/bug/css/edit.css +++ b/module/bug/css/edit.css @@ -5,3 +5,4 @@ .chosen-choices li.search-choice {word-break: break-all;} #linkBugBox > li {margin-left: -56px;} #branch {width: 95px;} +#storyIdBox .chosen-auto-max-width {width: 215px !important;} From bc5a2ecf9cc400f0c74bfcbb594b0eba04bd829c Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Mon, 9 Aug 2021 09:44:26 +0800 Subject: [PATCH 2/9] * Fix bug #13021. --- module/todo/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/todo/control.php b/module/todo/control.php index 3e3201e198..8335be389d 100644 --- a/module/todo/control.php +++ b/module/todo/control.php @@ -345,7 +345,7 @@ class todo extends control } $this->view->todo = $this->todo->getById($todoID); - $this->view->members = $this->loadModel('user')->getPairs(); + $this->view->members = $this->loadModel('user')->getPairs('noclosed'); $this->view->times = date::buildTimeList($this->config->todo->times->begin, $this->config->todo->times->end, $this->config->todo->times->delta); $this->view->time = date::now(); $this->display(); From be67b064d72908a2b8d4fbc220472b5a12382e38 Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 9 Aug 2021 09:48:30 +0800 Subject: [PATCH 3/9] * Fix bug#13727. --- module/task/model.php | 2 +- module/task/view/batchedit.html.php | 8 ++++---- module/task/view/edit.html.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index db89381a78..da9d953ac4 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1216,7 +1216,7 @@ class taskModel extends model { if($task->status == 'done' and $task->consumed == false) die(js::error('task#' . $taskID . sprintf($this->lang->error->notempty, $this->lang->task->consumedThisTime))); if($task->status == 'cancel') continue; - if($task->estStarted > $task->deadline) die(js::error('task#' . $taskID . $this->lang->task->error->deadlineSmall)); + if(!empty($task->deadline) and $task->estStarted > $task->deadline) die(js::error('task#' . $taskID . $this->lang->task->error->deadlineSmall)); foreach(explode(',', $this->config->task->edit->requiredFields) as $field) { $field = trim($field); diff --git a/module/task/view/batchedit.html.php b/module/task/view/batchedit.html.php index 637ff9a981..f67a02544b 100755 --- a/module/task/view/batchedit.html.php +++ b/module/task/view/batchedit.html.php @@ -128,12 +128,12 @@ js::set('dittoNotice', $dittoNotice); ' style='overflow:visible'>assignedTo, "class='form-control chosen' {$disableAssignedTo}");?> type, "class='form-control'");?> >status, "class='form-control'");?> - >estStarted, "class='form-control text-center form-date'");?> - >deadline, "class='form-control text-center form-date'");?> - >pri, "class='form-control'");?> + >estStarted) ? '' : $tasks[$taskID]->estStarted, "class='form-control text-center form-date'");?> + >deadline) ? '' : $tasks[$taskID]->deadline, "class='form-control text-center form-date'");?> + >pri, "class='form-control'");?> >estimate, "class='form-control text-center' {$disableHour}");?> > - >left, "class='form-control text-center' {$disableHour}");?> + >left, "class='form-control text-center' {$disableHour}");?> ' style='overflow:visible'>finishedBy, "class='form-control chosen'");?> ' style='overflow:visible'>canceledBy, "class='form-control chosen'");?> ' style='overflow:visible'>closedBy, "class='form-control chosen'");?> diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php index e1931015f9..57ca6fd300 100644 --- a/module/task/view/edit.html.php +++ b/module/task/view/edit.html.php @@ -175,11 +175,11 @@ - + - + From ea22005a73e432bdf378c281fd2e79251c8a413a Mon Sep 17 00:00:00 2001 From: qiyu-xie Date: Mon, 9 Aug 2021 10:30:49 +0800 Subject: [PATCH 4/9] * Fix bug#14102. --- module/group/view/privbygroup.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 66c6b83b16..f1b357891f 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -38,7 +38,7 @@ @@ -130,7 +130,7 @@ From 6888bea503c9d742921a4714b64993f68b2144f0 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Mon, 9 Aug 2021 10:32:38 +0800 Subject: [PATCH 5/9] * Fix bug #14008. --- module/task/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index db89381a78..f58792395c 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -192,7 +192,7 @@ class taskModel extends model } $teams = array(); - if($this->post->multiple) + if($this->post->multiple and count(array_filter($this->post->team)) > 1) { foreach($this->post->team as $row => $account) { @@ -897,7 +897,7 @@ class taskModel extends model $task = $this->loadModel('file')->processImgURL($task, $this->config->task->editor->edit['id'], $this->post->uid); $teams = array(); - if($this->post->multiple) + if($this->post->multiple and count(array_unique(array_filter($this->post->team))) > 1) { if(strpos(',done,closed,cancel,', ",{$task->status},") === false && $this->post->assignedTo && !in_array($this->post->assignedTo, $this->post->team)) { From f9269d1c77c59dccc657399f87f48d15eaf2ded4 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 9 Aug 2021 13:23:09 +0800 Subject: [PATCH 6/9] * Fix bug #13903. --- module/block/control.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/block/control.php b/module/block/control.php index 9378ba0f6d..a442a81bab 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1832,6 +1832,8 @@ class block extends control /* Get projects. */ $this->app->loadLang('task'); + $this->app->loadLang('program'); + $this->app->loadLang('execution'); $this->view->projects = $this->loadModel('project')->getOverviewList('byStatus', $status, $orderBy, $count); } From 26ce07e38d6a0b9465d22fcf0baf62d5581e383a Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Mon, 9 Aug 2021 13:53:49 +0800 Subject: [PATCH 7/9] * Fix bug #13762. --- module/task/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index 890597f921..d3a749953f 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3016,7 +3016,7 @@ class taskModel extends model echo $this->lang->task->typeList[$task->type]; break; case 'status': - $storyChanged ? print("{$this->lang->story->changed}") : print(" " . $this->processStatus('task', $task) . ""); + $storyChanged ? print("{$this->lang->story->changed}") : print(" " . $this->processStatus('task', $task) . ""); break; case 'estimate': echo round($task->estimate, 1) . $this->lang->execution->workHourUnit; From 6311a90388cc998c9995c5dcaadce6ece12650aa Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 9 Aug 2021 13:57:25 +0800 Subject: [PATCH 8/9] * Fix bug #13932. --- module/testtask/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/testtask/control.php b/module/testtask/control.php index 079e646c00..a7e2f92673 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -636,6 +636,7 @@ class testtask extends control $this->app->loadLang('execution'); $this->app->loadLang('task'); $this->session->set('caseList', $this->app->getURI(true), 'qa'); + setcookie('taskCaseModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, true); /* Get task and product info, set menu. */ $groupBy = empty($groupBy) ? 'story' : $groupBy; From 7e28815aeefe3506c9ad8c94aee9564d77d9e9fd Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 9 Aug 2021 14:15:31 +0800 Subject: [PATCH 9/9] * Fix bug #13862. --- module/block/control.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index a442a81bab..272a454181 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1750,7 +1750,7 @@ class block extends control $today = helper::today(); $now = date('H:i:s', strtotime(helper::now())); - $meetings = $this->dao->select('*')->from(TABLE_MEETING) + $stmt = $this->dao->select('*')->from(TABLE_MEETING) ->Where('deleted')->eq('0') ->andWhere('(date')->gt($today) ->orWhere('(begin')->gt($now) @@ -1759,9 +1759,10 @@ class block extends control ->andwhere('(host')->eq($this->app->user->account) ->orWhere('participant')->in($this->app->user->account) ->markRight(1) - ->orderBy('id_desc') - ->beginIF(isset($params->meetingNum))->limit($params->meetingNum) - ->fetchAll(); + ->orderBy('id_desc'); + + if(isset($params->meetingNum)) $stmt->limit($params->meetingNum); + $meetings = $stmt->fetchAll(); $count['meeting'] = count($meetings); $this->view->meetings = $meetings;
task->estStarted;?>estStarted, "class='form-control form-date'");?>estStarted) ? '' : $task->estStarted, "class='form-control form-date'");?>
task->deadline;?>deadline, "class='form-control form-date'");?>deadline) ? '' : $task->deadline, "class='form-control form-date'");?>
task->estimate;?> - + inlink('browse'), $lang->goback, '', "class='btn btn-back btn-wide'");?>
- + inlink('browse'), $lang->goback, '', "class='btn btn-back btn-wide'");?>