diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 78083a4260..88f9f7b32d 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -7967,6 +7967,13 @@ class upgradeModel extends model { if(!$module || !$name) continue; + $exist = $this->dao->select('id')->from(TABLE_MODULE) + ->where('root')->eq($dimension) + ->andWhere('collector')->eq($module) + ->andWhere('type')->eq($type) + ->fetchAll(); + if(!empty($exist)) continue; + $group->name = $name; $group->collector = $module; $this->dao->replace(TABLE_MODULE)->data($group)->exec(); @@ -8012,6 +8019,24 @@ class upgradeModel extends model return !dao::isError(); } + /** + * Process pivot modules. + * + * @param array $modules + * @access public + * @return bool + */ + public function processPivotModules($modules) + { + foreach($modules as $code => $module) + { + if(!$code || !$module) continue; + $this->dao->update(TABLE_PIVOT)->set("`group` = REPLACE(`group`, '$code', $module)")->exec(); + } + + return !dao::isError(); + } + /** * Xuan: Set mute and freeze for hidden groups. *