From c45457dc22e250354c641e3adfe0ad778d01de04 Mon Sep 17 00:00:00 2001 From: Giorgos Logiotatidis Date: Wed, 26 Mar 2014 17:02:30 +0200 Subject: [PATCH] [fix bug 984324] Rename event creation activity. --- remo/reports/__init__.py | 2 +- .../migrations/0009_continuous_reporting.py | 5 +- .../0010_rename_created_an_event.py | 210 ++++++++++++++++++ remo/reports/models.py | 2 +- remo/reports/tests/test_views.py | 3 +- 5 files changed, 218 insertions(+), 4 deletions(-) create mode 100644 remo/reports/migrations/0010_rename_created_an_event.py diff --git a/remo/reports/__init__.py b/remo/reports/__init__.py index 571a09b00..fab0c1965 100644 --- a/remo/reports/__init__.py +++ b/remo/reports/__init__.py @@ -1,5 +1,5 @@ ACTIVITY_EVENT_ATTEND = 'Attended an Event' -ACTIVITY_EVENT_CREATE = 'Created an Event' +ACTIVITY_EVENT_CREATE = 'Organized an Event' ACTIVITY_CAMPAIGN = 'Participated in a campaign' ACTIVITY_MONTH_PLANNING = 'Month planning' ACTIVITY_MONTH_RECAP = 'Month recap' diff --git a/remo/reports/migrations/0009_continuous_reporting.py b/remo/reports/migrations/0009_continuous_reporting.py index e0be35273..e479ef487 100644 --- a/remo/reports/migrations/0009_continuous_reporting.py +++ b/remo/reports/migrations/0009_continuous_reporting.py @@ -8,7 +8,10 @@ from django.db import models from remo.events.helpers import get_event_link -from remo.reports import ACTIVITY_EVENT_ATTEND, ACTIVITY_EVENT_CREATE + + +ACTIVITY_EVENT_ATTEND = 'Attended an Event' +ACTIVITY_EVENT_CREATE = 'Created an Event' class Migration(DataMigration): diff --git a/remo/reports/migrations/0010_rename_created_an_event.py b/remo/reports/migrations/0010_rename_created_an_event.py new file mode 100644 index 000000000..f0be35f1e --- /dev/null +++ b/remo/reports/migrations/0010_rename_created_an_event.py @@ -0,0 +1,210 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models + +class Migration(DataMigration): + + def forwards(self, orm): + activity = orm['reports.Activity'].objects.get(name='Created an Event') + activity.name = 'Organized an Event' + activity.save() + + def backwards(self, orm): + activity = orm['reports.Activity'].objects.get(name='Organized an Event') + activity.name = 'Created an Event' + activity.save() + + + 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'}) + }, + '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'}) + }, + 'events.attendance': { + 'Meta': {'object_name': 'Attendance'}, + 'date_subscribed': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.Event']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'events.event': { + 'Meta': {'ordering': "['start']", 'object_name': 'Event'}, + 'attendees': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'events_attended'", 'symmetrical': 'False', 'through': "orm['events.Attendance']", 'to': "orm['auth.User']"}), + 'budget_bug': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'event_budget_requests'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['remozilla.Bug']"}), + 'categories': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'events_categories'", 'symmetrical': 'False', 'to': "orm['profiles.FunctionalArea']"}), + 'city': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50'}), + 'converted_visitors': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '50'}), + 'description': ('django.db.models.fields.TextField', [], {}), + 'end': ('django.db.models.fields.DateTimeField', [], {}), + 'estimated_attendance': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'external_link': ('django.db.models.fields.URLField', [], {'max_length': '300', 'null': 'True', 'blank': 'True'}), + 'extra_content': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'goals': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'events_goals'", 'symmetrical': 'False', 'to': "orm['events.EventGoal']"}), + 'hashtag': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'lat': ('django.db.models.fields.FloatField', [], {}), + 'lon': ('django.db.models.fields.FloatField', [], {}), + 'mozilla_event': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'events_created'", 'to': "orm['auth.User']"}), + 'planning_pad_url': ('django.db.models.fields.URLField', [], {'max_length': '300', 'blank': 'True'}), + 'region': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '50', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'blank': 'True'}), + 'start': ('django.db.models.fields.DateTimeField', [], {}), + 'swag_bug': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'event_swag_requests'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['remozilla.Bug']"}), + 'times_edited': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'timezone': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'venue': ('django.db.models.fields.CharField', [], {'max_length': '150'}) + }, + 'events.eventgoal': { + 'Meta': {'ordering': "['name']", 'object_name': 'EventGoal'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '127'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '127', 'blank': 'True'}) + }, + 'profiles.functionalarea': { + 'Meta': {'ordering': "['name']", 'object_name': 'FunctionalArea'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '100', 'blank': 'True'}) + }, + 'remozilla.bug': { + 'Meta': {'ordering': "['-bug_last_change_time']", 'object_name': 'Bug'}, + 'assigned_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'bugs_assigned'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'bug_creation_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'bug_id': ('django.db.models.fields.PositiveIntegerField', [], {'unique': 'True'}), + 'bug_last_change_time': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'cc': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'bugs_cced'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'component': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'council_vote_requested': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'bugs_created'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'first_comment': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'resolution': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '30'}), + 'status': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '30'}), + 'summary': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '500'}), + 'updated_on': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'whiteboard': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '500'}) + }, + 'reports.activity': { + 'Meta': {'ordering': "['name']", 'object_name': 'Activity'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'reports.campaign': { + 'Meta': {'ordering': "['name']", 'object_name': 'Campaign'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'reports.ngreport': { + 'Meta': {'ordering': "['-report_date', '-created_on']", 'object_name': 'NGReport'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ng_reports'", 'to': "orm['reports.Activity']"}), + 'activity_description': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'campaign': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'ng_reports'", 'null': 'True', 'to': "orm['reports.Campaign']"}), + 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.Event']", 'null': 'True', 'blank': 'True'}), + 'functional_areas': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'ng_reports'", 'symmetrical': 'False', 'to': "orm['profiles.FunctionalArea']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_passive': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True'}), + 'link': ('django.db.models.fields.URLField', [], {'default': "''", 'max_length': '500', 'blank': 'True'}), + 'link_description': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '500', 'blank': 'True'}), + 'location': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '150', 'blank': 'True'}), + 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True'}), + 'mentor': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ng_reports_mentored'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'report_date': ('django.db.models.fields.DateField', [], {}), + 'updated_on': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ng_reports'", 'to': "orm['auth.User']"}) + }, + 'reports.ngreportcomment': { + 'Meta': {'ordering': "['id']", 'object_name': 'NGReportComment'}, + 'comment': ('django.db.models.fields.TextField', [], {}), + 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reports.NGReport']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'reports.report': { + 'Meta': {'ordering': "['-month']", 'unique_together': "(['user', 'month'],)", 'object_name': 'Report'}, + 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'empty': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'flags': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'future_items': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mentor': ('django.db.models.fields.related.ForeignKey', [], {'default': 'None', 'related_name': "'reports_mentored'", 'null': 'True', 'to': "orm['auth.User']"}), + 'month': ('django.db.models.fields.DateField', [], {}), + 'overdue': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'past_items': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'recruits_comments': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}), + 'updated_on': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'reports'", 'to': "orm['auth.User']"}) + }, + 'reports.reportcomment': { + 'Meta': {'ordering': "['id']", 'object_name': 'ReportComment'}, + 'comment': ('django.db.models.fields.TextField', [], {}), + 'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reports.Report']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}) + }, + 'reports.reportevent': { + 'Meta': {'object_name': 'ReportEvent'}, + 'description': ('django.db.models.fields.TextField', [], {'default': "''"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'link': ('django.db.models.fields.URLField', [], {'max_length': '500'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'participation_type': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), + 'report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reports.Report']"}) + }, + 'reports.reportlink': { + 'Meta': {'object_name': 'ReportLink'}, + 'description': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'link': ('django.db.models.fields.URLField', [], {'max_length': '200'}), + 'report': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['reports.Report']"}) + } + } + + complete_apps = ['reports'] + symmetrical = True diff --git a/remo/reports/models.py b/remo/reports/models.py index a4d4488e4..93b58fe07 100644 --- a/remo/reports/models.py +++ b/remo/reports/models.py @@ -320,7 +320,7 @@ def __unicode__(self): if self.activity.name == ACTIVITY_EVENT_ATTEND and self.event: return 'Attended event "%s"' % self.event.name elif self.activity.name == ACTIVITY_EVENT_CREATE and self.event: - return 'Created event "%s"' % self.event.name + return 'Organized event "%s"' % self.event.name elif self.activity.name == ACTIVITY_CAMPAIGN: return 'Participated in campaign "%s"' % self.campaign.name else: diff --git a/remo/reports/tests/test_views.py b/remo/reports/tests/test_views.py index b849aba44..55243a112 100644 --- a/remo/reports/tests/test_views.py +++ b/remo/reports/tests/test_views.py @@ -10,6 +10,7 @@ from remo.base.tests import RemoTestCase, requires_login, requires_permission from remo.profiles.tests import FunctionalAreaFactory, UserFactory +from remo.reports import ACTIVITY_EVENT_CREATE from remo.reports.models import NGReport, NGReportComment from remo.reports.tests import NGReportFactory, NGReportCommentFactory @@ -209,7 +210,7 @@ def test_post_a_comment_anonymous(self, redirect_mock, form_mock, redirect_mock.assert_called_with('main') def test_get_uneditable(self): - report = NGReportFactory.create(activity__name='Created an Event') + report = NGReportFactory.create(activity__name=ACTIVITY_EVENT_CREATE) response = self.get(url=report.get_absolute_url(), user=report.user) ok_(not response.context['editable'])