merged stuff from integration branch

stefanfoulis · Nov 19, 2009 · 137bd52 · 137bd52
2 parents 480935d + fc1180d
commit 137bd52
Show file tree

Hide file tree

Showing 11 changed files with 623 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ src/*.egg-info
 .DS_Store
 .project
 .pydevproject
+.settings
diff --git a/image_filer/cms_plugins.py b/image_filer/cms_plugins.py
@@ -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)
+