* Adjust code.
This commit is contained in:
@@ -1139,7 +1139,6 @@ class docModel extends model
|
||||
}
|
||||
|
||||
if($type == 'product' or $type == 'project') $libs = $this->dao->select('*')->from($table)->where('id')->in(array_keys($libs))->orderBy('`order` desc')->fetchAll('id');
|
||||
|
||||
return $libs;
|
||||
}
|
||||
|
||||
|
||||
@@ -160,8 +160,8 @@ $lang->program->PRJParentBeginEnd = "The begin and end date of the parent pro
|
||||
$lang->program->PRJParentBudget = "The budget of the parent project: %s";
|
||||
$lang->program->PRJBeginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project.";
|
||||
$lang->program->PRJEndGreaterParent = "The end date of the parent project: %s. It cannot be > the end date of its parent project.";
|
||||
$lang->program->PRJBeginGreateChild = "The earliest begin date of a child project: %s. The begin date of its parent project cannot be > the earliest begin date of a child project.";
|
||||
$lang->program->PRJEndLetterChild = "The latest end date of a child project: %s. The end date of its parent project cannot be < the latest end date of child project.";
|
||||
$lang->program->PRJBeginGreateChild = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the program set.";
|
||||
$lang->program->PRJEndLetterChild = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the program set.";
|
||||
$lang->program->PRJChildLongTime = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
|
||||
|
||||
/* Actions. */
|
||||
|
||||
@@ -160,8 +160,8 @@ $lang->program->PRJParentBeginEnd = "The begin and end date of the parent pro
|
||||
$lang->program->PRJParentBudget = "The budget of the parent project: %s";
|
||||
$lang->program->PRJBeginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project.";
|
||||
$lang->program->PRJEndGreaterParent = "The end date of the parent project: %s. It cannot be > the end date of its parent project.";
|
||||
$lang->program->PRJBeginGreateChild = "The earliest begin date of a child project: %s. The begin date of its parent project cannot be > the earliest begin date of a child project.";
|
||||
$lang->program->PRJEndLetterChild = "The latest end date of a child project: %s. The end date of its parent project cannot be < the latest end date of child project.";
|
||||
$lang->program->PRJBeginGreateChild = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the program set.";
|
||||
$lang->program->PRJEndLetterChild = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the program set.";
|
||||
$lang->program->PRJChildLongTime = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
|
||||
|
||||
/* Actions. */
|
||||
|
||||
@@ -160,8 +160,8 @@ $lang->program->PRJParentBeginEnd = "The begin and end date of the parent pro
|
||||
$lang->program->PRJParentBudget = "The budget of the parent project: %s";
|
||||
$lang->program->PRJBeginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project.";
|
||||
$lang->program->PRJEndGreaterParent = "The end date of the parent project: %s. It cannot be > the end date of its parent project.";
|
||||
$lang->program->PRJBeginGreateChild = "The earliest begin date of a child project: %s. The begin date of its parent project cannot be > the earliest begin date of a child project.";
|
||||
$lang->program->PRJEndLetterChild = "The latest end date of a child project: %s. The end date of its parent project cannot be < the latest end date of child project.";
|
||||
$lang->program->PRJBeginGreateChild = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the program set.";
|
||||
$lang->program->PRJEndLetterChild = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the program set.";
|
||||
$lang->program->PRJChildLongTime = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
|
||||
|
||||
/* Actions. */
|
||||
|
||||
@@ -160,8 +160,8 @@ $lang->program->PRJParentBeginEnd = "The begin and end date of the parent pro
|
||||
$lang->program->PRJParentBudget = "The budget of the parent project: %s";
|
||||
$lang->program->PRJBeginLetterParent = "The begin date of the parent project: %s. It cannot be < the begin date of its parent project.";
|
||||
$lang->program->PRJEndGreaterParent = "The end date of the parent project: %s. It cannot be > the end date of its parent project.";
|
||||
$lang->program->PRJBeginGreateChild = "The earliest begin date of a child project: %s. The begin date of its parent project cannot be > the earliest begin date of a child project.";
|
||||
$lang->program->PRJEndLetterChild = "The latest end date of a child project: %s. The end date of its parent project cannot be < the latest end date of child project.";
|
||||
$lang->program->PRJBeginGreateChild = "The minimum start date of the project set: %s. The start date of the project cannot be less than the minimum start date of the program set.";
|
||||
$lang->program->PRJEndLetterChild = "The maximum finish date for the project set: %s. The completion date of a project cannot be greater than the maximum completion date of the program set.";
|
||||
$lang->program->PRJChildLongTime = "There are long-term projects in the child project, and the parent project should also be a long-term project.";
|
||||
|
||||
/* Actions. */
|
||||
|
||||
@@ -160,8 +160,8 @@ $lang->program->PRJParentBeginEnd = "父项目起止时间:%s ~ %s";
|
||||
$lang->program->PRJParentBudget = "父项目预算:%s";
|
||||
$lang->program->PRJBeginLetterParent = "父项目的开始日期:%s,开始日期不能小于父项目的开始日期";
|
||||
$lang->program->PRJEndGreaterParent = "父项目的完成日期:%s,完成日期不能大于父项目的完成日期";
|
||||
$lang->program->PRJBeginGreateChild = "项目的最小开始日期:%s,项目集的开始日期不能大于项目的最小开始日期";
|
||||
$lang->program->PRJEndLetterChild = "项目的最大完成日期:%s,项目集的完成日期不能小于项目的最大完成日期";
|
||||
$lang->program->PRJBeginGreateChild = "项目集的最小开始日期:%s,项目的开始日期不能小于项目集的最小开始日期";
|
||||
$lang->program->PRJEndLetterChild = "项目集的最大完成日期:%s,项目的完成日期不能大于项目集的最大完成日期";
|
||||
$lang->program->PRJChildLongTime = "子项目中有长期项目,父项目也应该是长期项目";
|
||||
|
||||
/* Actions. */
|
||||
|
||||
@@ -160,8 +160,8 @@ $lang->program->PRJParentBeginEnd = "父項目起止時間:%s ~ %s";
|
||||
$lang->program->PRJParentBudget = "父項目預算:%s";
|
||||
$lang->program->PRJBeginLetterParent = "父項目的開始日期:%s,開始日期不能小於父項目的開始日期";
|
||||
$lang->program->PRJEndGreaterParent = "父項目的完成日期:%s,完成日期不能大於父項目的完成日期";
|
||||
$lang->program->PRJBeginGreateChild = "項目的最小開始日期:%s,項目集的開始日期不能大於項目的最小開始日期";
|
||||
$lang->program->PRJEndLetterChild = "項目的最大完成日期:%s,項目集的完成日期不能小於項目的最大完成日期";
|
||||
$lang->program->PRJBeginGreateChild = "項目集的最小開始日期:%s,項目的開始日期不能小於項目集的最小開始日期";
|
||||
$lang->program->PRJEndLetterChild = "項目集的最大完成日期:%s,項目的完成日期不能大於項目集的最大完成日期";
|
||||
$lang->program->PRJChildLongTime = "子項目中有長期項目,父項目也應該是長期項目";
|
||||
|
||||
/* Actions. */
|
||||
|
||||
@@ -278,7 +278,6 @@ class programModel extends model
|
||||
}
|
||||
}
|
||||
|
||||
$this->lang->project->code = $this->lang->program->PGMCode;
|
||||
$program = $this->loadModel('file')->processImgURL($program, $this->config->program->editor->pgmcreate['id'], $this->post->uid);
|
||||
$this->dao->insert(TABLE_PROGRAM)->data($program)
|
||||
->autoCheck()
|
||||
@@ -376,6 +375,7 @@ class programModel extends model
|
||||
}
|
||||
if(dao::isError()) return false;
|
||||
|
||||
|
||||
$this->dao->update(TABLE_PROGRAM)->data($program)
|
||||
->autoCheck($skipFields = 'begin,end')
|
||||
->batchcheck($this->config->program->PGMEdit->requiredFields, 'notempty')
|
||||
|
||||
Reference in New Issue
Block a user