diff options
| author |   Eudyptula <eitan@mosenkis.net> | 2009-07-15 16:30:48 -0400 |
|---|---|---|
| committer | Eudyptula <eitan@mosenkis.net> | 2009-07-15 16:30:48 -0400 |
| commit | 97c9ab5fa3d4b8793eebe7700c1be875640486b5 (patch) | |
| tree | 2476c308465ee4246cca5bcc95a0df4303ffa153 | |
| parent | Added config status page, moving forward and back in config wizard; added con... (diff) | |
| download | ingenue-97c9ab5fa3d4b8793eebe7700c1be875640486b5.tar.gz ingenue-97c9ab5fa3d4b8793eebe7700c1be875640486b5.tar.bz2 ingenue-97c9ab5fa3d4b8793eebe7700c1be875640486b5.zip | |
Moved 'module' attribute into builds table from buildopts
| -rwxr-xr-x | backend/backend.php | 5 | ||||
| -rw-r--r-- | shared/classes/build.php | 5 | ||||
| -rw-r--r-- | shared/classes/configuration.php | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/backend/backend.php b/backend/backend.php index 5c77fc3..6ba8af6 100755 --- a/backend/backend.php +++ b/backend/backend.php @@ -66,9 +66,8 @@ while (true) { unset($opt); } $opts=$build->get_opts(); - $module=$opts['module']; - $build_proc=$module.'_build'; - foreach (glob(BACKEND."/modules/$module/*.php") as $inc) { + $build_proc=$build->module.'_build'; + foreach (glob(BACKEND."/modules/$build->module/*.php") as $inc) { require_once($inc); } // TODO check that build_proc exists diff --git a/shared/classes/build.php b/shared/classes/build.php index b13ac29..3f76b7d 100644 --- a/shared/classes/build.php +++ b/shared/classes/build.php @@ -19,6 +19,11 @@ class sql_build extends conf_build_common { 'type' => 'VARCHAR', 'length' => 255 ), + 'module' => array ( + 'type' => 'VARCHAR', + 'length' => 255, + 'not_null' => true + ), 'status' => array ( 'type' => 'VARCHAR', 'length' => 255, diff --git a/shared/classes/configuration.php b/shared/classes/configuration.php index 2714732..32200d4 100644 --- a/shared/classes/configuration.php +++ b/shared/classes/configuration.php @@ -43,6 +43,7 @@ class sql_configuration extends conf_build_common { $build=new sql_build(); $build->init(); $build->name=$name; + $build->module=$this->module; $opts=$this->get_opts(); $opts['configuration']=$this->id; foreach ($opts as $name => $val) { |