forked from mozilla/badges.mozilla.org
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue mozilla#108: Progress on team application approval process
- Loading branch information
Showing
14 changed files
with
307 additions
and
93 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
badgus/teams/migrations/0004_auto__add_field_badgeteamapplication_approver.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| # -*- coding: utf-8 -*- | ||
| from south.utils import datetime_utils as 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 'BadgeTeamApplication.approver' | ||
| db.add_column(u'teams_badgeteamapplication', 'approver', | ||
| self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='approved_badgeteam_applications', null=True, to=orm['auth.User']), | ||
| keep_default=False) | ||
|
|
||
|
|
||
| def backwards(self, orm): | ||
| # Deleting field 'BadgeTeamApplication.approver' | ||
| db.delete_column(u'teams_badgeteamapplication', 'approver_id') | ||
|
|
||
|
|
||
| models = { | ||
| u'auth.group': { | ||
| 'Meta': {'object_name': 'Group'}, | ||
| u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
| }, | ||
| u'auth.permission': { | ||
| 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, | ||
| 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
| 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
| }, | ||
| u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), | ||
| u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), | ||
| 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
| }, | ||
| u'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'}), | ||
| u'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'}) | ||
| }, | ||
| u'teams.badgeteam': { | ||
| 'Meta': {'object_name': 'BadgeTeam', '_ormbases': [u'teamwork.Team']}, | ||
| 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), | ||
| 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}), | ||
| u'team_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['teamwork.Team']", 'unique': 'True', 'primary_key': 'True'}) | ||
| }, | ||
| u'teams.badgeteamapplication': { | ||
| 'Meta': {'object_name': 'BadgeTeamApplication'}, | ||
| 'approver': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'approved_badgeteam_applications'", 'null': 'True', 'to': u"orm['auth.User']"}), | ||
| 'comment': ('django.db.models.fields.TextField', [], {}), | ||
| 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
| 'creator': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'submitted_badgeteam_applications'", 'null': 'True', 'to': u"orm['auth.User']"}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), | ||
| 'team': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'applications'", 'to': u"orm['teams.BadgeTeam']"}) | ||
| }, | ||
| u'teamwork.team': { | ||
| 'Meta': {'object_name': 'Team'}, | ||
| 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}), | ||
| 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
| 'founder': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']", 'null': 'True', 'blank': 'True'}), | ||
| u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
| 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), | ||
| 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}) | ||
| } | ||
| } | ||
|
|
||
| complete_apps = ['teams'] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 0 additions & 11 deletions
11
badgus/teams/templates/teams/includes/badgeteam_listitem.html
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import logging | ||
|
|
||
| from django.test import TestCase | ||
|
|
||
| from django.test.client import Client | ||
| from django.contrib.auth.models import User | ||
|
|
||
| from badgus.teams.models import BadgeTeam, BadgeTeamApplication | ||
|
|
||
|
|
||
| class BadgeTeamTestCase(TestCase): | ||
|
|
||
| def client_login(self, name='user'): | ||
| self.client.login(username=self.users[name].username, | ||
| password=self.users[name].username) | ||
|
|
||
| def setUp(self): | ||
| self.client = Client() | ||
|
|
||
| self.users = dict() | ||
| users_data = { | ||
| "founder": ("founder1", "founder1", "[email protected]"), | ||
| "user": ("user1", "user1", "[email protected]"), | ||
| "member": ("member1", "member1", "[email protected]") | ||
| } | ||
| for name, (username, password, email) in users_data.items(): | ||
| (user,created) = User.objects.get_or_create(username=username, email=email) | ||
| user.set_password(password) | ||
| user.save() | ||
| self.users[name] = user | ||
|
|
||
| self.team = BadgeTeam(name='randoteam1', founder=self.users['founder']) | ||
| self.team.save() | ||
| self.team_url = self.team.get_absolute_url() | ||
|
|
||
| self.role = self.team.role_set.get(name='leader') | ||
| self.role.users.add(self.users['member']) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.