Code review

CHANGES.rst

@@ -6,7 +6,7 @@ There's a frood who really knows where his towel is.
 1.6b6 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
-- Select multiple CSS class in cover configuration.
+- Allow selection of multiple CSS classes in tile configuration.
   [rodfersou]
 
 - Provide alternative text for image fields in tiles (closes `#628 <https://github.com/collective/collective.cover/issues/628>`_).

setup.py

@@ -80,6 +80,7 @@
           'Products.CMFPlone >=4.3',
           'Products.GenericSetup',
           'setuptools',
+          'six',
           'z3c.caching',
           'z3c.form',
           'zope.browserpage',

src/collective/cover/browser/templates/layoutedit.pt

@@ -26,7 +26,7 @@
         <metal:styles fill-slot="style_slot">
             <link rel="stylesheet" type="text/css" media="screen" href=""
                   tal:define="navroot context/@@plone_portal_state/navigation_root_url"
-                  tal:attributes="href string:${navroot}/++resource++collective.cover/css/layout_edit.css" />
+                  tal:attributes="href string:${navroot}/++resource++collective.cover/css/layout_edit_201804251456.css" />
         </metal:styles>
         <metal:main fill-slot="main">
             <tal:block tal:define="can_export_layout view/can_export_layout">
@@ -50,9 +50,11 @@
                         </p>
                         <div id="slider"></div>
                     </div>
-                    <div id="class-chooser" title="Choose Class">
+                    <div id="class-chooser" title="Choose Class"
+                         i18n:attributes="title">
                         <input class="cssclasswidget" type="button" value="Select options ▼"
-                               tal:attributes="data-options view/css_classes" />
+                               tal:attributes="data-options view/css_classes"
+                               i18n:attributes="value" />
                         <input class="cssclasswidget-selected" type="hidden" value="" />
                     </div>
                 </div>

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

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

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

@@ -553,7 +553,7 @@
           var $widget = $('#class-chooser > .cssclasswidget');
           var $value = $('#class-chooser > .cssclasswidget-selected');
           $value.val($target.attr('data-css-class'));
-          var widget = new CSSClassWidget($widget, function(value) {
+          new CSSClassWidget($widget, function(value) {
             $target.attr('data-css-class', value);
           });
           $('#class-chooser').dialog("open");

src/collective/cover/testing.py

@@ -104,9 +104,9 @@ def generate_jpeg(width, height):
                 if abs(z) > 2.0:
                     break
                 z = z * z + c
-            r = i % 4 * 64  # noqa: S001
-            g = i % 8 * 32  # noqa: S001
-            b = i % 16 * 16  # noqa: S001
+            r = i % 4 * 64
+            g = i % 8 * 32
+            b = i % 16 * 16
             image.putpixel((x, y), b * 65536 + g * 256 + r)
 
     output = StringIO()

src/collective/cover/tests/test_upgrades.py

@@ -695,3 +695,14 @@ def test_register_resource(self):
         # run the upgrade step to validate the update
         self._do_upgrade_step(step)
         self.assertIn(JS, js_tool.getResourceIds())
+
+
+class Upgrade19to20TestCase(UpgradeTestCaseBase):
+
+    def setUp(self):
+        UpgradeTestCaseBase.setUp(self, u'19', u'20')
+
+    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/tiles/configuration_widgets/cssclasswidget.pt

@@ -7,7 +7,8 @@
      i18n:domain="collective.cover"
      tal:omit-tag="">
     <input class="cssclasswidget" type="button" value="Select options ▼"
-           tal:attributes="data-options view/options" />
+           tal:attributes="data-options view/options"
+           i18n:attributes="value" />
     <input class="cssclasswidget-selected" type="hidden"
            tal:attributes="id view/id;
                            name string:${view/name}:list;

src/collective/cover/tiles/configuration_widgets/cssclasswidget.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from interfaces import ICSSClassWidget
+from six import iteritems
 from z3c.form import interfaces
 from z3c.form.browser import widget
 from z3c.form.browser.select import SelectWidget
@@ -25,7 +26,7 @@ def options(self):
         items = [
             {
                 key: value
-                for key, value in item.iteritems()
+                for key, value in iteritems(item)
                 if key != 'id'
             }
             for item in self.items

src/collective/cover/upgrades/configure.zcml

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

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

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

src/collective/cover/upgrades/v20/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="19"
+      destination="20"
+      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>