Permalink
Browse files

issue #47: model changes for nomination rejection

  • Loading branch information...
1 parent 7352a29 commit 353f16566128bfec0e84f14a8dfd426a51d49ef8 @lmorchard committed Dec 24, 2012
@@ -31,8 +31,8 @@ def create_notice_types(app, created_models, verbosity, **kwargs):
_("someone has submitted a nomination for one of your badges")),
("nomination_approved", _("Nomination approved"),
_("a nomination you submitted for an award has been approved")),
- #("nomination_rejected", _("Nomination rejected"),
- # _("a nomination you submitted for an award has been rejected")),
+ ("nomination_rejected", _("Nomination rejected"),
+ _("a nomination you submitted for an award has been rejected")),
("nomination_received", _("Nomination received"),
_("a nomination to award you a badge was approved")),
("nomination_accepted", _("Nomination accepted"),
@@ -0,0 +1,145 @@
+# -*- 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 'Nomination.rejected_by'
+ db.add_column('badger_nomination', 'rejected_by',
+ self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='nomination_rejected_by', null=True, to=orm['auth.User']),
+ keep_default=False)
+
+ # Adding field 'Nomination.rejected_reason'
+ db.add_column('badger_nomination', 'rejected_reason',
+ self.gf('django.db.models.fields.TextField')(default='', blank=True),
+ keep_default=False)
+
+ def backwards(self, orm):
+ # Deleting field 'Nomination.rejected_by'
+ db.delete_column('badger_nomination', 'rejected_by_id')
+
+ # Deleting field 'Nomination.rejected_reason'
+ db.delete_column('badger_nomination', 'rejected_reason')
+
+ 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': '255'}),
+ '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'})
+ },
+ 'badger.award': {
+ 'Meta': {'ordering': "['-modified', '-created']", 'object_name': 'Award'},
+ 'badge': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['badger.Badge']"}),
+ 'claim_code': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '32', 'db_index': 'True', 'blank': 'True'}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'award_creator'", 'null': 'True', 'to': "orm['auth.User']"}),
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'hidden': ('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': '100', 'null': 'True', 'blank': 'True'}),
+ 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'award_user'", 'to': "orm['auth.User']"})
+ },
+ 'badger.badge': {
+ 'Meta': {'ordering': "['-modified', '-created']", 'unique_together': "(('title', 'slug'),)", 'object_name': 'Badge'},
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'creator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+ 'nominations_accepted': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'prerequisites': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['badger.Badge']", 'null': 'True', 'blank': 'True'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}),
+ 'title': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
+ 'unique': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+ },
+ 'badger.deferredaward': {
+ 'Meta': {'ordering': "['-modified', '-created']", 'object_name': 'DeferredAward'},
+ 'badge': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['badger.Badge']"}),
+ 'claim_code': ('django.db.models.fields.CharField', [], {'default': "'xamuuk'", 'unique': 'True', 'max_length': '32', 'db_index': 'True'}),
+ 'claim_group': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '32', 'null': 'True', 'blank': 'True'}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'creator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}),
+ 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'db_index': 'True', 'max_length': '75', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+ 'reusable': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+ },
+ 'badger.nomination': {
+ 'Meta': {'object_name': 'Nomination'},
+ 'accepted': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'nomination_approver'", 'null': 'True', 'to': "orm['auth.User']"}),
+ 'award': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['badger.Award']", 'null': 'True', 'blank': 'True'}),
+ 'badge': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['badger.Badge']"}),
+ 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'creator': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'nomination_creator'", 'null': 'True', 'to': "orm['auth.User']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+ 'nominee': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'nomination_nominee'", 'to': "orm['auth.User']"}),
+ 'rejected_by': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'nomination_rejected_by'", 'null': 'True', 'to': "orm['auth.User']"}),
+ 'rejected_reason': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+ },
+ 'badger.progress': {
+ 'Meta': {'unique_together': "(('badge', 'user'),)", 'object_name': 'Progress'},
+ 'badge': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['badger.Badge']"}),
+ 'counter': ('django.db.models.fields.FloatField', [], {'default': '0', 'null': 'True', 'blank': 'True'}),
+ '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'}),
+ 'notes': ('badger.models.JSONField', [], {'null': 'True', 'blank': 'True'}),
+ 'percent': ('django.db.models.fields.FloatField', [], {'default': '0'}),
+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'progress_user'", 'to': "orm['auth.User']"})
+ },
+ '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'})
+ },
+ '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']"})
+ }
+ }
+
+ complete_apps = ['badger']
View
@@ -61,6 +61,7 @@
from .signals import (badge_will_be_awarded, badge_was_awarded,
nomination_will_be_approved, nomination_was_approved,
nomination_will_be_accepted, nomination_was_accepted,
+ nomination_will_be_rejected, nomination_was_rejected,
user_will_be_nominated, user_was_nominated)
@@ -1052,6 +1053,10 @@ class NominationAcceptNotAllowedException(NominationException):
"""Attempt to accept a nomination was disallowed"""
+class NominationRejectNotAllowedException(NominationException):
+ """Attempt to reject a nomination was disallowed"""
+
+
class NominationManager(models.Manager):
pass
@@ -1068,6 +1073,9 @@ class Nomination(models.Model):
blank=True, null=True)
approver = models.ForeignKey(User, related_name="nomination_approver",
blank=True, null=True)
+ rejected_by = models.ForeignKey(User, related_name="nomination_rejected_by",
+ blank=True, null=True)
+ rejected_reason = models.TextField(blank=True)
award = models.ForeignKey(Award, null=True, blank=True)
created = models.DateTimeField(auto_now_add=True, blank=False)
modified = models.DateTimeField(auto_now=True, blank=False)
@@ -1096,15 +1104,8 @@ def save(self, *args, **kwargs):
user_will_be_nominated.send(sender=self.__class__,
nomination=self)
- if self.is_approved() and self.is_accepted():
- # HACK: Convert the original-flavor Award into a multiplayer Award
- # before assigning to self.
- real_award = self.badge.award_to(self.nominee, self.approver)
- award = Award()
- award.__dict__ = real_award.__dict__
- self.award = award
- # This was the original code, which caused errors:
- # self.award = self.badge.award_to(self.nominee, self.approver)
+ if self.is_approved and self.is_accepted:
+ self.award = self.badge.award_to(self.nominee, self.approver)
super(Nomination, self).save(*args, **kwargs)
@@ -1124,7 +1125,14 @@ def allows_detail_by(self, user):
return False
+ @property
+ def is_approved(self):
+ """Has this nomination been approved?"""
+ return self.approver is not None
+
def allows_approve_by(self, user):
+ if self.is_approved or self.is_rejected:
+ return False
if user.is_staff or user.is_superuser:
return True
if user == self.badge.creator:
@@ -1160,11 +1168,14 @@ def approve_by(self, approver):
return self
- def is_approved(self):
- """Has this nomination been approved?"""
- return self.approver is not None
+ @property
+ def is_accepted(self):
+ """Has this nomination been accepted?"""
+ return self.accepted
def allows_accept(self, user):
+ if self.is_accepted or self.is_rejected:
+ return False
if user.is_staff or user.is_superuser:
return True
if user == self.nominee:
@@ -1195,9 +1206,44 @@ def accept(self, user):
return self
- def is_accepted(self):
- """Has this nomination been accepted?"""
- return self.accepted
+ @property
+ def is_rejected(self):
+ """Has this nomination been rejected?"""
+ return self.rejected_by is not None
+
+ def allows_reject_by(self, user):
+ if self.is_approved or self.is_rejected:
+ return False
+ if user.is_staff or user.is_superuser:
+ return True
+ if user == self.nominee:
+ return True
+ if user == self.badge.creator:
+ return True
+ return False
+
+ def reject_by(self, user, reason=''):
+ if not self.allows_reject_by(user):
+ raise NominationRejectNotAllowedException()
+ self.rejected_by = user
+ self.rejected_reason = reason
+ nomination_will_be_rejected.send(sender=self.__class__,
+ nomination=self)
+ self.save()
+ nomination_was_rejected.send(sender=self.__class__,
+ nomination=self)
+
+ if notification:
+ if self.badge.creator:
+ notification.send([self.badge.creator], 'nomination_rejected',
+ dict(nomination=self,
+ protocol=DEFAULT_HTTP_PROTOCOL))
+ if self.creator:
+ notification.send([self.creator], 'nomination_rejected',
+ dict(nomination=self,
+ protocol=DEFAULT_HTTP_PROTOCOL))
+
+ return self
@receiver(user_logged_in)
View
@@ -15,3 +15,6 @@
nomination_will_be_accepted = Signal(providing_args=["nomination"])
nomination_was_accepted = Signal(providing_args=["nomination"])
+
+nomination_will_be_rejected = Signal(providing_args=["nomination"])
+nomination_was_rejected = Signal(providing_args=["nomination"])
Oops, something went wrong.

0 comments on commit 353f165

Please sign in to comment.