Merge branch 'hotfix/1.8.1'

ContaoMonitoring · Jun 28, 2017 · df5ffb4 · df5ffb4
2 parents 7451a9e + 5281fd3
commit df5ffb4
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 Contao Extension "Monitoring"
 =============================
 
+Version 1.8.1 (2017-xx-xx)
+--------------------------
+- Contao 4 ready
+
 Version 1.8.0 (2017-05-09)
 --------------------------
 - added response time recording (see #15)

diff --git a/README.md b/README.md
@@ -35,9 +35,8 @@ https://github.com/ContaoMonitoring/monitoring/issues
 Compatibility
 -------------
 
-- min. Contao version: >= 3.2.0
-- max. Contao version: <  3.6.0
-
+- Contao version >= 3.2.0 ... <  3.6.0
+- Contao version >= 4.4.0
 
 Dependency
 ----------

diff --git a/composer.json b/composer.json
@@ -23,8 +23,8 @@
 	},
 	"require":{
 		"php":">=5.3",
-		"contao/core":">=3.2.0,<3.6",
-		"contao-community-alliance/composer-plugin":"~2.0"
+		"contao/core-bundle":"~3.2 || ~4.4",
+		"contao-community-alliance/composer-plugin":"~2.4 || ~3.0"
 	},
 	"suggest" : {
 		"cliffparnitzky/backend-custom-startpage" : "Provides the possibility for each user to select an individual startpage in the backend."

diff --git a/system/modules/Monitoring/assets/backend_svg.css b/system/modules/Monitoring/assets/backend_svg.css
@@ -0,0 +1,3 @@
+#tl_navigation .tl_level_1_group .group-ContaoMonitoring {
+    background: url(icon_monitoring.svg) 3px 2px no-repeat;
+}
diff --git a/system/modules/Monitoring/assets/icon_monitoring.svg b/system/modules/Monitoring/assets/icon_monitoring.svg
diff --git a/system/modules/Monitoring/config/config.php b/system/modules/Monitoring/config/config.php
@@ -46,6 +46,11 @@
   )
 ));
 
+// Load icon in Contao 4.4 backend
+if ('BE' === TL_MODE) {
+  $GLOBALS['TL_CSS'][] = 'system/modules/Monitoring/assets/backend_svg.css';
+}
+
 /**
  * Cron
  */

diff --git a/system/modules/Monitoring/dca/tl_monitoring.php b/system/modules/Monitoring/dca/tl_monitoring.php
@@ -254,7 +254,7 @@
       'default'                 => '0',
       'inputType'               => 'text',
       'eval'                    => array('tl_class'=>'w50', 'readonly'=>true, 'rgxp'=>'digit', 'doNotCopy'=>true),
-      'sql'                     => "double unsigned NOT NULL default '0'"
+      'sql'                     => "double NOT NULL default '0'" // see doctrine/dbal#1018
     ),
     'disable' => array
     (

diff --git a/system/modules/Monitoring/dca/tl_monitoring_test.php b/system/modules/Monitoring/dca/tl_monitoring_test.php
@@ -170,7 +170,7 @@
       'sorting'                 => true,
       'inputType'               => 'text',
       'eval'                    => array('tl_class'=>'w50', 'readonly'=>true, 'rgxp'=>'digit'),
-      'sql'                     => "double unsigned NOT NULL default '0'"
+      'sql'                     => "double NOT NULL default '0'" // see doctrine/dbal#1018
     ),
     'repetitions' => array
     (
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,11 @@ @@
       )
     ));
+    // Load icon in Contao 4.4 backend
+    if ('BE' === TL_MODE) {
+      $GLOBALS['TL_CSS'][] = 'system/modules/Monitoring/assets/backend_svg.css';
+    }
     /**
      * Cron
      */
@@ Expand Down @@