diff --git a/module/productplan/model.php b/module/productplan/model.php
index 7eefd49a79..ad2d763bec 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -432,6 +432,7 @@ class productplanModel extends model
->autoCheck()
->batchCheck($this->config->productplan->create->requiredFields, 'notempty')
->checkIF(!$this->post->future && !empty($_POST['begin']) && !empty($_POST['end']), 'end', 'ge', $plan->begin)
+ ->checkFlow()
->exec();
if(!dao::isError())
{
@@ -513,6 +514,7 @@ class productplanModel extends model
->autoCheck()
->batchCheck($this->config->productplan->edit->requiredFields, 'notempty')
->checkIF(!$this->post->future && !empty($_POST['begin']) && !empty($_POST['end']), 'end', 'ge', $plan->begin)
+ ->checkFlow()
->where('id')->eq((int)$planID)
->exec();
if(dao::isError()) return false;
@@ -653,8 +655,6 @@ class productplanModel extends model
if(is_array($plan->{$extendField->field})) $plan->{$extendField->field} = join(',', $plan->{$extendField->field});
$plan->{$extendField->field} = htmlSpecialString($plan->{$extendField->field});
- $message = $this->checkFlowRule($extendField, $plan->{$extendField->field});
- if($message) return print(js::alert($message));
}
$plans[$planID] = $plan;
@@ -697,7 +697,7 @@ class productplanModel extends model
if($change)
{
if($parentID > 0 and !isset($parents[$parentID])) $parents[$parentID] = $parentID;
- $this->dao->update(TABLE_PRODUCTPLAN)->data($plan)->autoCheck()->where('id')->eq($planID)->exec();
+ $this->dao->update(TABLE_PRODUCTPLAN)->data($plan)->autoCheck()->checkFlow()->where('id')->eq($planID)->exec();
if(dao::isError()) return print(js::error(dao::getError()));
$changes[$planID] = $change;
}
diff --git a/module/program/model.php b/module/program/model.php
index f1868c9348..f5bd3cdb18 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -657,6 +657,7 @@ class programModel extends model
->checkIF($program->end != '', 'end', 'date')
->checkIF($program->end != '', 'end', 'gt', $program->begin)
->checkIF(!empty($program->name), 'name', 'unique', "`type`='program' and `parent` = $program->parent")
+ ->checkFlow()
->exec();
if(!dao::isError())
@@ -756,6 +757,7 @@ class programModel extends model
->checkIF($program->end != '', 'end', 'date')
->checkIF($program->end != '', 'end', 'gt', $program->begin)
->checkIF(!empty($program->name), 'name', 'unique', "id!=$programID and `type`='program' and `parent` = $program->parent")
+ ->checkFlow()
->where('id')->eq($programID)
->limit(1)
->exec();
diff --git a/module/project/model.php b/module/project/model.php
index a17ae091f7..04a76c89f2 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -913,6 +913,7 @@ class projectModel extends model
->checkIF(!empty($project->name), 'name', 'unique', "`type`='project' and `parent` = $project->parent and `model` = '{$project->model}'")
->checkIF(!empty($project->code), 'code', 'unique', "`type`='project' and `model` = '{$project->model}'")
->checkIF($project->end != '', 'end', 'gt', $project->begin)
+ ->checkFlow()
->exec();
/* Add the creater to the team. */
@@ -1146,6 +1147,7 @@ class projectModel extends model
->checkIF($project->end != '', 'end', 'gt', $project->begin)
->checkIF(!empty($project->name), 'name', 'unique', "id != $projectID and `type` = 'project' and `parent` = $project->parent and `model` = '{$project->model}'")
->checkIF(!empty($project->code), 'code', 'unique', "id != $projectID and `type` = 'project' and `model` = '{$project->model}'")
+ ->checkFlow()
->where('id')->eq($projectID)
->exec();
@@ -1269,8 +1271,6 @@ class projectModel extends model
if(is_array($projects[$projectID]->{$extendField->field})) $projects[$projectID]->{$extendField->field} = join(',', $projects[$projectID]->{$extendField->field});
$projects[$projectID]->{$extendField->field} = htmlSpecialString($projects[$projectID]->{$extendField->field});
- $message = $this->checkFlowRule($extendField, $projects[$projectID]->{$extendField->field});
- if($message) hepler::end(js::alert($message));
}
}
if(dao::isError()) return print(js::error(dao::getError()));
@@ -1288,6 +1288,7 @@ class projectModel extends model
->checkIF($project->end != '', 'end', 'gt', $project->begin)
->checkIF(!empty($project->name), 'name', 'unique', "id != $projectID and `type`='project' and `parent` = $parentID and `model` = '{$project->model}'")
->checkIF(!empty($project->code), 'code', 'unique', "id != $projectID and `type`='project' and `model` = '{$project->model}'")
+ ->checkFlow()
->where('id')->eq($projectID)
->exec();
@@ -1331,6 +1332,7 @@ class projectModel extends model
->autoCheck()
->check($this->config->project->start->requiredFields, 'notempty')
->checkIF($project->realBegan != '', 'realBegan', 'le', helper::today())
+ ->checkFlow()
->where('id')->eq((int)$projectID)
->exec();
@@ -1361,6 +1363,7 @@ class projectModel extends model
$this->dao->update(TABLE_PROJECT)->data($project)
->autoCheck()
+ ->checkFlow()
->where('id')->eq((int)$projectID)
->exec();
@@ -1387,6 +1390,7 @@ class projectModel extends model
$this->dao->update(TABLE_PROJECT)->data($project)
->autoCheck()
+ ->checkFlow()
->where('id')->eq((int)$projectID)
->exec();
@@ -1423,6 +1427,7 @@ class projectModel extends model
$this->dao->update(TABLE_PROJECT)->data($project)
->autoCheck()
+ ->checkFlow()
->where('id')->eq((int)$projectID)
->exec();
@@ -1493,6 +1498,7 @@ class projectModel extends model
->check($this->config->project->close->requiredFields, 'notempty')
->checkIF($project->realEnd != '', 'realEnd', 'le', helper::today())
->checkIF($project->realEnd != '', 'realEnd', 'ge', $oldProject->realBegan)
+ ->checkFlow()
->where('id')->eq((int)$projectID)
->exec();
diff --git a/module/release/control.php b/module/release/control.php
index 2c76a1f05a..4f167c7fa7 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -41,15 +41,18 @@ class release extends control
* @access public
* @return void
*/
- public function browse($productID, $branch = 'all', $type = 'all', $orderBy = 't1.date_desc')
+ public function browse($productID, $branch = 'all', $type = 'all', $orderBy = 't1.date_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
+ $this->app->loadClass('pager', $static = true);
+ $pager = new pager($recTotal, $recPerPage, $pageID);
$this->commonAction($productID, $branch);
$this->session->set('releaseList', $this->app->getURI(true), 'product');
$this->view->title = $this->view->product->name . $this->lang->colon . $this->lang->release->browse;
$this->view->position[] = $this->lang->release->browse;
- $this->view->releases = $this->release->getList($productID, $branch, $type, $orderBy);
+ $this->view->releases = $this->release->getList($productID, $branch, $type, $orderBy, $pager);
$this->view->type = $type;
+ $this->view->pager = $pager;
$this->display();
}
diff --git a/module/release/model.php b/module/release/model.php
index 89c64ab08c..28cc033b6f 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -121,9 +121,6 @@ class releaseModel extends model
/* Check build if build is required. */
if(strpos($this->config->release->create->requiredFields, 'build') !== false and $this->post->build == false) return dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->release->build);
- /* Check date must be not more than today. */
- if($this->post->date > date('Y-m-d')) return dao::$errors[] = $this->lang->release->errorDate;
-
$release = fixer::input('post')
->add('product', (int)$productID)
->add('branch', (int)$branch)
diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php
index f980074b89..3eea2f090a 100644
--- a/module/release/view/browse.html.php
+++ b/module/release/view/browse.html.php
@@ -105,5 +105,8 @@