* Insert pivot sql in pms.
This commit is contained in:
+27
-1
File diff suppressed because one or more lines are too long
@@ -272,7 +272,7 @@ class install extends control
|
||||
if(strpos($this->app->getClientLang(), 'zh') === 0) $this->loadModel('api')->createDemoData($this->lang->api->zentaoAPI, "{$httpType}://{$_SERVER['HTTP_HOST']}" . $this->app->config->webRoot . 'api.php/v1', '16.0');
|
||||
|
||||
$this->loadModel('upgrade')->createDefaultDimension();
|
||||
if($this->config->edition == 'biz' or $this->config->edition == 'max') $this->upgrade->updatePivotGroup();
|
||||
$this->upgrade->updatePivotGroup();
|
||||
|
||||
return print(js::locate(inlink('step6'), 'parent'));
|
||||
}
|
||||
|
||||
@@ -182,6 +182,8 @@ class pivotZen extends pivot
|
||||
$sidebar = '';
|
||||
foreach($groups as $group)
|
||||
{
|
||||
if($this->config->edition == 'open' && $group->grade == 1) continue;
|
||||
|
||||
$pivots = $this->dao->select('*')->from(TABLE_PIVOT)
|
||||
->where("FIND_IN_SET($group->id, `group`)")
|
||||
->andWhere('stage')->ne('draft')
|
||||
|
||||
@@ -760,7 +760,6 @@ class upgradeModel extends model
|
||||
$this->processChart();
|
||||
$this->processReport();
|
||||
$this->processDashboard();
|
||||
$this->updatePivotGroup();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8227,6 +8226,8 @@ class upgradeModel extends model
|
||||
|
||||
$this->dao->update(TABLE_PIVOT)->set('`group`')->eq(implode(',', $insertGroup))->where('id')->eq($pivotID)->exec();
|
||||
}
|
||||
|
||||
return !dao::isError();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user