Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'branch/workflow' into 'master'

Browse Source 
Branch/workflow

See merge request easycorp/zentaopms!3302
This commit is contained in:
王怡栋
2022-05-10 02:27:35 +00:00
parent 5ddd054b28 a71cf1d280
commit 418a4580bb
11 changed files with 58 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/caselib/model.php
+1
View File
@@ -103,6 +103,7 @@ class caselibModel extends model
$this->dao->update(TABLE_TESTSUITE)->data($lib)
->autoCheck()
->batchcheck($this->config->caselib->edit->requiredFields, 'notempty')
->checkFlow()
->where('id')->eq($libID)
->checkFlow()
->exec();
module/execution/model.php
+7 -7
View File
@@ -516,6 +516,7 @@ class executionModel extends model
->checkIF($execution->end != '', 'end', 'ge', $execution->begin)
->checkIF((!empty($execution->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $executionID and type in ('sprint','stage') and `project` = $executionProject")
->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage')")
->checkFlow()
->where('id')->eq($executionID)
->checkFlow()
->limit(1)
@@ -673,13 +674,6 @@ class executionModel extends model
if(is_array($executions[$executionID]->{$extendField->field})) $executions[$executionID]->{$extendField->field} = join(',', $executions[$executionID]->{$extendField->field});
$executions[$executionID]->{$extendField->field} = htmlSpecialString($executions[$executionID]->{$extendField->field});
$message = $this->checkFlowRule($extendField, $executions[$executionID]->{$extendField->field});
if($message)
{
dao::$errors['message'][] = $message;
return false;
}
}
}
@@ -709,6 +703,7 @@ class executionModel extends model
->checkIF($execution->end != '', 'end', 'ge', $execution->begin)
->checkIF((!empty($execution->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $executionID and type in ('sprint','stage') and `project` = $projectID")
->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage')")
->checkFlow()
->where('id')->eq($executionID)
->limit(1)
->exec();
@@ -772,6 +767,7 @@ class executionModel extends model
->autoCheck()
->check($this->config->execution->start->requiredFields, 'notempty')
->checkIF($execution->realBegan != '', 'realBegan', 'le', helper::today())
->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
@@ -805,6 +801,7 @@ class executionModel extends model
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
@@ -832,6 +829,7 @@ class executionModel extends model
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
@@ -867,6 +865,7 @@ class executionModel extends model
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
@@ -937,6 +936,7 @@ class executionModel extends model
->check($this->config->execution->close->requiredFields,'notempty')
->checkIF($execution->realEnd != '', 'realEnd', 'le', helper::today())
->checkIF($execution->realEnd != '', 'realEnd', 'ge', $oldExecution->realBegan)
->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
module/product/model.php
+4 -2
View File
@@ -609,6 +609,7 @@ class productModel extends model
->batchCheck($this->config->product->create->requiredFields, 'notempty')
->checkIF((!empty($product->name) and $this->config->systemMode == 'new'), 'name', 'unique', "`program` = $programID")
->checkIF(!empty($product->code), 'code', 'unique')
->checkFlow()
->exec();
if(!dao::isError())
@@ -718,6 +719,7 @@ class productModel extends model
->batchCheck($this->config->product->edit->requiredFields, 'notempty')
->checkIF((!empty($product->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $productID and `program` = $programID")
->checkIF(!empty($product->code), 'code', 'unique', "id != $productID")
->checkFlow()
->where('id')->eq($productID)
->exec();
@@ -773,8 +775,6 @@ class productModel extends model
if(is_array($products[$productID]->{$extendField->field})) $products[$productID]->{$extendField->field} = join(',', $products[$productID]->{$extendField->field});
$products[$productID]->{$extendField->field} = htmlSpecialString($products[$productID]->{$extendField->field});
$message = $this->checkFlowRule($extendField, $products[$productID]->{$extendField->field});
if($message) return print(js::alert($message));
}
}
if(dao::isError()) return print(js::error(dao::getError()));
@@ -791,6 +791,7 @@ class productModel extends model
->autoCheck()
->batchCheck($this->config->product->edit->requiredFields , 'notempty')
->checkIF((!empty($product->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $productID and `program` = $programID")
->checkFlow()
->where('id')->eq($productID)
->exec();
if(dao::isError()) return print(js::error('product#' . $productID . dao::getError(true)));
@@ -828,6 +829,7 @@ class productModel extends model
$this->dao->update(TABLE_PRODUCT)->data($product)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$productID)
->exec();
module/productplan/model.php
+3 -3
View File
@@ -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;
}
module/program/model.php
+2
View File
@@ -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();
module/project/model.php
+8 -2
View File
@@ -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();
module/story/model.php
+9 -13
View File
@@ -247,6 +247,7 @@ class storyModel extends model
->autoCheck()
->checkIF($story->notifyEmail, 'notifyEmail', 'email')
->batchCheck($requiredFields, 'notempty')
->checkFlow()
->exec();
if(!dao::isError())
@@ -514,8 +515,6 @@ class storyModel extends model
if(is_array($story->{$extendField->field})) $story->{$extendField->field} = join(',', $story->{$extendField->field});
$story->{$extendField->field} = htmlSpecialString($story->{$extendField->field});
$message = $this->checkFlowRule($extendField, $story->{$extendField->field});
if($message) return print(js::alert($message));
}
foreach(explode(',', $this->config->story->create->requiredFields) as $field)
@@ -538,7 +537,7 @@ class storyModel extends model
foreach($data as $i => $story)
{
$this->dao->insert(TABLE_STORY)->data($story)->autoCheck()->exec();
$this->dao->insert(TABLE_STORY)->data($story)->autoCheck()->checkFlow()->exec();
if(dao::isError())
{
echo js::error(dao::getError());
@@ -694,6 +693,7 @@ class storyModel extends model
$this->dao->update(TABLE_STORY)->data($story, 'spec,verify')
->autoCheck()
->batchCheck($this->config->story->change->requiredFields, 'notempty')
->checkFlow()
->where('id')->eq((int)$storyID)->exec();
if(!dao::isError())
@@ -866,6 +866,7 @@ class storyModel extends model
->checkIF(isset($story->closedReason) and $story->closedReason == 'done', 'stage', 'notempty')
->checkIF(isset($story->closedReason) and $story->closedReason == 'duplicate', 'duplicateStory', 'notempty')
->checkIF($story->notifyEmail, 'notifyEmail', 'email')
->checkFlow()
->where('id')->eq((int)$storyID)->exec();
if(!dao::isError())
@@ -1248,8 +1249,6 @@ class storyModel extends model
if(is_array($story->{$extendField->field})) $story->{$extendField->field} = join(',', $story->{$extendField->field});
$story->{$extendField->field} = htmlSpecialString($story->{$extendField->field});
$message = $this->checkFlowRule($extendField, $story->{$extendField->field});
if($message) return print(js::alert($message));
}
$stories[$storyID] = $story;
@@ -1264,6 +1263,7 @@ class storyModel extends model
->checkIF($story->closedBy, 'closedReason', 'notempty')
->checkIF($story->closedReason == 'done', 'stage', 'notempty')
->checkIF($story->closedReason == 'duplicate', 'duplicateStory', 'notempty')
->checkFlow()
->where('id')->eq((int)$storyID)
->exec();
if($story->title != $oldStory->title)
@@ -1357,6 +1357,7 @@ class storyModel extends model
->batchCheck($this->config->story->review->requiredFields, 'notempty')
->checkIF($this->post->result == 'reject', 'closedReason', 'notempty')
->checkIF($this->post->result == 'reject' and $this->post->closedReason == 'duplicate', 'duplicateStory', 'notempty')
->checkFlow()
->where('id')->eq($storyID)->exec();
if($this->post->result == 'revert')
{
@@ -1581,6 +1582,7 @@ class storyModel extends model
->autoCheck()
->batchCheck($this->config->story->close->requiredFields, 'notempty')
->checkIF($story->closedReason == 'duplicate', 'duplicateStory', 'notempty')
->checkFlow()
->where('id')->eq($storyID)->exec();
/* Update parent story status and stage. */
@@ -1980,12 +1982,6 @@ class storyModel extends model
$assignedTo = $this->post->assignedTo;
if($assignedTo == $oldStory->assignedTo) return array();
$story = new stdclass();
$story->lastEditedBy = $this->app->user->account;
$story->lastEditedDate = $now;
$story->assignedTo = $assignedTo;
$story->assignedDate = $now;
$story = fixer::input('post')
->add('id', $storyID)
->add('lastEditedBy', $this->app->user->account)
@@ -1993,7 +1989,7 @@ class storyModel extends model
->add('assignedDate', $now)
->get();
$this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq((int)$storyID)->exec();
$this->dao->update(TABLE_STORY)->data($story)->autoCheck()->checkFlow()->where('id')->eq((int)$storyID)->exec();
if(!dao::isError()) return common::createChanges($oldStory, $story);
return false;
}
@@ -2055,7 +2051,7 @@ class storyModel extends model
->setDefault('activatedDate', $now)
->remove('comment')
->get();
$this->dao->update(TABLE_STORY)->data($story)->autoCheck()->where('id')->eq($storyID)->exec();
$this->dao->update(TABLE_STORY)->data($story)->autoCheck()->checkFlow()->where('id')->eq($storyID)->exec();
if($this->post->status == 'active') $this->dao->delete()->from(TABLE_STORYREVIEW)->where('story')->eq($storyID)->exec();
module/task/model.php
+11 -11
View File
@@ -138,6 +138,7 @@ class taskModel extends model
->batchCheck($requiredFields, 'notempty')
->checkIF($task->estimate != '', 'estimate', 'float')
->checkIF(!helper::isZeroDate($task->deadline), 'deadline', 'ge', $task->estStarted)
->checkFlow()
->exec();
if(dao::isError()) return false;
@@ -363,12 +364,6 @@ class taskModel extends model
if(is_array($data[$i]->{$extendField->field})) $data[$i]->{$extendField->field} = join(',', $data[$i]->{$extendField->field});
$data[$i]->{$extendField->field} = htmlSpecialString($data[$i]->{$extendField->field});
$message = $this->checkFlowRule($extendField, $data[$i]->{$extendField->field});
if($message)
{
dao::$errors['message'][] = sprintf($message);
return false;
}
}
}
@@ -423,6 +418,7 @@ class taskModel extends model
$this->dao->insert(TABLE_TASK)->data($task)
->autoCheck()
->checkIF($task->estimate != '', 'estimate', 'float')
->checkFlow()
->exec();
if(dao::isError()) return false;
@@ -1049,6 +1045,7 @@ class taskModel extends model
->batchCheckIF($task->status == 'done', 'canceledBy, canceledDate', 'empty')
->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty')
->checkFlow()
->where('id')->eq((int)$taskID)->exec();
if(!dao::isError())
@@ -1219,8 +1216,6 @@ class taskModel extends model
if(is_array($task->{$extendField->field})) $task->{$extendField->field} = join(',', $task->{$extendField->field});
$task->{$extendField->field} = htmlSpecialString($task->{$extendField->field});
$message = $this->checkFlowRule($extendField, $task->{$extendField->field});
if($message) return print(js::alert($message));
}
if(isset($data->consumeds[$taskID]))
@@ -1355,6 +1350,7 @@ class taskModel extends model
->batchCheckIF($task->status == 'done', 'canceledBy, canceledDate', 'empty')
->batchCheckIF($task->closedReason == 'cancel', 'finishedBy, finishedDate', 'empty')
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();
if(dao::isError())
@@ -1472,6 +1468,7 @@ class taskModel extends model
->data($task)
->autoCheck()
->check('left', 'float')
->checkFlow()
->where('id')->eq($taskID)
->exec();
@@ -1559,6 +1556,7 @@ class taskModel extends model
$this->dao->update(TABLE_TASK)->data($task)
->autoCheck()
->check('consumed,left', 'float')
->checkFlow()
->where('id')->eq((int)$taskID)->exec();
if($oldTask->parent > 0)
@@ -1830,6 +1828,7 @@ class taskModel extends model
$this->dao->update(TABLE_TASK)->data($task)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();
@@ -1869,7 +1868,7 @@ class taskModel extends model
->remove('comment')
->get();
$this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('id')->eq((int)$taskID)->exec();
$this->dao->update(TABLE_TASK)->data($task)->autoCheck()->checkFlow()->where('id')->eq((int)$taskID)->exec();
if($oldTask->parent > 0) $this->updateParentStatus($taskID);
@@ -1908,7 +1907,7 @@ class taskModel extends model
->remove('comment')
->get();
$this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('id')->eq((int)$taskID)->exec();
$this->dao->update(TABLE_TASK)->data($task)->autoCheck()->checkFlow()->where('id')->eq((int)$taskID)->exec();
if(!dao::isError())
{
@@ -1953,7 +1952,7 @@ class taskModel extends model
->remove('comment')
->get();
$this->dao->update(TABLE_TASK)->data($task)->autoCheck()->where('id')->eq((int)$taskID)->exec();
$this->dao->update(TABLE_TASK)->data($task)->autoCheck()->checkFlow()->where('id')->eq((int)$taskID)->exec();
if($oldTask->fromBug) $this->dao->update(TABLE_BUG)->set('toTask')->eq(0)->where('id')->eq($oldTask->fromBug)->exec();
if($oldTask->parent > 0) $this->updateParentStatus($taskID);
if($oldTask->parent == '-1')
@@ -2036,6 +2035,7 @@ class taskModel extends model
$this->dao->update(TABLE_TASK)->data($task)
->autoCheck()
->batchCheck($this->config->task->activate->requiredFields, 'notempty')
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();
module/testcase/model.php
+5 -7
View File
@@ -64,7 +64,7 @@ class testcaseModel extends model
/* Value of story may be showmore. */
$case->story = (int)$case->story;
$this->dao->insert(TABLE_CASE)->data($case)->autoCheck()->batchCheck($this->config->testcase->create->requiredFields, 'notempty')->exec();
$this->dao->insert(TABLE_CASE)->data($case)->autoCheck()->batchCheck($this->config->testcase->create->requiredFields, 'notempty')->checkFlow()->exec();
if(!$this->dao->isError())
{
$caseID = $this->dao->lastInsertID();
@@ -174,8 +174,6 @@ class testcaseModel extends model
if(is_array($data[$i]->{$extendField->field})) $data[$i]->{$extendField->field} = join(',', $data[$i]->{$extendField->field});
$data[$i]->{$extendField->field} = htmlSpecialString($data[$i]->{$extendField->field});
$message = $this->checkFlowRule($extendField, $data[$i]->{$extendField->field});
if($message) return print(js::alert($message));
}
foreach(explode(',', $this->config->testcase->create->requiredFields) as $field)
@@ -191,6 +189,7 @@ class testcaseModel extends model
$this->dao->insert(TABLE_CASE)->data($case)
->autoCheck()
->batchCheck($this->config->testcase->create->requiredFields, 'notempty')
->checkFlow()
->exec();
if(dao::isError())
@@ -738,7 +737,7 @@ class testcaseModel extends model
array_splice($requiredFieldsArr, $fieldIndex, 1);
$requiredFields = implode(',', $requiredFieldsArr);
}
$this->dao->update(TABLE_CASE)->data($case)->autoCheck()->batchCheck($requiredFields, 'notempty')->where('id')->eq((int)$caseID)->exec();
$this->dao->update(TABLE_CASE)->data($case)->autoCheck()->batchCheck($requiredFields, 'notempty')->checkFlow()->where('id')->eq((int)$caseID)->exec();
if(!$this->dao->isError())
{
$isLibCase = ($oldCase->lib and empty($oldCase->product));
@@ -845,7 +844,7 @@ class testcaseModel extends model
->join('reviewedBy', ',')
->get();
$this->dao->update(TABLE_CASE)->data($case)->autoCheck()->where('id')->eq($caseID)->exec();
$this->dao->update(TABLE_CASE)->data($case)->autoCheck()->checkFlow()->where('id')->eq($caseID)->exec();
if(dao::isError()) return false;
@@ -970,8 +969,6 @@ class testcaseModel extends model
if(is_array($case->{$extendField->field})) $case->{$extendField->field} = join(',', $case->{$extendField->field});
$case->{$extendField->field} = htmlSpecialString($case->{$extendField->field});
$message = $this->checkFlowRule($extendField, $case->{$extendField->field});
if($message) return print(js::alert($message));
}
$cases[$caseID] = $case;
@@ -986,6 +983,7 @@ class testcaseModel extends model
$this->dao->update(TABLE_CASE)->data($case)
->autoCheck()
->batchCheck($this->config->testcase->edit->requiredFields, 'notempty')
->checkFlow()
->where('id')->eq($caseID)
->exec();
module/testsuite/model.php
+2
View File
@@ -71,6 +71,7 @@ class testsuiteModel extends model
$suite = $this->loadModel('file')->processImgURL($suite, $this->config->testsuite->editor->create['id'], $this->post->uid);
$this->dao->insert(TABLE_TESTSUITE)->data($suite)
->batchcheck($this->config->testsuite->create->requiredFields, 'notempty')
->checkFlow()
->exec();
if(!dao::isError())
{
@@ -158,6 +159,7 @@ class testsuiteModel extends model
$this->dao->update(TABLE_TESTSUITE)->data($suite)
->autoCheck()
->batchcheck($this->config->testsuite->edit->requiredFields, 'notempty')
->checkFlow()
->where('id')->eq($suiteID)
->exec();
if(!dao::isError())
module/testtask/model.php
+6
View File
@@ -44,6 +44,7 @@ class testtaskModel extends model
->checkIF($task->begin != '', 'begin', 'date')
->checkIF($task->end != '', 'end', 'date')
->checkIF($task->end != '', 'end', 'ge', $task->begin)
->checkFlow()
->exec();
if(!dao::isError())
@@ -746,6 +747,7 @@ class testtaskModel extends model
->autoCheck()
->batchcheck($this->config->testtask->edit->requiredFields, 'notempty')
->checkIF($task->end != '', 'end', 'ge', $task->begin)
->checkFlow()
->where('id')->eq($taskID)
->exec();
@@ -774,6 +776,7 @@ class testtaskModel extends model
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();
@@ -811,6 +814,7 @@ class testtaskModel extends model
$testtask = $this->loadModel('file')->processImgURL($testtask, $this->config->testtask->editor->close['id'], $this->post->uid);
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();
@@ -838,6 +842,7 @@ class testtaskModel extends model
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();
@@ -860,6 +865,7 @@ class testtaskModel extends model
$this->dao->update(TABLE_TESTTASK)->data($testtask)
->autoCheck()
->checkFlow()
->where('id')->eq((int)$taskID)
->exec();