summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/sysconfig.inc.php9
-rw-r--r--modules/sysconfig/addmodule.inc.php2
2 files changed, 8 insertions, 3 deletions
diff --git a/modules/sysconfig.inc.php b/modules/sysconfig.inc.php
index 8c08af4f..8d19d62a 100644
--- a/modules/sysconfig.inc.php
+++ b/modules/sysconfig.inc.php
@@ -92,12 +92,17 @@ class Page_SysConfig extends Page
Message::addError('invalid-action', $action);
}
+ /**
+ * If modules need updates (blue refresh buttons), we query their state
+ * via ajax, in case they are about to generate. This happens for example
+ * if you edit a module and a bunch of configs depend on it and will be
+ * rebuilt.
+ */
protected function doAjax()
{
if (Request::post('action') === 'status') {
$mods = Request::post('mods');
$confs = Request::post('confs');
- error_log('Hit. Mods: ' . $mods . ', Confs: ' . $confs);
$outMods = array();
$outConfs = array();
$mods = explode(',', $mods);
@@ -149,7 +154,7 @@ class Page_SysConfig extends Page
);
}
// Config modules
- $res = Database::simpleQuery("SELECT moduleid, title, moduletype, status FROM configtgz_module ORDER BY title ASC");
+ $res = Database::simpleQuery("SELECT moduleid, title, moduletype, status FROM configtgz_module ORDER BY moduletype ASC, title ASC");
$modules = array();
while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
$modules[] = array(
diff --git a/modules/sysconfig/addmodule.inc.php b/modules/sysconfig/addmodule.inc.php
index 31f3823a..bbb827e5 100644
--- a/modules/sysconfig/addmodule.inc.php
+++ b/modules/sysconfig/addmodule.inc.php
@@ -101,7 +101,7 @@ abstract class AddModule_Base
Util::traceError('No step instance yet');
}
if (self::$instance->edit !== false)
- Message::addInfo('replacing-module', self::$instance->edit->title ());
+ Message::addInfo('replacing-module', self::$instance->edit->title());
self::$instance->renderInternal();
}