Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added field to ContentItem model #44

Merged
merged 3 commits into from Jan 10, 2012
Merged

Added field to ContentItem model #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5b24b3
implemented caching for contentitem usage display in admin sidebar
Jan 10, 2012
74cabcf
Merge branch 'master' of git://github.com/ridethepony/django-fiber
Jan 10, 2012
2b4f49b
fixed migrating numbering due to merge conflict
Jan 10, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
83 changes: 83 additions & 0 deletions fiber/migrations/0011_auto__add_field_contentitem_used_on_pages_data.py
View file
Open in desktop
@@ -0,0 +1,83 @@
# encoding: 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):

# Adding field 'ContentItem.used_on_pages_data'
db.add_column('fiber_contentitem', 'used_on_pages_data', self.gf('fiber.utils.json.JSONField')(null=True, blank=True), keep_default=False)


def backwards(self, orm):

# Deleting field 'ContentItem.used_on_pages_data'
db.delete_column('fiber_contentitem', 'used_on_pages_data')


models = {
'fiber.contentitem': {
'Meta': {'object_name': 'ContentItem'},
'content_html': ('fiber.utils.fields.FiberHTMLField', [], {}),
'content_markup': ('fiber.utils.fields.FiberMarkupField', [], {}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'metadata': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'protected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'template_name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'used_on_pages_data': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'})
},
'fiber.file': {
'Meta': {'ordering': "('file',)", 'object_name': 'File'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'file': ('django.db.models.fields.files.FileField', [], {'max_length': '255'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'})
},
'fiber.image': {
'Meta': {'ordering': "('image',)", 'object_name': 'Image'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '255'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
},
'fiber.page': {
'Meta': {'ordering': "('tree_id', 'lft')", 'object_name': 'Page'},
'content_items': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['fiber.ContentItem']", 'through': "orm['fiber.PageContentItem']", 'symmetrical': 'False'}),
'created': ('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'}),
'mark_current_regexes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'metadata': ('fiber.utils.json.JSONField', [], {'null': 'True', 'blank': 'True'}),
'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'subpages'", 'null': 'True', 'to': "orm['fiber.Page']"}),
'protected': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'redirect_page': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'redirected_pages'", 'null': 'True', 'to': "orm['fiber.Page']"}),
'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'show_in_menu': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'template_name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'url': ('fiber.utils.fields.FiberURLField', [], {'max_length': '255', 'blank': 'True'})
},
'fiber.pagecontentitem': {
'Meta': {'object_name': 'PageContentItem'},
'block_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'content_item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_content_items'", 'to': "orm['fiber.ContentItem']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'page_content_items'", 'to': "orm['fiber.Page']"}),
'sort': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
}
}

complete_apps = ['fiber']
19 changes: 15 additions & 4 deletions fiber/models.py
View file
Open in desktop
Expand Up @@ -26,6 +26,7 @@ class ContentItem(models.Model):
protected = models.BooleanField(_('protected'), default=False) protected = models.BooleanField(_('protected'), default=False)
metadata = JSONField(_('metadata'), blank=True, null=True, schema=METADATA_CONTENT_SCHEMA, prefill_from='fiber.models.ContentItem') metadata = JSONField(_('metadata'), blank=True, null=True, schema=METADATA_CONTENT_SCHEMA, prefill_from='fiber.models.ContentItem')
template_name = models.CharField(_('template name'), blank=True, max_length=70) template_name = models.CharField(_('template name'), blank=True, max_length=70)
used_on_pages_data = JSONField(_('used on pages'), blank=True, null=True)


objects = managers.ContentItemManager() objects = managers.ContentItemManager()


Expand All @@ -51,15 +52,21 @@ def get_change_url(self):
named_url = 'fiber_admin:%s_%s_change' % (self._meta.app_label, self._meta.object_name.lower()) named_url = 'fiber_admin:%s_%s_change' % (self._meta.app_label, self._meta.object_name.lower())
return reverse(named_url, args=(self.id, )) return reverse(named_url, args=(self.id, ))


def get_used_on_pages_json(self): def set_used_on_pages_json(self):
page_content_items = self.page_content_items.all()
json_pages = [] json_pages = []
for page_content_item in page_content_items: for page_content_item in self.page_content_items.all():
json_pages.append({ json_pages.append({
'title': page_content_item.page.title, 'title': page_content_item.page.title,
'url': page_content_item.page.get_absolute_url(), 'url': page_content_item.page.get_absolute_url(),
}) })
return simplejson.dumps(json_pages) self.used_on_pages_data = json_pages
self.save()

def get_used_on_pages_json(self):
if not self.used_on_pages_data:
self.set_used_on_pages_json()

return simplejson.dumps(self.used_on_pages_data)




class Page(MPTTModel): class Page(MPTTModel):
Expand Down Expand Up @@ -206,6 +213,10 @@ class PageContentItem(models.Model):


objects = managers.PageContentItemManager() objects = managers.PageContentItemManager()


def save(self, *args, **kwargs):
super(PageContentItem, self).save(*args, **kwargs)
self.content_item.set_used_on_pages_json()



class Image(models.Model): class Image(models.Model):
created = models.DateTimeField(_('created'), auto_now_add=True) created = models.DateTimeField(_('created'), auto_now_add=True)
Expand Down