From 58bf0c3e5643f32b4ced3844cfca34c4751fba94 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 4 Jul 2018 13:58:43 +0800 Subject: [PATCH 1/5] * fix bug. --- module/task/model.php | 5 +++++ module/task/view/assignto.html.php | 2 ++ module/todo/model.php | 5 ++++- module/upgrade/model.php | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index bea8fd7a40..104e736e9e 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -822,6 +822,11 @@ class taskModel extends model ->setDefault('assignedDate', $now) ->remove('comment,showModule') ->get(); + if($oldTask->status != 'done' and $oldTask->status != 'closed' and $task->left == 0) + { + dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->task->left); + return false; + } if(!empty($oldTask->team)) { diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php index dca7f7b55c..befb86256e 100644 --- a/module/task/view/assignto.html.php +++ b/module/task/view/assignto.html.php @@ -39,10 +39,12 @@ team) ? $lang->task->assign : $lang->task->transferTo;?> team) ? $task->assignedTo : $task->nextUser, "class='form-control chosen'");?> + status != 'done' and $task->status != 'closed'):?> task->left;?>
left, "class='form-control' autocomplete='off'");?> task->hour;?>
+ comment;?> diff --git a/module/todo/model.php b/module/todo/model.php index 4d56610740..6b755dd69d 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -530,10 +530,13 @@ class todoModel extends model */ public function close($todoID) { + $now = helper::now(); $this->dao->update(TABLE_TODO) ->set('status')->eq('closed') ->set('closedBy')->eq($this->app->user->account) - ->set('closedDate')->eq(helper::now()) + ->set('closedDate')->eq($now) + ->set('assignedTo')->eq('closed') + ->set('assignedDate')->eq($now) ->where('id')->eq((int)$todoID) ->exec(); $this->loadModel('action')->create('todo', $todoID, 'closed', '', 'closed'); diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 30cd05a221..1ba716287f 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -337,6 +337,7 @@ class upgradeModel extends model case '9_8_3': $confirmContent .= file_get_contents($this->getUpgradeFile('9.8.3')); case '10_0_alpha': $confirmContent .= file_get_contents($this->getUpgradeFile('10.0.alpha')); case '10_0_beta': $confirmContent .= file_get_contents($this->getUpgradeFile('10.0.beta')); + case '10_0': $confirmContent .= file_get_contents($this->getUpgradeFile('10.0')); } return str_replace('zt_', $this->config->db->prefix, $confirmContent); } From babcaa6d7f26e2797d31df81970702825d636f30 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 4 Jul 2018 14:13:14 +0800 Subject: [PATCH 2/5] * finish task #4516. --- module/project/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/project/control.php b/module/project/control.php index 6894c34c91..ce5ca4157f 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -2301,7 +2301,7 @@ class project extends control public function importPlanStories($projectID, $planID) { $planStories = $planProducts = array(); - $planStory = $this->loadModel('story')->getPlanStories($planID); + $planStory = $this->loadModel('story')->getPlanStories($planID, 'changed,active,reviewing'); if(!empty($planStory)) { $planStories = array_keys($planStory); From b62a8e7193d1d05316e49c59123a91ade536df6b Mon Sep 17 00:00:00 2001 From: reneteng Date: Wed, 4 Jul 2018 14:27:30 +0800 Subject: [PATCH 3/5] * change trans --- module/company/lang/en.php | 4 ++-- module/report/lang/en.php | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/module/company/lang/en.php b/module/company/lang/en.php index 06eb84d09a..35bd18740d 100644 --- a/module/company/lang/en.php +++ b/module/company/lang/en.php @@ -12,7 +12,7 @@ $lang->company->common = 'Company'; $lang->company->index = "Home"; $lang->company->edit = "Edit Company"; -$lang->company->view = "Company Info"; +$lang->company->view = "Company Information"; $lang->company->browse = "User List"; $lang->company->dynamic = "Dynamic"; $lang->company->orgView = 'View'; @@ -24,7 +24,7 @@ $lang->company->address = 'Mailing Address'; $lang->company->zipcode = 'Zip Code'; $lang->company->website = 'Website'; $lang->company->backyard = 'Intranet'; -$lang->company->guest = 'Anonymous Login'; +$lang->company->guest = 'Guest Login'; $lang->company->admins = 'Administrators'; $lang->company->product = $lang->productCommon; diff --git a/module/report/lang/en.php b/module/report/lang/en.php index a5ced624c4..efd8cf87a5 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -38,11 +38,11 @@ $lang->report->singleColor[] = 'F6BD0F'; $lang->report->projectDeviation = $lang->projectCommon . ' Deviation'; $lang->report->productSummary = $lang->productCommon . ' Summary'; -$lang->report->bugCreate = 'Bug Submission Report'; -$lang->report->bugAssign = 'Bug Assignment Report'; -$lang->report->workload = 'Workload'; -$lang->report->workloadAB = 'Workload'; -$lang->report->bugOpenedDate = 'Bug Created From'; +$lang->report->bugCreate = 'Bug Reported Statement'; +$lang->report->bugAssign = 'Bug Assigned Statement'; +$lang->report->workload = 'Team Workload Statement'; +$lang->report->workloadAB = 'Workload Statement'; +$lang->report->bugOpenedDate = 'Bug reported from'; $lang->report->taskAssignedDate = 'From'; $lang->report->beginAndEnd = ' From'; $lang->report->dept = 'Dept'; @@ -50,9 +50,9 @@ $lang->report->deviationChart = $lang->projectCommon . ' Deviation Chart'; $lang->reportList->project->lists[10] = $lang->projectCommon . ' Deviation|report|projectdeviation'; $lang->reportList->product->lists[10] = $lang->productCommon . ' Summary|report|productsummary'; -$lang->reportList->test->lists[10] = 'Bugs Reported|report|bugcreate'; -$lang->reportList->test->lists[13] = 'Bugs Assigned|report|bugassign'; -$lang->reportList->staff->lists[10] = 'Workload|report|workload'; +$lang->reportList->test->lists[10] = 'Bugs Reported Statement|report|bugcreate'; +$lang->reportList->test->lists[13] = 'Bugs Assigned Statement|report|bugassign'; +$lang->reportList->staff->lists[10] = 'Team Workload Statement|report|workload'; $lang->report->id = 'ID'; $lang->report->project = $lang->projectCommon; From 19fdb9358c6cce7ccb0585388f3ac3bf2b8c6a72 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Wed, 4 Jul 2018 14:34:47 +0800 Subject: [PATCH 4/5] * finish task #4588. --- module/story/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/story/model.php b/module/story/model.php index dcee73ecde..e6c801684f 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1685,6 +1685,7 @@ class storyModel extends model ->leftJoin(TABLE_PRODUCT)->alias('t4')->on('t2.product = t4.id') ->where($storyQuery) ->andWhere('t1.project')->eq((int)$projectID) + ->andWhere('t2.deleted')->eq(0) ->orderBy($orderBy) ->page($pager, 't2.id') ->fetchAll('id'); From ddea3afd97f2b6881e54eece42befd25392b6707 Mon Sep 17 00:00:00 2001 From: daitingting Date: Wed, 4 Jul 2018 15:20:06 +0800 Subject: [PATCH 5/5] * Set build field word-wrap. --- module/bug/css/view.css | 1 + 1 file changed, 1 insertion(+) diff --git a/module/bug/css/view.css b/module/bug/css/view.css index 7908c48a09..3e5652d2ac 100644 --- a/module/bug/css/view.css +++ b/module/bug/css/view.css @@ -1,2 +1,3 @@ .content .stepTitle{display:block; color: green; margin:0px;} .table-fixed td{white-space: unset} +.table-data tr > td{word-break: break-all; word-wrap: break-word;}