Merge branch 'master' of git://github.com/miohtama/imageportlet

miohtama · Oct 13, 2015 · 986233f · 986233f
2 parents def8fb2 + 8e43a92
commit 986233f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,10 +1,16 @@
 Changelog for imageportlet
 --------------------------
 
-1.1 (unreleased)
+1.2 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Updated static folder registration to conform Plone 4.3 / Grok 1.3
+
+
+1.1 (2013-05-04)
+----------------
+
+- Plone 4.3 compatibility / grok.CodeView issue [miohtama]
 
 
 1.0 (2012-11-15)

diff --git a/imageportlet/configure.zcml b/imageportlet/configure.zcml
@@ -15,6 +15,11 @@
 
   <five:registerPackage package="." initialize=".initialize" />
 
+   <browser:resourceDirectory
+        name="imageportlet"
+        directory="static"
+        />
+
   <grok:grok package="." />
 
   <i18n:registerTranslations directory="locales" />

diff --git a/imageportlet/portlets.py b/imageportlet/portlets.py
@@ -11,15 +11,12 @@
 
 from plone.directives import form
 from plone.app.portlets.portlets import base
-#from Products.TinyMCE.vocabularies import thumbnail_sizes_vocabulary
 
 from plone.namedfile.field import NamedImage
 from plone.namedfile.interfaces import IImageScaleTraversable
 
 import z3cformhelper  # XXX: Import from plone.app.portlets since Plone 4.3
 
-from plone.formwidget.namedfile.widget import NamedImageFieldWidget
-
 
 def _(x):
     """ Spoof gettext for now """

diff --git a/imageportlet/views.py b/imageportlet/views.py
@@ -33,7 +33,7 @@
 grok.layer(IAddonSpecific)
 
 
-class ImagePortletHelper(grok.CodeView):
+class ImagePortletHelper(grok.View):
     """
     Expose stuff downloadable from the image portlet BLOBs.
     """

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 long_desc = open("README.rst").read() + "\n" + open("CHANGES.txt").read()
 
-version = '1.1.dev0'
+version = '1.2.dev0'
 
 setup(name = "imageportlet",
     version = version,