From 74e01d785ad51b2fa088bf3d73b0d479457926ae Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 25 Jan 2021 08:31:00 +0800 Subject: [PATCH 1/6] * Finish task #9080. --- module/block/view/storyblock.html.php | 2 +- module/my/view/requirement.html.php | 2 +- module/my/view/story.html.php | 2 +- module/productplan/view/linkstory.html.php | 2 +- module/productplan/view/view.html.php | 2 +- module/project/view/linkstory.html.php | 2 +- module/project/view/story.html.php | 2 +- module/story/model.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index ecef88a463..d4b5a745f5 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -54,7 +54,7 @@ story->priList, $story->pri, $story->pri)?> title?> - estimate . ' ' . $config->hourUnit?> + estimate . ' ' . $config->hourUnit?> processStatus('story', $story);?> diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php index 4fe731e417..5dbf894f34 100644 --- a/module/my/view/requirement.html.php +++ b/module/my/view/requirement.html.php @@ -85,7 +85,7 @@ productTitle;?> openedBy);?> - estimate . ' ' . $config->hourUnit;?> + estimate . ' ' . $config->hourUnit;?> processStatus('story', $story);?> story->stageList, $story->stage);?> diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index 36f9c38490..53a2342629 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -87,7 +87,7 @@ productTitle;?> planTitle;?> openedBy);?> - estimate . ' ' . $config->hourUnit;?> + estimate . ' ' . $config->hourUnit;?> processStatus('story', $story);?> story->stageList, $story->stage);?> diff --git a/module/productplan/view/linkstory.html.php b/module/productplan/view/linkstory.html.php index 6e8c34211d..28fb01cc95 100644 --- a/module/productplan/view/linkstory.html.php +++ b/module/productplan/view/linkstory.html.php @@ -56,7 +56,7 @@ openedBy);?> assignedTo);?> - estimate . ' ' . $config->hourUnit;?> + estimate . ' ' . $config->hourUnit;?> processStatus('story', $story);?> diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php index b681766740..2d127448d3 100644 --- a/module/productplan/view/view.html.php +++ b/module/productplan/view/view.html.php @@ -154,7 +154,7 @@ openedBy);?> assignedTo);?> - estimate . ' ' . $config->hourUnit;?> + estimate . ' ' . $config->hourUnit;?> processStatus('story', $story);?> diff --git a/module/project/view/linkstory.html.php b/module/project/view/linkstory.html.php index 569c799815..1368c94a68 100644 --- a/module/project/view/linkstory.html.php +++ b/module/project/view/linkstory.html.php @@ -81,7 +81,7 @@ product][$story->branch])) echo $branchGroups[$story->product][$story->branch];?> openedBy);?> - estimate . $config->hourUnit;?> + estimate . $config->hourUnit;?> diff --git a/module/project/view/story.html.php b/module/project/view/story.html.php index e229cbd2e5..cc0fb243bf 100644 --- a/module/project/view/story.html.php +++ b/module/project/view/story.html.php @@ -173,7 +173,7 @@ openedBy);?> assignedTo);?> - estimate . ' ' . $config->hourUnit;?> + estimate . ' ' . $config->hourUnit;?> processStatus('story', $story);?> diff --git a/module/story/model.php b/module/story/model.php index 5690f710f5..61d504b784 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -3316,7 +3316,7 @@ class storyModel extends model } else if($id == 'estimate') { - $title = $story->estimate . ' ' . $this->lang->custom->conceptOptions->hourPoint[$this->config->custom->hourPoint]; + $title = $story->estimate . ' ' . $this->lang->hourCommon; } else if($id == 'reviewedBy') { From 2590fe1a626cea3d069e5c35fb5e999269a70863 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 25 Jan 2021 08:37:49 +0800 Subject: [PATCH 2/6] * Finish task #9066. --- module/custom/lang/de.php | 2 +- module/custom/lang/en.php | 2 +- module/custom/lang/fr.php | 2 +- module/custom/lang/vi.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 6b52b8e0f1..b7a7949acc 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -49,7 +49,7 @@ $lang->custom->deleteStoryConcept = "Delete story Concept"; $lang->custom->configureScrum = "Scrum Model Custom"; $lang->custom->URConcept = "UR Concept"; $lang->custom->SRConcept = "SR Concept"; -$lang->custom->one = "One"; +$lang->custom->one = " One"; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index 6f5465a4c3..542e596ff9 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -49,7 +49,7 @@ $lang->custom->deleteStoryConcept = "Delete story Concept"; $lang->custom->configureScrum = "Scrum Model Custom"; $lang->custom->URConcept = "UR Concept"; $lang->custom->SRConcept = "SR Concept"; -$lang->custom->one = "One"; +$lang->custom->one = " One"; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index d601b0ac4c..73b739055e 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -49,7 +49,7 @@ $lang->custom->deleteStoryConcept = "Delete story Concept"; $lang->custom->configureScrum = "Scrum Model Custom"; $lang->custom->URConcept = "UR Concept"; $lang->custom->SRConcept = "SR Concept"; -$lang->custom->one = "One"; +$lang->custom->one = " One"; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index 7989f32572..9cc8118dd1 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -49,7 +49,7 @@ $lang->custom->deleteStoryConcept = "Delete story Concept"; $lang->custom->configureScrum = "Scrum Model Custom"; $lang->custom->URConcept = "UR Concept"; $lang->custom->SRConcept = "SR Concept"; -$lang->custom->one = "One"; +$lang->custom->one = " One"; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; From 8fc2677452b51f0d9c8025abb97be39fe3f2d259 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 25 Jan 2021 08:42:24 +0800 Subject: [PATCH 3/6] * Finish task #9067. --- module/custom/view/estimate.html.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/module/custom/view/estimate.html.php b/module/custom/view/estimate.html.php index a22b601039..f1e2daa8ad 100644 --- a/module/custom/view/estimate.html.php +++ b/module/custom/view/estimate.html.php @@ -42,15 +42,20 @@ $lang->custom->system[] = 'estimate';
- custom->conceptOptions->hourPoint[0]; - if($unit == 1) echo $lang->custom->unitList['efficiency'] . $lang->custom->conceptOptions->hourPoint[1]; - if($unit == 2) echo $lang->custom->unitList['efficiency'] . $lang->custom->conceptOptions->hourPoint[2]; - ?> + custom->conceptOptions->hourPoint[0]; + } + else + { + echo $lang->custom->unitList['efficiency'] . $lang->custom->conceptOptions->hourPoint[$unit]; + } + ?>
From 4999b4ee2bed07121982770892f3552811fa8d21 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Fri, 22 Jan 2021 13:18:26 +0800 Subject: [PATCH 4/6] * Fix code. --- module/group/lang/resource.php | 2 +- module/upgrade/model.php | 31 ------------------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 799fbc1ba5..9d10b36dca 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -1338,7 +1338,7 @@ $lang->user->methodOrder[35] = 'task'; $lang->user->methodOrder[40] = 'bug'; $lang->user->methodOrder[45] = 'project'; $lang->user->methodOrder[50] = 'dynamic'; -$lang->user->methodOrder[55] = 'profile'; +$lang->user->methodOrder[55] = 'cropAvatar'; $lang->user->methodOrder[60] = 'profile'; $lang->user->methodOrder[65] = 'batchEdit'; $lang->user->methodOrder[70] = 'unbind'; diff --git a/module/upgrade/model.php b/module/upgrade/model.php index b2e1e78981..17678df16b 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -663,7 +663,6 @@ class upgradeModel extends model case '20_0_beta3': $this->saveLogs('Execute 20_0_beta3'); $this->execSQL($this->getUpgradeFile('20.0.beta3')); - $this->addPriv20_0_bata3(); $this->adjustBudgetUnit(); $this->appendExec('20_0_beta3'); } @@ -4477,36 +4476,6 @@ class upgradeModel extends model return true; } - public function addPriv20_0_bata3() - { - $this->saveLogs('Run Method ' . __FUNCTION__); - $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('user')->andWhere('method')->eq('view')->fetchPairs('group', 'group'); - foreach($groups as $groupID) - { - $this->dao->replace(TABLE_GROUPPRIV) - ->set('module')->eq('user') - ->set('method')->eq('execution') - ->set('`group`')->eq($groupID) - ->exec(); - $this->saveLogs($this->dao->get()); - - $this->dao->replace(TABLE_GROUPPRIV) - ->set('module')->eq('user') - ->set('method')->eq('issue') - ->set('`group`')->eq($groupID) - ->exec(); - $this->saveLogs($this->dao->get()); - - $this->dao->replace(TABLE_GROUPPRIV) - ->set('module')->eq('user') - ->set('method')->eq('risk') - ->set('`group`')->eq($groupID) - ->exec(); - $this->saveLogs($this->dao->get()); - } - return true; - } - /** * Adjust budget units and values. * From b0f7ed171fac24416e98be523b48ff2e50fd1e0e Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 25 Jan 2021 09:03:27 +0800 Subject: [PATCH 5/6] * Fix bug. --- module/my/view/profile.html.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/my/view/profile.html.php b/module/my/view/profile.html.php index e3f8ff4754..702b712948 100644 --- a/module/my/view/profile.html.php +++ b/module/my/view/profile.html.php @@ -18,11 +18,11 @@ avatar) { - echo html::image($app->user->avatar); + echo html::image($user->avatar); } else { - echo strtoupper($app->user->account[0]); + echo strtoupper($user->account[0]); } ?> From 4952dffe1fc1f4d20acddc416e0facf7a0146f39 Mon Sep 17 00:00:00 2001 From: holan20180123 <56391770@qq.com> Date: Mon, 25 Jan 2021 09:03:46 +0800 Subject: [PATCH 6/6] * Finish task #9069. --- module/custom/control.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/module/custom/control.php b/module/custom/control.php index 0a0427d642..1120499dfb 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -53,7 +53,7 @@ class custom extends control $this->app->loadConfig($module); $unitList = zget($this->config->$module, 'unitList', ''); $this->view->unitList = explode(',', $unitList); - $this->view->mainCurrency = zget($this->config->$module, 'mainCurrency', 'rmb'); + $this->view->mainCurrency = zget($this->config->$module, 'mainCurrency', 'CNY'); } if(($module == 'story' or $module == 'testcase') and $field == 'review') { @@ -387,7 +387,7 @@ class custom extends control /* Update story estimate field. */ if($unit != $_POST['hourPoint']) { - $stories = $this->dao->select('*')->from(TABLE_STORY)->fetchAll(); + $stories = $this->dao->select('id,estimate')->from(TABLE_STORY)->fetchAll(); foreach($stories as $story) { $this->dao->update(TABLE_STORY)->set('estimate')->eq($story->estimate * $this->post->scaleFactor)->where('id')->eq($story->id)->exec(); @@ -460,6 +460,7 @@ class custom extends control /** * Edit story concept. + * @param int $key * * @access public * @return void @@ -489,6 +490,7 @@ class custom extends control /** * Delete story concept. + * @param int $key * * @access public * @return void @@ -502,6 +504,8 @@ class custom extends control /** * Delete story concept. + * @param int $key + * @param string $confirm yse|no * * @access public * @return void