Permalink
Browse files

Merge branch 'master' of https://github.com/elpargo/cmsplugin-phlog

  • Loading branch information...
2 parents 213696f + 14ca361 commit ddaf9e2c10b74634cf0244f8f6504b7114c482a5 @elpargo committed Nov 30, 2011
Showing with 8 additions and 4 deletions.
  1. +1 −0 .gitignore
  2. +5 −0 HISTORY.rst
  3. +1 −3 cmsplugin_phlog/cms_plugins.py
  4. +1 −1 setup.py
View
@@ -1,2 +1,3 @@
/dist
+/build
/*.egg-info
View
@@ -1,3 +1,8 @@
+0.2.1 (2011/10/14)
+------------------
+
+* Fixed a bug with the rendered order of Phlog Galleries
+
0.2 (2011/08/04)
----------------
@@ -81,15 +81,13 @@ def render(self, context, instance, placeholder):
'gallery': instance})
context.update({
- 'plugins': render_plugins(instance.cmsplugin_set.filter(parent=instance),
+ 'plugins': render_plugins(instance.cmsplugin_set.filter(parent=instance).order_by('position'),
context, placeholder)
})
return context
def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None):
- print str(self.__dict__)
-
plugin = getattr(self, 'cms_plugin_instance', None)
if plugin:
View
@@ -4,7 +4,7 @@
-version = '0.2'
+version = '0.2.1'
setup(
name = 'cmsplugin-phlog',

0 comments on commit ddaf9e2

Please sign in to comment.