Merge tag '2.0.4'

Hotfix release 2.0.4

- Disable the toggle command if the attribute is read only
- Hotfix correct dca, view check_inverse permanently

Author: stefanheimes

contao/dca/tl_metamodel_attribute.php

@@ -20,16 +20,16 @@
  * @author     Sven Baumann <baumann.sv@gmail.com>
  * @author     Ingolf Steinhardt <info@e-spin.de>
  * @copyright  2012-2018 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0
+ * @license    https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 
 $GLOBALS['TL_DCA']['tl_metamodel_attribute']['metapalettes']['checkbox extends _simpleattribute_'] = [
-    '+advanced' => ['check_publish', 'check_listview']
+    '+advanced' => ['check_publish', 'check_inverse', 'check_listview']
 ];
 
 $GLOBALS['TL_DCA']['tl_metamodel_attribute']['metasubpalettes'] = [
-    'check_listview' => ['check_inverse', 'check_listviewicon', 'check_listviewicondisabled']
+    'check_listview' => ['check_listviewicon', 'check_listviewicondisabled']
 ];
 
 $GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_publish'] = [
@@ -38,28 +38,28 @@
     'inputType' => 'checkbox',
     'sql'       => 'char(1) NOT NULL default \'\'',
     'eval'      => [
-        'tl_class' => 'w50'
+        'tl_class' => 'cbx w50'
     ],
 ];
 
-$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_listview'] = [
-    'label'     => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_listview'],
+$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_inverse'] = [
+    'label'     => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_inverse'],
     'exclude'   => true,
     'inputType' => 'checkbox',
     'sql'       => 'char(1) NOT NULL default \'\'',
     'eval'      => [
-        'tl_class'       => 'w50',
-        'submitOnChange' => true
+        'tl_class' => 'cbx w50'
     ],
 ];
 
-$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_inverse'] = [
-    'label'     => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_inverse'],
+$GLOBALS['TL_DCA']['tl_metamodel_attribute']['fields']['check_listview'] = [
+    'label'     => &$GLOBALS['TL_LANG']['tl_metamodel_attribute']['check_listview'],
     'exclude'   => true,
     'inputType' => 'checkbox',
     'sql'       => 'char(1) NOT NULL default \'\'',
     'eval'      => [
-        'tl_class' => 'w50 cbx'
+        'tl_class'       => 'clr cbx w50',
+        'submitOnChange' => true
     ],
 ];
 
@@ -73,7 +73,7 @@
         'files'      => true,
         'filesOnly'  => true,
         'extensions' => 'jpg,jpeg,gif,png,tif,tiff,svg',
-        'tl_class'   => 'clr'
+        'tl_class'   => 'clr w50'
     ]
 ];
 
@@ -87,6 +87,6 @@
         'files'      => true,
         'filesOnly'  => true,
         'extensions' => 'jpg,jpeg,gif,png,tif,tiff,svg',
-        'tl_class'   => 'clr'
+        'tl_class'   => 'w50'
     ]
 ];

contao/dca/tl_metamodel_dcasetting.php

@@ -14,12 +14,11 @@
  * @subpackage AttributeCheckbox
  * @author     Christian Schiffler <c.schiffler@cyberspectrum.de>
  * @author     Andreas Isaak <info@andreas-isaak.de>
- * @author     Carolina M. Koehn <office@kikmedia.de>
- * @author     David Maack <maack@men-at-work.de>
  * @author     Stefan Heimes <stefan_heimes@hotmail.com>
  * @author     Sven Baumann <baumann.sv@gmail.com>
+ * @author     Ingolf Steinhardt <info@e-spin.de>
  * @copyright  2012-2018 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0
+ * @license    https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 

contao/dca/tl_metamodel_filtersetting.php

@@ -14,12 +14,10 @@
  * @subpackage AttributeCheckbox
  * @author     Christian Schiffler <c.schiffler@cyberspectrum.de>
  * @author     Andreas Isaak <info@andreas-isaak.de>
- * @author     David Maack <maack@men-at-work.de>
- * @author     Stefan Heimes <stefan_heimes@hotmail.com>
  * @author     Ingolf Steinhardt <info@e-spin.de>
  * @author     Sven Baumann <baumann.sv@gmail.com>
  * @copyright  2012-2018 The MetaModels team.
- * @license    https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0
+ * @license    https://github.com/MetaModels/attribute_checkbox/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
  */
 

src/MetaModels/Events/Attribute/Checkbox/Listener.php

@@ -51,14 +51,15 @@ public function registerEventsInDispatcher()
     /**
      * Build a single toggle operation.
      *
-     * @param Checkbox $attribute The checkbox attribute.
+     * @param Checkbox $attribute    The checkbox attribute.
+     * @param array    $propertyData The property date from the input screen property.
      *
      * @return ToggleCommandInterface
      *
      * @SuppressWarnings(PHPMD.Superglobals)
      * @SuppressWarnings(PHPMD.CamelCaseVariableName)
      */
-    protected function buildCommand($attribute)
+    private function buildCommand($attribute, array $propertyData)
     {
         if ($attribute->get('check_listview') == 1) {
             $commandName = 'listviewtoggle_' . $attribute->getColName();
@@ -92,6 +93,10 @@ protected function buildCommand($attribute)
             $toggle->setInverse(true);
         }
 
+        if (!empty($propertyData['info']['eval']['readonly'])) {
+            $toggle->setDisabled(true);
+        }
+
         return $toggle;
     }
 
@@ -116,8 +121,9 @@ public function handle(BuildMetaModelOperationsEvent $event)
                 continue;
             }
 
-            $toggle    = $this->buildCommand($attribute);
-            $container = $event->getContainer();
+            $propertyData = $event->getInputScreen()->getProperty($attribute->getColName());
+            $toggle       = $this->buildCommand($attribute, $propertyData);
+            $container    = $event->getContainer();
 
             if ($container->hasDefinition(Contao2BackendViewDefinitionInterface::NAME)) {
                 $view = $container->getDefinition(Contao2BackendViewDefinitionInterface::NAME);