Skip to content
This repository has been archived by the owner on Dec 22, 2021. It is now read-only.

Commit

Permalink
Merge pull request #244 from ryanpitts/development
Browse files Browse the repository at this point in the history 
add cover_color field for Guides
  • Loading branch information
@ryanpitts
ryanpitts committed Feb 25, 2014
2 parents d5a85de + a1de0d7 commit 0fef88f
Show file tree
Hide file tree
Showing 4 changed files with 220 additions and 3 deletions.
2 changes: 1 addition & 1 deletion source/guides/admin.py
View file
Expand Up @@ -18,7 +18,7 @@ class GuideAdmin(AdminImageMixin, admin.ModelAdmin):
search_fields = ('title', 'summary', 'description',)
fieldsets = (
('', {'fields': (('pubdate', 'is_live', 'show_in_lists'), ('title', 'slug'), 'description', 'summary')}),
('', {'fields': ('image', 'image_caption', 'image_credit')}),
('', {'fields': ('cover_color', 'image', 'image_caption', 'image_credit')}),
)
inlines = [GuideArticleInline,]

Expand Down
207 changes: 207 additions & 0 deletions source/guides/migrations/0002_auto__add_field_guide_cover_color.py
View file
@@ -0,0 +1,207 @@
# -*- 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):
# Adding field 'Guide.cover_color'
db.add_column('guides_guide', 'cover_color',
self.gf('django.db.models.fields.CharField')(default='', max_length='32', blank=True),
keep_default=False)


def backwards(self, orm):
# Deleting field 'Guide.cover_color'
db.delete_column('guides_guide', 'cover_color')


