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

Merge branch '12.x' of https://github.com/easysoft/zentaopms into 12.x

Browse Source
This commit is contained in:
hufangzhou
2020-10-12 16:10:43 +08:00
parent 0001012632 6442248d68
commit e0bf6af618
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+1 -1
View File
@@ -222,9 +222,9 @@ class bugModel extends model
$data->browsers[$i] = $browser;
}
/* Get bug data. */
if(isset($data->uploadImage)) $this->loadModel('file');
$extendFields = $this->getFlowExtendFields();
$bugs = array();
foreach($data->title as $i => $title)
{
module/story/model.php
+7 -13
View File
@@ -814,30 +814,24 @@ class storyModel extends model
$oldPlanIDList = $oldPlanIDList ? explode(',', $oldPlanIDList) : array();
/* Get the ids to be inserted and deleted by comparing plan ids. */
$insertedPlanIDList = array_diff($planIDList, $oldPlanIDList);
$deletedPlanIDList = array_diff($oldPlanIDList, $planIDList);
$plansTobeInsert = array_diff($planIDList, $oldPlanIDList);
$plansTobeDelete = array_diff($oldPlanIDList, $planIDList);
/* Delete old story sort of plan. */
if(!empty($deletedPlanIDList))
{
foreach($deletedPlanIDList as $planID)
{
$this->dao->delete()->from(TABLE_PLANSTORY)->where('plan')->eq($planID)->andWhere('story')->eq($storyID)->exec();
}
}
if(!empty($plansTobeDelete)) $this->dao->delete()->from(TABLE_PLANSTORY)->where('story')->eq($storyID)->andWhere('plan')->in($plansTobeDelete)->exec();
if(!empty($insertedPlanIDList))
if(!empty($plansTobeInsert))
{
/* Get last story order of plan list. */
$lastOrderOfPlans = $this->dao->select('plan, `order`')->from(TABLE_PLANSTORY)->where('plan')->in($insertedPlanIDList)->orderBy('order_asc')->fetchPairs();
$maxOrders = $this->dao->select('plan, max(`order`) as `order`')->from(TABLE_PLANSTORY)->where('plan')->in($plansTobeInsert)->groupBy('plan')->fetchPairs();
foreach($insertedPlanIDList as $planID)
foreach($plansTobeInsert as $planID)
{
/* Set story order in new plan. */
$data = new stdClass();
$data->plan = $planID;
$data->story = $storyID;
$data->order = zget($lastOrderOfPlans, $planID, 0) + 1;
$data->order = zget($maxOrders, $planID, 0) + 1;
$this->dao->replace(TABLE_PLANSTORY)->data($data)->exec();
}