From bc9327c85eb3fbc8f8a294e828df13002c757a3f Mon Sep 17 00:00:00 2001 From: Paul McLanahan Date: Mon, 14 May 2012 13:55:38 -0400 Subject: [PATCH] Add ability to customize inactive message per project. Fix bug 753210. --- ...uto__add_field_project_inactive_message.py | 119 ++++++++++++++++++ apps/projects/models.py | 6 + apps/projects/templates/projects/all.html | 2 +- apps/projects/templates/projects/show.html | 2 +- apps/projects/tests.py | 13 +- 5 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 apps/projects/migrations/0013_auto__add_field_project_inactive_message.py diff --git a/apps/projects/migrations/0013_auto__add_field_project_inactive_message.py b/apps/projects/migrations/0013_auto__add_field_project_inactive_message.py new file mode 100644 index 0000000..f732433 --- /dev/null +++ b/apps/projects/migrations/0013_auto__add_field_project_inactive_message.py @@ -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'] diff --git a/apps/projects/models.py b/apps/projects/models.py index 9d30bd9..8dc96dd 100644 --- a/apps/projects/models.py +++ b/apps/projects/models.py @@ -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): @@ -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) @@ -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) diff --git a/apps/projects/templates/projects/all.html b/apps/projects/templates/projects/all.html index 6d1dfd2..6e930f1 100644 --- a/apps/projects/templates/projects/all.html +++ b/apps/projects/templates/projects/all.html @@ -75,7 +75,7 @@

{{ _('Projects') }}

  • {{ project.name }}

    {% if project.inactive %} -

    {{ _('This project is considered inactive.') }}

    +

    {{ project.inactive_message_or_default }}

    {% endif %}

    {{ project.description|striptags }}

    diff --git a/apps/projects/templates/projects/show.html b/apps/projects/templates/projects/show.html index 99c30e6..3bdbc89 100644 --- a/apps/projects/templates/projects/show.html +++ b/apps/projects/templates/projects/show.html @@ -57,7 +57,7 @@

    {{ project.name }}

    {{ _('About') }} {{ project.name }}

    {% if project.inactive %} -

    {{ _('This project is considered inactive.') }}

    +

    {{ project.inactive_message_or_default }}

    {% endif %} {{ project.long_description|safe }}
    diff --git a/apps/projects/tests.py b/apps/projects/tests.py index 61a35a9..4ff8128 100644 --- a/apps/projects/tests.py +++ b/apps/projects/tests.py @@ -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 @@ -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