models = {
'articles.article': {
'Meta': {'ordering': "('-pubdate', 'title')", 'object_name': 'Article'},
'allow_comments': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'article_type': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
'authors': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'article_authors'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['people.Person']"}),
'body': ('django.db.models.fields.TextField', [], {}),
'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['articles.Category']"}),
'code': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['code.Code']", 'null': 'True', 'blank': 'True'}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'disable_auto_linebreaks': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'image': ('sorl.thumbnail.fields.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
'image_caption': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'image_credit': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
'is_live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'organizations': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['people.Organization']", 'null': 'True', 'blank': 'True'}),
'people': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['people.Person']", 'null': 'True', 'blank': 'True'}),
'pubdate': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'show_in_lists': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}),
'subhead': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'summary': ('django.db.models.fields.TextField', [], {}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '128'})
},
'articles.category': {
'Meta': {'ordering': "('section', 'name')", 'object_name': 'Category'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
'section': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['articles.Section']"}),
'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'})
},
'articles.section': {
'Meta': {'ordering': "('name',)", 'object_name': 'Section'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'gets_promo_items': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}),
'special_template': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
},
'code.code': {
'Meta': {'ordering': "('slug',)", 'object_name': 'Code'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'organizations': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['people.Organization']", 'null': 'True', 'blank': 'True'}),
'people': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['people.Person']", 'null': 'True', 'blank': 'True'}),
'repo_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'repo_forks': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
'repo_last_push': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
'repo_master_branch': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
'repo_watchers': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
'screenshot': ('sorl.thumbnail.fields.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
'seeking_contributors': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}),
'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
},
'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'})
},
'guides.guide': {
'Meta': {'ordering': "('-pubdate', 'title')", 'object_name': 'Guide'},
'cover_color': ('django.db.models.fields.CharField', [], {'max_length': "'32'", 'blank': 'True'}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'image': ('sorl.thumbnail.fields.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
'image_caption': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'image_credit': ('django.db.models.fields.CharField', [], {'max_length': '128', 'blank': 'True'}),
'is_live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'pubdate': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'show_in_lists': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}),
'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'title': ('django.db.models.fields.CharField', [], {'max_length': '128'})
},
'guides.guidearticle': {
'Meta': {'ordering': "('guide', 'order')", 'object_name': 'GuideArticle'},
'article': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['articles.Article']"}),
'article_notes': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'guide': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['guides.Guide']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True', 'blank': 'True'})
},
'people.organization': {
'Meta': {'ordering': "('name',)", 'object_name': 'Organization'},
'address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'city': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
'country': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'github_gists_num': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
'github_repos_num': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
'github_username': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
'homepage': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'logo': ('sorl.thumbnail.fields.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
'show_in_lists': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}),
'state': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
'twitter_username': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'})
},
'people.person': {
'Meta': {'ordering': "('last_name', 'first_name')", 'object_name': 'Person'},
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'github_gists_num': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
'github_repos_num': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
'github_username': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_live': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'organizations': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['people.Organization']", 'null': 'True', 'blank': 'True'}),
'show_in_lists': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}),
'twitter_bio': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'twitter_profile_image_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}),
'twitter_username': ('django.db.models.fields.CharField', [], {'max_length': '32', 'blank': 'True'})
},
'taggit.tag': {
'Meta': {'object_name': 'Tag'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'})
},
'taggit.taggeditem': {
'Meta': {'object_name': 'TaggedItem'},
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_tagged_items'", 'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'object_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_items'", 'to': "orm['taggit.Tag']"})
},
'tags.concepttag': {
'Meta': {'object_name': 'ConceptTag'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'})
},
'tags.concepttaggeditem': {
'Meta': {'object_name': 'ConceptTaggedItem'},
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags_concepttaggeditem_tagged_items'", 'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'object_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags_concepttaggeditem_concepttag_items'", 'to': "orm['tags.ConceptTag']"})
},
'tags.technologytag': {
'Meta': {'object_name': 'TechnologyTag'},
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'})
},
'tags.technologytaggeditem': {
'Meta': {'object_name': 'TechnologyTaggedItem'},
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags_technologytaggeditem_tagged_items'", 'to': "orm['contenttypes.ContentType']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'object_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tags_technologytaggeditem_techtag_items'", 'to': "orm['tags.TechnologyTag']"})
}
}

complete_apps = ['guides']
8 changes: 7 additions & 1 deletion source/guides/models.py
View file
Expand Up @@ -29,9 +29,10 @@ class Guide(CachingMixin, models.Model):
image_credit = models.CharField(max_length=128, blank=True, help_text='Optional. Will be appended to end of caption in parens. Accepts HTML.')
description = models.TextField('Description', blank=True)
summary = models.TextField(blank=True, help_text='The two-sentence version of description, to be used on list pages.')
cover_color = models.CharField(max_length='32', blank=True, help_text='Hex code for background color of title card, e.g. `#256188`. Probably sampled from cover image.')
objects = models.Manager()
live_objects = LiveGuideManager()

class Meta:
ordering = ('-pubdate','title',)

Expand Down Expand Up @@ -80,6 +81,11 @@ def description_or_summary(self):
def get_live_article_set(self):
return self.guidearticle_set.filter(article__is_live=True, article__pubdate__lte=datetime.now)

def save(self, *args, **kwargs):
# clean up cover_color field, just in case
self.cover_color = self.cover_color.strip('#')
super(Organization, self).save(*args, **kwargs)


class GuideArticle(CachingMixin, models.Model):
created = models.DateTimeField(auto_now_add=True)
Expand Down
6 changes: 5 additions & 1 deletion source/guides/views.py
View file
Expand Up @@ -30,6 +30,10 @@ class GuideDetail(DetailView):
model = Guide

def get_queryset(self):
queryset = Guide.live_objects.prefetch_related('guidearticle_set')
if self.request.user.is_staff:
# allow preview for logged-in editors
queryset = Guide.objects.prefetch_related('guidearticle_set')
else:
queryset = Guide.live_objects.prefetch_related('guidearticle_set')

return queryset

0 comments on commit 0fef88f

Please sign in to comment.