diff --git a/module/custom/control.php b/module/custom/control.php index b125b6da0e..05cfa88f1b 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -584,10 +584,7 @@ class custom extends control $this->custom->setConcept(); if($this->config->edition != 'max') $this->loadModel('setting')->setItem('system.custom.hourPoint', $this->post->hourPoint); - $this->app->loadLang('common'); - $locate = inlink('flow'); - - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate)); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true)); } $this->view->title = $this->lang->custom->flow; diff --git a/module/custom/css/flow.ui.css b/module/custom/css/flow.ui.css new file mode 100644 index 0000000000..64ab828959 --- /dev/null +++ b/module/custom/css/flow.ui.css @@ -0,0 +1,2 @@ +#flowForm .form-row {margin-top: 0 !important;} +.items-center {align-items: center !important;} diff --git a/module/custom/model.php b/module/custom/model.php index 216b302679..620e31e729 100644 --- a/module/custom/model.php +++ b/module/custom/model.php @@ -761,7 +761,7 @@ class customModel extends model foreach($this->config->executionCommonList as $executionCommonList) { - $this->dao->update(TABLE_BLOCK)->set("`title` = REPLACE(`title`, '{$executionCommonList[$oldConfig]}', '{$executionCommonList[$newConfig]}')")->where('source')->eq('execution')->exec(); + $this->dao->update(TABLE_BLOCK)->set("`title` = REPLACE(`title`, '{$executionCommonList[$oldConfig]}', '{$executionCommonList[$newConfig]}')")->where('dashboard')->eq('execution')->exec(); } } diff --git a/module/custom/ui/flow.html.php b/module/custom/ui/flow.html.php new file mode 100644 index 0000000000..4ab86621df --- /dev/null +++ b/module/custom/ui/flow.html.php @@ -0,0 +1,60 @@ + + * @package custom + * @link https://www.zentao.net + */ +namespace zin; + +formPanel +( + set::id('flowForm'), + set::actions(array('submit')), + set::actionsClass('w-1/3'), + span + ( + setClass('article-h2'), + $lang->custom->flow + ), + formGroup + ( + set::label('1.'), + setClass('items-center'), + span($lang->custom->conceptQuestions['overview']) + ), + formGroup + ( + set::label(''), + radioList + ( + set::name('sprintConcept'), + set::items($lang->custom->sprintConceptList), + set::value(zget($this->config->custom, 'sprintConcept', '0')), + set::inline(true), + ) + ), + formGroup + ( + set::label('2.'), + setClass('items-center'), + span($lang->custom->conceptQuestions['storypoint']), + ), + formGroup + ( + set::label(''), + radioList + ( + set::name('hourPoint'), + set::items($lang->custom->conceptOptions->hourPoint), + set::value(zget($this->config->custom, 'hourPoint')), + set::inline(true), + ) + ), +); + +/* ====== Render page ====== */ +render();