diff options
| author | Simon Rettberg | 2017-12-01 13:42:04 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2017-12-01 13:42:04 +0100 |
| commit | 5393703f6e1485ddff94a50f63bcdd216ab629f4 (patch) | |
| tree | ce2db7130302bd4fb78b170e1fbd75496a1b4510 /modules-available/sysconfig/install.inc.php | |
| parent | Merge remote-tracking branch 'origin/permission-manager' into permission-manager (diff) | |
| parent | [roomplanner] Sort already placed machines to the bottom (diff) | |
| download | slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.tar.gz slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.tar.xz slx-admin-5393703f6e1485ddff94a50f63bcdd216ab629f4.zip | |
Merge branch 'master' into permission-manager
Diffstat (limited to 'modules-available/sysconfig/install.inc.php')
| -rw-r--r-- | modules-available/sysconfig/install.inc.php | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/modules-available/sysconfig/install.inc.php b/modules-available/sysconfig/install.inc.php index 91f282dd..3e99b777 100644 --- a/modules-available/sysconfig/install.inc.php +++ b/modules-available/sysconfig/install.inc.php @@ -39,21 +39,18 @@ $res[] = tableCreate('configtgz_location', " // Constraints if (in_array(UPDATE_DONE, $res)) { - $ret = Database::exec("ALTER TABLE `configtgz_x_module` - ADD CONSTRAINT `configtgz_x_module_ibfk_1` FOREIGN KEY (`configid`) REFERENCES `configtgz` (`configid`) - ON DELETE CASCADE"); - $ret = Database::exec("ALTER TABLE `configtgz_x_module` - ADD CONSTRAINT `configtgz_x_module_ibfk_2` FOREIGN KEY (`moduleid`) REFERENCES `configtgz_module` (`moduleid`)") || $ret; - $ret = Database::exec("ALTER TABLE `configtgz_location` - ADD CONSTRAINT `configtgz_location_fk_configid` FOREIGN KEY ( `configid` ) REFERENCES `openslx`.`configtgz` (`configid`) - ON DELETE CASCADE ON UPDATE CASCADE") || $ret; - if ($ret) { - $res[] = UPDATE_DONE; - } + // To self + $res[] = tableAddConstraint('configtgz_x_module', 'configid', 'configtgz', 'configid', + ''); + $res[] = tableAddConstraint('configtgz_x_module', 'moduleid', 'configtgz_module', 'moduleid', + ''); + $res[] = tableAddConstraint('configtgz_location', 'configid', 'configtgz', 'configid', + 'ON DELETE CASCADE ON UPDATE CASCADE'); } // Update path +// ####################### // ##### 2014-12-12 // Rename config modules Database::exec("UPDATE configtgz_module SET moduletype = 'Branding' WHERE moduletype = 'BRANDING'"); @@ -98,9 +95,4 @@ if ($list === false) { } // Create response for browser - -if (in_array(UPDATE_DONE, $res)) { - finalResponse(UPDATE_DONE, 'Tables created successfully'); -} - -finalResponse(UPDATE_NOOP, 'Everything already up to date'); +responseFromArray($res); |