Skip to content
This repository has been archived by the owner on Jan 8, 2019. It is now read-only.

Commit

Permalink
Add ability to customize inactive message per project. Fix bug 753210.
Browse files Browse the repository at this point in the history
  • Loading branch information
pmac committed May 14, 2012
1 parent 4c758e6 commit bc9327c
Show file tree
Hide file tree
Showing 5 changed files with 139 additions and 3 deletions.
@@ -0,0 +1,119 @@
# 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 'Project.inactive_message'
db.add_column('projects_project', 'inactive_message', self.gf('django.db.models.fields.CharField')(default='', max_length=255, blank=True), keep_default=False)


def backwards(self, orm):

# Deleting field 'Project.inactive_message'
db.delete_column('projects_project', 'inactive_message')


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', [], {'unique': 'True', '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'})
},
'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'})
},
'projects.link': {
'Meta': {'object_name': 'Link'},
'blog': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['projects.Project']"}),
'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
},
'projects.project': {
'Meta': {'object_name': 'Project'},
'description': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'featured_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
'followers': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'projects_following'", 'blank': 'True', 'to': "orm['users.Profile']"}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
'inactive': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'inactive_message': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'long_description': ('django.db.models.fields.TextField', [], {}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'owners': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "u'projects_owned'", 'symmetrical': 'False', 'to': "orm['users.Profile']"}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100', 'db_index': 'True'}),
'team_members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['users.Profile']", 'symmetrical': 'False', 'blank': 'True'}),
'topics': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['topics.Topic']", 'symmetrical': 'False'})
},
'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', 'db_index': 'True'})
},
'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']"})
},
'topics.topic': {
'Meta': {'object_name': 'Topic'},
'description': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'draft': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
'long_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100', 'db_index': 'True'})
},
'users.profile': {
'Meta': {'object_name': 'Profile'},
'avatar': ('django.db.models.fields.files.ImageField', [], {'max_length': '250', 'null': 'True', 'blank': 'True'}),
'bio': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'featured_image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
'website': ('django.db.models.fields.URLField', [], {'max_length': '255', 'blank': 'True'})
}
}

complete_apps = ['projects']
6 changes: 6 additions & 0 deletions apps/projects/models.py
Expand Up @@ -9,6 +9,7 @@
from users.models import Profile

BLEACH_FIELDS = ['long_description']
DEFAULT_INACTIVE_MESSAGE = _(u'This project is considered inactive.')


class ProjectQuerySet(models.query.QuerySet):
Expand Down Expand Up @@ -50,6 +51,7 @@ class Project(models.Model):
blank=True,
verbose_name=_(u'Followers'),
related_name=u'projects_following')
inactive_message = models.CharField(max_length=255, blank=True)

objects = ProjectManager()
tags = TaggableManager(blank=True)
Expand Down Expand Up @@ -79,6 +81,10 @@ def image_or_default(self):
def featured_image_or_default(self):
return self.featured_image or 'img/featured-default.gif'

@property
def inactive_message_or_default(self):
return self.inactive_message or DEFAULT_INACTIVE_MESSAGE

@property
def active_topics(self):
return self.topics.filter(draft=False)
Expand Down
2 changes: 1 addition & 1 deletion apps/projects/templates/projects/all.html
Expand Up @@ -75,7 +75,7 @@ <h1>{{ _('Projects') }}</h1>
<li class="project clearfix {{ project.active_topic_slugs }}">
<h3><a href="{{ url('projects_show', slug=project.slug) }}">{{ project.name }}</a></h3>
{% if project.inactive %}
<p class="inactive">{{ _('This project is considered inactive.') }}</p>
<p class="inactive">{{ project.inactive_message_or_default }}</p>
{% endif %}
<p>{{ project.description|striptags }}</p>
<div class="projectTopic">
Expand Down
2 changes: 1 addition & 1 deletion apps/projects/templates/projects/show.html
Expand Up @@ -57,7 +57,7 @@ <h1>{{ project.name }}</h1>
<div class="description span6 offset1">
<h2>{{ _('About') }} {{ project.name }}</h2>
{% if project.inactive %}
<p class="inactive">{{ _('This project is considered inactive.') }}</p>
<p class="inactive">{{ project.inactive_message_or_default }}</p>
{% endif %}
{{ project.long_description|safe }}
<section class="people">
Expand Down
13 changes: 12 additions & 1 deletion apps/projects/tests.py
Expand Up @@ -7,7 +7,7 @@

from commons.urlresolvers import reverse
from projects import cron
from projects.models import Project, Link
from projects.models import Project, Link, DEFAULT_INACTIVE_MESSAGE
from topics.models import Topic
from users.models import Profile

Expand Down Expand Up @@ -54,6 +54,17 @@ def setUp(self):
self.project.topics.add(self.topic)
self.project.owners.add(self.owner_profile)

def test_inactive_message(self):
self.project.inactive = True
self.project.save()
self.assertEqual(self.project.inactive_message_or_default,
DEFAULT_INACTIVE_MESSAGE)
new_msg = 'This is a way moar awesomer message'
self.project.inactive_message = new_msg
self.project.save()
self.assertEqual(self.project.inactive_message_or_default,
new_msg)

def test_can_delete_projects(self):
"""Regression test. Deletes were failing"""
# turns out the reason was that the foreign key to Project
Expand Down

0 comments on commit bc9327c

Please sign in to comment.