[Pkg-nagios-changes] [pkg-icingaweb2] 01/03: Imported Upstream version 2.1.2
Markus Frosch
lazyfrosch at moszumanska.debian.org
Wed Dec 23 14:23:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
lazyfrosch pushed a commit to branch master
in repository pkg-icingaweb2.
commit 6abcf98d31f8019b14bc7737c99caea5163d411d
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Wed Dec 23 15:13:13 2015 +0100
Imported Upstream version 2.1.2
---
VERSION | 2 +-
application/VERSION | 2 +-
application/forms/Config/General/ThemingConfigForm.php | 2 +-
doc/installation.md | 8 ++------
icingaweb2.spec | 2 +-
library/Icinga/Application/Version.php | 2 +-
modules/doc/module.info | 2 +-
modules/iframe/module.info | 2 +-
modules/monitoring/module.info | 2 +-
modules/setup/application/forms/AuthBackendPage.php | 15 +++++++++++++++
modules/setup/application/forms/UserGroupBackendPage.php | 15 +++++++++++++++
modules/setup/module.info | 2 +-
modules/test/module.info | 2 +-
modules/translation/module.info | 2 +-
14 files changed, 43 insertions(+), 17 deletions(-)
diff --git a/VERSION b/VERSION
index 826e142..5969682 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.1.1
+v2.1.2
diff --git a/application/VERSION b/application/VERSION
index f4be86c..30982d1 100644
--- a/application/VERSION
+++ b/application/VERSION
@@ -1 +1 @@
-fd609b7098922005ad7c92e7a32fc6a7307a9676 2015-12-22 14:59:48 +0100
+ce705e5926117db739520d751001c35689078274 2015-12-23 14:24:06 +0100
diff --git a/application/forms/Config/General/ThemingConfigForm.php b/application/forms/Config/General/ThemingConfigForm.php
index bc1f82f..02d9ae5 100644
--- a/application/forms/Config/General/ThemingConfigForm.php
+++ b/application/forms/Config/General/ThemingConfigForm.php
@@ -38,7 +38,7 @@ class ThemingConfigForm extends Form
'themes_default',
array(
'description' => $this->translate('The default theme', 'Form element description'),
- 'disabled' => count($themes) < 2,
+ 'disabled' => count($themes) < 2 ? 'disabled' : null,
'label' => $this->translate('Default Theme', 'Form element label'),
'multiOptions' => $themes,
'value' => StyleSheet::DEFAULT_THEME
diff --git a/doc/installation.md b/doc/installation.md
index d69d921..4f481dc 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -499,10 +499,6 @@ The first release candidate of Icinga Web 2 introduces the following non-backwar
**<config-dir>/preferences/<username>/config.ini**.
The content of the file remains unchanged.
-## <a id="upgrading-to-2.1.0"></a> Upgrading to Icinga Web 2 2.1.0
+## <a id="upgrading-to-2.1.x"></a> Upgrading to Icinga Web 2 2.1.x
-Icinga Web 2 2.1.0 does not introduce any backward incompatible change.
-
-## <a id="upgrading-to-2.1.1"></a> Upgrading to Icinga Web 2 2.1.1
-
-Nothing special :).
+Icinga Web 2 2.1.x does not introduce any backward incompatible change.
diff --git a/icingaweb2.spec b/icingaweb2.spec
index 0a17e57..0901c87 100644
--- a/icingaweb2.spec
+++ b/icingaweb2.spec
@@ -3,7 +3,7 @@
%define revision 1
Name: icingaweb2
-Version: 2.1.1
+Version: 2.1.2
Release: %{revision}%{?dist}
Summary: Icinga Web 2
Group: Applications/System
diff --git a/library/Icinga/Application/Version.php b/library/Icinga/Application/Version.php
index 78472a0..2b10792 100644
--- a/library/Icinga/Application/Version.php
+++ b/library/Icinga/Application/Version.php
@@ -8,7 +8,7 @@ namespace Icinga\Application;
*/
class Version
{
- const VERSION = '2.1.1';
+ const VERSION = '2.1.2';
/**
* Get the version of this instance of Icinga Web 2
diff --git a/modules/doc/module.info b/modules/doc/module.info
index 1af0f4b..f1404d4 100644
--- a/modules/doc/module.info
+++ b/modules/doc/module.info
@@ -1,4 +1,4 @@
Module: doc
-Version: 2.1.1
+Version: 2.1.2
Description: Documentation module
Extracts, shows and exports documentation for Icinga Web 2 and its modules.
diff --git a/modules/iframe/module.info b/modules/iframe/module.info
index 71ec792..e774a56 100644
--- a/modules/iframe/module.info
+++ b/modules/iframe/module.info
@@ -1,3 +1,3 @@
Module: iframe
-Version: 2.1.1
+Version: 2.1.2
Description: Display web sites within Icinga Web 2 via iframes
diff --git a/modules/monitoring/module.info b/modules/monitoring/module.info
index 8a9b826..ba8d36d 100644
--- a/modules/monitoring/module.info
+++ b/modules/monitoring/module.info
@@ -1,5 +1,5 @@
Module: monitoring
-Version: 2.1.1
+Version: 2.1.2
Description: Icinga monitoring module
This is the core module for most Icingaweb users. It provides an
abstraction layer for various Icinga data backends.
diff --git a/modules/setup/application/forms/AuthBackendPage.php b/modules/setup/application/forms/AuthBackendPage.php
index 85f5cf8..24ca72b 100644
--- a/modules/setup/application/forms/AuthBackendPage.php
+++ b/modules/setup/application/forms/AuthBackendPage.php
@@ -117,6 +117,21 @@ class AuthBackendPage extends Form
}
/**
+ * Retrieve all form element values
+ *
+ * @param bool $suppressArrayNotation Ignored
+ *
+ * @return array
+ */
+ public function getValues($suppressArrayNotation = false)
+ {
+ $values = parent::getValues();
+ $values = array_merge($values, $values['backend_form']);
+ unset($values['backend_form']);
+ return $values;
+ }
+
+ /**
* Validate the given form data and check whether it's possible to authenticate using the configured backend
*
* @param array $data The data to validate
diff --git a/modules/setup/application/forms/UserGroupBackendPage.php b/modules/setup/application/forms/UserGroupBackendPage.php
index 7764848..272949d 100644
--- a/modules/setup/application/forms/UserGroupBackendPage.php
+++ b/modules/setup/application/forms/UserGroupBackendPage.php
@@ -129,4 +129,19 @@ class UserGroupBackendPage extends Form
)
);
}
+
+ /**
+ * Retrieve all form element values
+ *
+ * @param bool $suppressArrayNotation Ignored
+ *
+ * @return array
+ */
+ public function getValues($suppressArrayNotation = false)
+ {
+ $values = parent::getValues();
+ $values = array_merge($values, $values['backend_form']);
+ unset($values['backend_form']);
+ return $values;
+ }
}
diff --git a/modules/setup/module.info b/modules/setup/module.info
index 3dfd1f5..0ae1092 100644
--- a/modules/setup/module.info
+++ b/modules/setup/module.info
@@ -1,5 +1,5 @@
Module: setup
-Version: 2.1.1
+Version: 2.1.2
Description: Setup module
Web based wizard for setting up Icinga Web 2 and its modules.
This includes the data backends (e.g. relational database, LDAP),
diff --git a/modules/test/module.info b/modules/test/module.info
index 326cd19..a65857b 100644
--- a/modules/test/module.info
+++ b/modules/test/module.info
@@ -1,5 +1,5 @@
Module: test
-Version: 2.1.1
+Version: 2.1.2
Description: Translation module
This module allows developers to run (unit) tests against Icinga Web 2 and
any of its modules. Usually you do not need to enable this.
diff --git a/modules/translation/module.info b/modules/translation/module.info
index ea1f08b..5c652f6 100644
--- a/modules/translation/module.info
+++ b/modules/translation/module.info
@@ -1,5 +1,5 @@
Module: translation
-Version: 2.1.1
+Version: 2.1.2
Description: Translation module
This module allows developers and translators to translate Icinga Web 2 and
its modules for multiple languages. You do not need this module to run an
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icingaweb2.git
More information about the Pkg-nagios-changes
mailing list