diff --git a/extension/lite/task/ext/view/batchcreate.html.php b/extension/lite/task/ext/view/batchcreate.html.php index 8907bf1f32..6f432d2625 100644 --- a/extension/lite/task/ext/view/batchcreate.html.php +++ b/extension/lite/task/ext/view/batchcreate.html.php @@ -135,7 +135,7 @@ style='overflow:visible'> style='overflow:visible'> - task->typeList, $type, 'class=form-control');?> + task->typeList, $type, "class='form-control chosen'");?> style='overflow:visible'> > > diff --git a/module/execution/css/all.css b/module/execution/css/all.css index c1ac7084d4..49211f1ddb 100644 --- a/module/execution/css/all.css +++ b/module/execution/css/all.css @@ -26,3 +26,5 @@ td.flex span.project-type-label {margin-left: 5px; min-width: 36px;} td.flex span.project-type-label {min-width: 40px;} .label-children {min-width:22px !important;} +.c-name > a, .table-children .text-left > a {padding-left: 5px;} +.has-child > span {margin-right: 5px;} diff --git a/module/execution/view/treestory.html.php b/module/execution/view/treestory.html.php index 8aa91ed49c..719c39b78d 100644 --- a/module/execution/view/treestory.html.php +++ b/module/execution/view/treestory.html.php @@ -199,6 +199,7 @@
+ config->vision != 'lite'):?> @@ -243,6 +244,7 @@ +
story->legendFromBug;?>
story->legendLinkStories;?> diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php index 39ac93c799..c95a562a64 100644 --- a/module/programplan/view/create.html.php +++ b/module/programplan/view/create.html.php @@ -22,6 +22,7 @@ echo "{$title}"; ?> +
@@ -34,6 +35,7 @@ ?>
+ diff --git a/module/stage/model.php b/module/stage/model.php index 9d4bd1e366..b25a0e7304 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -26,7 +26,11 @@ class stageModel extends model ->add('createdDate', helper::today()) ->get(); - $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec(); + $this->dao->insert(TABLE_STAGE) + ->data($stage) + ->autoCheck() + ->checkIF($stage->percent != '', 'percent', 'float') + ->exec(); if(!dao::isError()) return $this->dao->lastInsertID(); return false; @@ -54,7 +58,7 @@ class stageModel extends model $stage->createdBy = $this->app->user->account; $stage->createdDate = helper::today(); - $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->exec(); + $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->exec(); $stageID = $this->dao->lastInsertID(); $this->action->create('stage', $stageID, 'Opened'); @@ -79,7 +83,7 @@ class stageModel extends model ->add('editedDate', helper::today()) ->get(); - $this->dao->update(TABLE_STAGE)->data($stage)->autoCheck()->where('id')->eq((int)$stageID)->exec(); + $this->dao->update(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->where('id')->eq((int)$stageID)->exec(); if(!dao::isError()) return common::createChanges($oldStage, $stage); return false;