Panya.0.15.merge

.gitignore

@@ -1,6 +1,8 @@
 *.swp
 *.pyc
 *.egg-info
+.project
+.pydevproject
 project/
 ve/
 build/

AUTHORS.rst

@@ -7,4 +7,4 @@ Praekelt Foundation
 * Shaun Sephton
 * Jonathan Bydendyk
 * Euan Jonker
-
+* Max Naude

CHANGELOG.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+0.1.5.unomena.1
+-----
+#. Added GenericObjectFilterOrderList and GenericSearchForm views
+
+0.1.5.unomena
+-----
+#. Merged in unomena changes
+
 0.1.5
 -----
 #. Use photologue 2.6.praekelt

panya/admin.py

@@ -10,6 +10,8 @@
 from publisher.models import Publisher
 from photologue.admin import ImageOverrideInline
 
+from reversion.admin import VersionAdmin
+
 class ModelBaseAdmin(admin.ModelAdmin):
     inlines = [ImageOverrideInline,]
     list_display = ('title', 'state', 'admin_thumbnail', 'owner', 'created')
@@ -73,3 +75,52 @@ def save_model(self, request, obj, form, change):
             obj.owner = request.user
 
         return super(ModelBaseAdmin, self).save_model(request, obj, form, change)
+
+#==============================================================================
+class BaseAdmin(admin.ModelAdmin):
+
+    #--------------------------------------------------------------------------
+    def __init__(self, model, admin_site):
+        super(BaseAdmin, self).__init__(model, admin_site)
+
+        if not self.fieldsets:
+            self.fieldsets = tuple()
+
+#==============================================================================
+class PublisherModelAdmin(BaseAdmin, VersionAdmin):
+
+    publisher_fieldsets = (('Publishing', {'fields': ('state', 
+                                                      'publish_on', 
+                                                      'retract_on', 
+                                                      'sites', 
+                                                      ),
+                                           'classes': ('collapse',),
+                                           },
+                            ),
+                           )
+
+    #--------------------------------------------------------------------------
+    def __init__(self, model, admin_site):
+
+        super(PublisherModelAdmin, self).__init__(model, admin_site)
+        self.fieldsets += self.publisher_fieldsets
+
+#==============================================================================
+class ImageModelAdmin(BaseAdmin, VersionAdmin):
+
+    image_fieldsets = (('Images', {'fields': ('image', 
+                                              'crop_from', 
+                                              'effect', 
+                                              ),
+                                   'classes': ('collapse',),
+                                   },
+                            ),
+                           )
+
+    #--------------------------------------------------------------------------
+    def __init__(self, model, admin_site):
+
+        super(ImageModelAdmin, self).__init__(model, admin_site)
+        self.fieldsets += self.image_fieldsets
+
+