LoCo Team Portal

Merge lp:~dholbach/loco-team-portal/612521 into lp:loco-team-portal

  1. 612521
  2. Merge into 0.2
Proposed by Daniel Holbach
Status: Merged
Merged at revision: 274
Proposed branch: lp:~dholbach/loco-team-portal/612521
Merge into: lp:loco-team-portal
Prerequisite: lp:~dholbach/loco-team-portal/628817
Diff against target: 132 lines (+116/-1)
2 files modified
loco_directory/teams/migrations/0009_change_slug_field.py (+115/-0)
loco_directory/teams/models.py (+1/-1)
To merge this branch: bzr merge lp:~dholbach/loco-team-portal/612521
Reviewer Review Type Date Requested Status
Dave Walker Approve
Review via email: mp+34418@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

Awesome, 'ack. (LP: #612521)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'loco_directory/teams/migrations/0009_change_slug_field.py'
2--- loco_directory/teams/migrations/0009_change_slug_field.py 1970-01-01 00:00:00 +0000
3+++ loco_directory/teams/migrations/0009_change_slug_field.py 2010-09-02 13:37:02 +0000
4@@ -0,0 +1,115 @@
5+
6+from south.db import db
7+from django.db import models
8+from teams.models import *
9+
10+class Migration:
11+
12+ def forwards(self, orm):
13+ db.current_orm.models['teams'] = db.current_orm.models['teams.team']
14+ # Changing field 'Team.lp_name'
15+ # (to signature: django.db.models.fields.CharField(max_length=40, null=True))
16+ db.alter_column('teams', 'lp_name', orm['teams.team:lp_name'])
17+
18+
19+
20+ def backwards(self, orm):
21+ db.current_orm.models['teams'] = db.current_orm.models['teams.team']
22+ # Changing field 'Team.lp_name'
23+ # (to signature: django.db.models.fields.SlugField(max_length=40, null=True, db_index=True))
24+ db.alter_column('teams', 'lp_name', orm['teams.team:lp_name'])
25+
26+
27+
28+ models = {
29+ 'auth.group': {
30+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
31+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
32+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'})
33+ },
34+ 'auth.permission': {
35+ 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
36+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
37+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
38+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
39+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
40+ },
41+ 'auth.user': {
42+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
43+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
44+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
45+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}),
46+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
47+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
48+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
49+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
50+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
51+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
52+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
53+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}),
54+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
55+ },
56+ 'contenttypes.contenttype': {
57+ 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
58+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
59+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
60+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
61+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
62+ },
63+ 'teams.continent': {
64+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
65+ 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
66+ },
67+ 'teams.country': {
68+ 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
69+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
70+ 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
71+ },
72+ 'teams.language': {
73+ 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
74+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
75+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
76+ },
77+ 'teams.team': {
78+ 'Meta': {'db_table': "'teams'"},
79+ 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
80+ 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
81+ 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
82+ 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
83+ 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
84+ 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
85+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
86+ 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
87+ 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
88+ 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
89+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
90+ 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
91+ 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
92+ 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
93+ 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
94+ 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
95+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
96+ 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
97+ 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
98+ 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
99+ 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
100+ 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
101+ },
102+ 'userprofiles.userprofile': {
103+ 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
104+ 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
105+ 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
106+ 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
107+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
108+ 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
109+ 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
110+ 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
111+ 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
112+ 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
113+ 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
114+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
115+ 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
116+ }
117+ }
118+
119+ complete_apps = ['teams']
120
121=== modified file 'loco_directory/teams/models.py'
122--- loco_directory/teams/models.py 2010-09-01 15:50:09 +0000
123+++ loco_directory/teams/models.py 2010-09-02 13:37:02 +0000
124@@ -61,7 +61,7 @@
125 return len(flat_list(list_of_teams))>0
126
127 class Team(models.Model):
128- lp_name = models.SlugField(_("Launchpad Team ID"), max_length=40, null=True)
129+ lp_name = models.CharField(_("Launchpad Team ID"), max_length=40, null=True)
130 name = models.CharField(_("Team Name"), max_length=80, null=True)
131 countries = models.ManyToManyField(Country)
132 spr = models.CharField(_("State/Province/Region"), max_length=50, null=True, blank=True)

Subscribers

People subscribed via source and target branches