LoCo Team Portal

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

  1. 628817
  2. Merge into 0.2
Proposed by Daniel Holbach
Status: Merged
Merged at revision: 273
Proposed branch: lp:~dholbach/loco-team-portal/628817
Merge into: lp:loco-team-portal
Diff against target: 187 lines (+111/-67)
2 files modified
loco_directory/teams/migrations/0008_add_flickr_field.py (+111/-0)
loco_directory/teams/migrations/0008_flickr_account.py (+0/-67)
To merge this branch: bzr merge lp:~dholbach/loco-team-portal/628817
Reviewer Review Type Date Requested Status
Dave Walker Approve
Review via email: mp+34416@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Walker (davewalker) wrote :

The way the diff is laid out, makes it somewhat hard to follow. However, as it was "backing the old one out" - i tested from a perspective it wasn't there previously. The migration happens sucessfully, therefore +1. Awesome. \o/

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/0008_add_flickr_field.py'
2--- loco_directory/teams/migrations/0008_add_flickr_field.py 1970-01-01 00:00:00 +0000
3+++ loco_directory/teams/migrations/0008_add_flickr_field.py 2010-09-02 13:31:39 +0000
4@@ -0,0 +1,111 @@
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+ # Adding field 'Team.flickr_id'
14+ db.add_column('teams', 'flickr_id', orm['teams.team:flickr_id'])
15+
16+
17+ def backwards(self, orm):
18+ db.current_orm.models['teams'] = db.current_orm.models['teams.team']
19+ # Deleting field 'Team.flickr_id'
20+ db.delete_column('teams', 'flickr_id')
21+
22+
23+
24+ models = {
25+ 'auth.group': {
26+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
27+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
28+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'})
29+ },
30+ 'auth.permission': {
31+ 'Meta': {'unique_together': "(('content_type', 'codename'),)"},
32+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
33+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
34+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
35+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
36+ },
37+ 'auth.user': {
38+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
39+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
40+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
41+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}),
42+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
43+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
44+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
45+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
46+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
47+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
48+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
49+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}),
50+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
51+ },
52+ 'contenttypes.contenttype': {
53+ 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
54+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
55+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
56+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
57+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
58+ },
59+ 'teams.continent': {
60+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
61+ 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
62+ },
63+ 'teams.country': {
64+ 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
65+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
66+ 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
67+ },
68+ 'teams.language': {
69+ 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
70+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
71+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
72+ },
73+ 'teams.team': {
74+ 'Meta': {'db_table': "'teams'"},
75+ 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
76+ 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
77+ 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
78+ 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
79+ 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}),
80+ 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
81+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
82+ 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
83+ 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
84+ 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
85+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
86+ 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
87+ 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
88+ 'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
89+ 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
90+ 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
91+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
92+ 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
93+ 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
94+ 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
95+ 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
96+ 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
97+ },
98+ 'userprofiles.userprofile': {
99+ 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
100+ 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
101+ 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
102+ 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
103+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
104+ 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
105+ 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
106+ 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
107+ 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
108+ 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
109+ 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
110+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
111+ 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
112+ }
113+ }
114+
115+ complete_apps = ['teams']
116
117=== removed file 'loco_directory/teams/migrations/0008_flickr_account.py'
118--- loco_directory/teams/migrations/0008_flickr_account.py 2010-09-01 15:50:09 +0000
119+++ loco_directory/teams/migrations/0008_flickr_account.py 1970-01-01 00:00:00 +0000
120@@ -1,67 +0,0 @@
121-
122-from south.db import db
123-from django.db import models
124-from teams.models import *
125-
126-class Migration:
127-
128- def forwards(self, orm):
129-
130- # Adding field 'Team.flickr_id'
131- db.add_column('teams', 'flickr_id', orm['teams.team:flickr_id'])
132-
133-
134-
135- def backwards(self, orm):
136-
137- # Deleting field 'Team.flickr_id'
138- db.delete_column('teams', 'flickr_id')
139-
140-
141-
142- models = {
143- 'teams.continent': {
144- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
145- 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
146- },
147- 'teams.country': {
148- 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}),
149- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
150- 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
151- },
152- 'teams.language': {
153- 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
154- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
155- 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
156- },
157- 'teams.team': {
158- 'Meta': {'db_table': "'teams'"},
159- 'admins': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.TeamAdministrator']"}),
160- 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
161- 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
162- 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
163- 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}),
164- 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
165- 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
166- 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
167- 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
168- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
169- 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
170- 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}),
171- 'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}),
172- 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
173- 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
174- 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}),
175- 'owner': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'null': 'True', 'db_index': 'True'}),
176- 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}),
177- 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
178- 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
179- 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
180- },
181- 'teams.teamadministrator': {
182- 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
183- 'lpid': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'db_index': 'True'})
184- }
185- }
186-
187- complete_apps = ['teams']

Subscribers

People subscribed via source and target branches