Commits

Bertrand Bordage  committed 7de282d Draft

Purge SliderImage and SliderAlbum.

  • Participants
  • Parent commits 0a9f12d

Comments (0)

Files changed (4)

File cmsplugin_nivoslider/admin.py

-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @author: bcabezas@apsl.net
-
-""" Registro de las clases en el admin de django """
-
-from django.contrib import admin
-from .models import SliderImage, SliderAlbum
-
-
-class SliderImageAdmin(admin.ModelAdmin):
-    list_display = ('thumb', 'name', 'description', 'order')
-admin.site.register(SliderImage, SliderImageAdmin)
-
-
-class SliderAlbumAdmin(admin.ModelAdmin):
-    filter_horizontal = ('images',)
-
-
-admin.site.register(SliderAlbum, SliderAlbumAdmin)

File cmsplugin_nivoslider/cms_plugins.py

     admin_preview = False
 
     def render(self, context, instance, placeholder):
-        if instance.height and instance.width:
-            size = (instance.width, instance.height)
-        else:
-            size = None
         context.update({
             'object': instance,
             'placeholder': placeholder,
             'images': instance.images,
-            'size': size,
         })
         return context
 

File cmsplugin_nivoslider/migrations/0008_auto__del_sliderimage__del_slideralbum.py

+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting model 'SliderImage'
+        db.delete_table('cmsplugin_nivoslider_sliderimage')
+
+        # Deleting model 'SliderAlbum'
+        db.delete_table('cmsplugin_nivoslider_slideralbum')
+
+        # Removing M2M table for field images on 'SliderAlbum'
+        db.delete_table('cmsplugin_nivoslider_slideralbum_images')
+
+
+    def backwards(self, orm):
+        # Adding model 'SliderImage'
+        db.create_table('cmsplugin_nivoslider_sliderimage', (
+            ('description', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('image', self.gf('django.db.models.fields.files.ImageField')(max_length=100)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('order', self.gf('django.db.models.fields.PositiveIntegerField')(default=100)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=150, blank=True)),
+        ))
+        db.send_create_signal('cmsplugin_nivoslider', ['SliderImage'])
+
+        # Adding model 'SliderAlbum'
+        db.create_table('cmsplugin_nivoslider_slideralbum', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=150)),
+        ))
+        db.send_create_signal('cmsplugin_nivoslider', ['SliderAlbum'])
+
+        # Adding M2M table for field images on 'SliderAlbum'
+        db.create_table('cmsplugin_nivoslider_slideralbum_images', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('slideralbum', models.ForeignKey(orm['cmsplugin_nivoslider.slideralbum'], null=False)),
+            ('sliderimage', models.ForeignKey(orm['cmsplugin_nivoslider.sliderimage'], null=False))
+        ))
+        db.create_unique('cmsplugin_nivoslider_slideralbum_images', ['slideralbum_id', 'sliderimage_id'])
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'cms.cmsplugin': {
+            'Meta': {'object_name': 'CMSPlugin'},
+            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
+            'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
+            'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
+        },
+        'cms.placeholder': {
+            'Meta': {'object_name': 'Placeholder'},
+            'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
+        },
+        'cmsplugin_nivoslider.sliderplugin': {
+            'Meta': {'object_name': 'SliderPlugin', 'db_table': "'cmsplugin_sliderplugin'", '_ormbases': ['cms.CMSPlugin']},
+            'album': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['filer.Folder']"}),
+            'anim_speed': ('django.db.models.fields.PositiveIntegerField', [], {'default': '500'}),
+            'arrows': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
+            'effect': ('django.db.models.fields.CharField', [], {'default': "'random'", 'max_length': '50'}),
+            'height': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'manual_advance': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'pause_on_hover': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'pause_time': ('django.db.models.fields.PositiveIntegerField', [], {'default': '3000'}),
+            'random_start': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'theme': ('django.db.models.fields.CharField', [], {'default': "'default'", 'max_length': '50'}),
+            'thumbnails': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'width': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'filer.folder': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('parent', 'name'),)", 'object_name': 'Folder'},
+            'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+            'modified_at': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'owner': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'filer_owned_folders'", 'null': 'True', 'to': "orm['auth.User']"}),
+            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['filer.Folder']"}),
+            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+            'uploaded_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['cmsplugin_nivoslider']

File cmsplugin_nivoslider/models.py

 # -*- coding:utf-8 -*-
 # author: bcabezas@apsl.net
 
-from django.db.models import Model, BooleanField, PositiveIntegerField, \
-                             CharField, TextField, ImageField, ManyToManyField
+from django.db.models import BooleanField, PositiveIntegerField, \
+                             CharField
 
 from cms.models import CMSPlugin
 from filer.fields.folder import FilerFolderField
-from easy_thumbnails.files import get_thumbnailer
 from django.contrib.staticfiles.finders import find as staticfiles_find
 import os
 
 
-class SliderImage(Model):
-    """Image class that user django-filer"""
-    name = CharField(max_length=150, blank=True)
-    description = TextField(blank=True)
-    image = ImageField(upload_to="nivoslider")
-    order = PositiveIntegerField(default=100)
-
-    class Meta:
-        verbose_name = u'Image'
-        verbose_name_plural = u'Images'
-        ordering = ('order', 'name',)
-
-    def __unicode__(self):
-        if self.name:
-            name = self.name
-        else:
-            try:
-                name = self.image.file.name.split("/")[-1]
-            except:
-                name = unicode(self.image)
-        return name
-
-    def thumb(self):
-        thumbnail_options = dict(size=(92, 37), crop=True)
-        url = get_thumbnailer(self.image).get_thumbnail(thumbnail_options).url
-        return '<img src="%s">' % url
-    thumb.allow_tags = True
-    thumb.short_description = 'Image'
-
-
-class SliderAlbum(Model):
-    """Image gallery for slider"""
-    name = CharField(max_length=150)
-    images = ManyToManyField(SliderImage, blank=True)
-
-    class Meta:
-        verbose_name = u'Slider Album'
-        verbose_name_plural = u'Slider Albums'
-
-    def __unicode__(self):
-        return self.name
-
-
 EFFECTS = """
     sliceDown
     sliceDownLeft
     manual_advance = BooleanField()
     anim_speed = PositiveIntegerField(default=500,
                                       help_text="Animation Speed (ms)")
-    pause_time = PositiveIntegerField(default=3000, help_text="Pause time (ms)")
+    pause_time = PositiveIntegerField(default=3000,
+                                      help_text="Pause time (ms)")
     width = PositiveIntegerField(null=True, blank=True,
                                  help_text="Width of the plugin (px)")
     height = PositiveIntegerField(null=True, blank=True,