Permalink
Browse files

merged stuff from integration branch

  • Loading branch information...
2 parents 480935d + fc1180d commit 137bd5242190a087f81b1050e4b3fdbcef21d715 @stefanfoulis committed Nov 19, 2009
View
@@ -12,3 +12,4 @@ src/*.egg-info
.DS_Store
.project
.pydevproject
+.settings
@@ -39,7 +39,7 @@ def render(self, context, instance, placeholder):
})
return context
def icon_src(self, instance):
- return instance.image.file.extra_thumbnails['admin_tiny_icon']
+ return instance.image.thumbnails['admin_tiny_icon']
plugin_pool.register_plugin(ImagePlugin)
class ImageFilerTeaserPlugin(CMSPluginBase):
@@ -83,3 +83,4 @@ class Meta:
proxy = True
render_template = "image_filer/slideshow2.html"
plugin_pool.register_plugin(FolderSlideshowPlugin)
+
Oops, something went wrong.

0 comments on commit 137bd52

Please sign in to comment.