Merge 38ef656 into 3fa9461

CHANGES.rst

@@ -6,7 +6,8 @@ There's a frood who really knows where his towel is.
 1.7b2 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
-- Nothing changed yet.
+- Fix multiple CSS class selection in tile configuration for tiles different from basic tile.
+  [rodfersou]
 
 
 1.7b1 (2018-04-27)

src/collective/cover/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>20</version>
+  <version>21</version>
   <dependencies>
     <dependency>profile-collective.js.galleria:default</dependency>
     <dependency>profile-collective.js.jqueryui:default</dependency>

src/collective/cover/static/js/layout_edit.js

@@ -604,7 +604,7 @@
             success: function(data) {
               $('#tile-configure').html(data);
               // Make sure CSS field is in first place
-              var css_id = 'formfield-collective-cover-basic-css_class';
+              var css_id = $('[id$=css_class]').attr('id');
               var first = $('#configure_tile div.field:first');
               if (first.attr('id') != css_id) {
                 $('#' + css_id).insertBefore(first);

src/collective/cover/tests/test_upgrades.py

@@ -706,3 +706,14 @@ def test_registrations(self):
         version = self.setup.getLastVersionForProfile(self.profile_id)[0]
         self.assertGreaterEqual(int(version), int(self.to_version))
         self.assertEqual(self._how_many_upgrades_to_do(), 1)
+
+
+class Upgrade20to21TestCase(UpgradeTestCaseBase):
+
+    def setUp(self):
+        UpgradeTestCaseBase.setUp(self, u'20', u'21')
+
+    def test_registrations(self):
+        version = self.setup.getLastVersionForProfile(self.profile_id)[0]
+        self.assertGreaterEqual(int(version), int(self.to_version))
+        self.assertEqual(self._how_many_upgrades_to_do(), 1)

src/collective/cover/upgrades/configure.zcml

@@ -10,5 +10,6 @@
   <include package=".v18" />
   <include package=".v19" />
   <include package=".v20" />
+  <include package=".v21" />
 
 </configure>

src/collective/cover/upgrades/v21/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

src/collective/cover/upgrades/v21/configure.zcml

@@ -0,0 +1,20 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:genericsetup="http://namespaces.zope.org/genericsetup"
+    xmlns:i18n="http://namespaces.zope.org/i18n"
+    i18n_domain="collective.cover">
+
+  <genericsetup:upgradeSteps
+      source="20"
+      destination="21"
+      profile="collective.cover:default">
+
+    <genericsetup:upgradeStep
+        title="Cook JS resources"
+        description="There were changes in the JS files, so we need to cook the resources."
+        handler="..cook_javascript_resources"
+        />
+
+  </genericsetup:upgradeSteps>
+
+</configure>