Merge lp:~daker/loco-team-portal/fix.1100041 into lp:loco-team-portal

Proposed by Adnane Belmadiaf
Status: Merged
Approved by: Adnane Belmadiaf
Approved revision: 615
Merged at revision: 615
Proposed branch: lp:~daker/loco-team-portal/fix.1100041
Merge into: lp:loco-team-portal
Diff against target: 332 lines (+257/-17)
6 files modified
loco_directory/teams/forms.py (+0/-9)
loco_directory/teams/migrations/0015_auto__chg_field_team_name.py (+125/-0)
loco_directory/teams/migrations/0016_auto__chg_field_team_picasa_id.py (+125/-0)
loco_directory/teams/models.py (+1/-1)
loco_directory/teams/urls.py (+6/-6)
loco_directory/teams/views.py (+0/-1)
To merge this branch: bzr merge lp:~daker/loco-team-portal/fix.1100041
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+149425@code.launchpad.net

Commit message

Increased the picasa field length
Fixed the urls

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/teams/forms.py'
2--- loco_directory/teams/forms.py 2013-02-16 18:50:41 +0000
3+++ loco_directory/teams/forms.py 2013-02-19 22:38:24 +0000
4@@ -1,6 +1,5 @@
5 # -*- coding: utf-8 -*-
6 from django import forms
7-from django.conf import settings
8
9 from models import Team
10 from common.forms import RenderableMixin
11@@ -11,14 +10,6 @@
12 model = Team
13 exclude = ('approved_date', 'approved', 'expires_date', 'name', 'lp_name', 'admin_profiles', 'owner_profile', 'active', 'override_name', 'mugshot_url')
14
15- class Media:
16- css = {'all': (
17- settings.MEDIA_URL + 'css/colortip-1.0-jquery.css',
18- )}
19- js = (
20- settings.MEDIA_URL + 'js/colortip-1.0-jquery.js',
21- )
22-
23
24 class LoCoCouncilForm(UpdateTeamForm, RenderableMixin):
25 class Meta(UpdateTeamForm.Meta):
26
27=== added file 'loco_directory/teams/migrations/0015_auto__chg_field_team_name.py'
28--- loco_directory/teams/migrations/0015_auto__chg_field_team_name.py 1970-01-01 00:00:00 +0000
29+++ loco_directory/teams/migrations/0015_auto__chg_field_team_name.py 2013-02-19 22:38:24 +0000
30@@ -0,0 +1,125 @@
31+# encoding: utf-8
32+import datetime
33+from south.db import db
34+from south.v2 import SchemaMigration
35+from django.db import models
36+
37+class Migration(SchemaMigration):
38+
39+ def forwards(self, orm):
40+
41+ # Changing field 'Team.name'
42+ db.alter_column('teams', 'name', self.gf('django.db.models.fields.CharField')(max_length=80))
43+
44+
45+ def backwards(self, orm):
46+
47+ # Changing field 'Team.name'
48+ db.alter_column('teams', 'name', self.gf('django.db.models.fields.CharField')(max_length=80, null=True))
49+
50+
51+ models = {
52+ 'auth.group': {
53+ 'Meta': {'object_name': 'Group'},
54+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
55+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
56+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
57+ },
58+ 'auth.permission': {
59+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
60+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
61+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
62+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
63+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
64+ },
65+ 'auth.user': {
66+ 'Meta': {'object_name': 'User'},
67+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
68+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
69+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
70+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
71+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
72+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
73+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
74+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
75+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
76+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
77+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
78+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
79+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
80+ },
81+ 'contenttypes.contenttype': {
82+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
83+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
84+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
85+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
86+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
87+ },
88+ 'teams.continent': {
89+ 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
90+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
91+ 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
92+ },
93+ 'teams.country': {
94+ 'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
95+ 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
96+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
97+ 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
98+ },
99+ 'teams.language': {
100+ 'Meta': {'ordering': "('name',)", 'object_name': 'Language'},
101+ 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
102+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
103+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
104+ },
105+ 'teams.team': {
106+ 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
107+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
108+ 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
109+ 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
110+ 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
111+ 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
112+ 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
113+ 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
114+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
115+ 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
116+ 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
117+ 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
118+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
119+ 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
120+ 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
121+ 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
122+ 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
123+ 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
124+ 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
125+ 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}),
126+ 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
127+ 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
128+ 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
129+ 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
130+ 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
131+ 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
132+ 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
133+ 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
134+ 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
135+ },
136+ 'userprofiles.userprofile': {
137+ 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
138+ 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
139+ 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
140+ 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
141+ 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
142+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
143+ 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
144+ 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
145+ 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
146+ 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
147+ 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
148+ 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
149+ 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
150+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
151+ 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
152+ }
153+ }
154+
155+ complete_apps = ['teams']
156
157=== added file 'loco_directory/teams/migrations/0016_auto__chg_field_team_picasa_id.py'
158--- loco_directory/teams/migrations/0016_auto__chg_field_team_picasa_id.py 1970-01-01 00:00:00 +0000
159+++ loco_directory/teams/migrations/0016_auto__chg_field_team_picasa_id.py 2013-02-19 22:38:24 +0000
160@@ -0,0 +1,125 @@
161+# encoding: utf-8
162+import datetime
163+from south.db import db
164+from south.v2 import SchemaMigration
165+from django.db import models
166+
167+class Migration(SchemaMigration):
168+
169+ def forwards(self, orm):
170+
171+ # Changing field 'Team.picasa_id'
172+ db.alter_column('teams', 'picasa_id', self.gf('django.db.models.fields.CharField')(max_length=30, null=True))
173+
174+
175+ def backwards(self, orm):
176+
177+ # Changing field 'Team.picasa_id'
178+ db.alter_column('teams', 'picasa_id', self.gf('django.db.models.fields.CharField')(max_length=20, null=True))
179+
180+
181+ models = {
182+ 'auth.group': {
183+ 'Meta': {'object_name': 'Group'},
184+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
185+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
186+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
187+ },
188+ 'auth.permission': {
189+ 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
190+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
191+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
192+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
193+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
194+ },
195+ 'auth.user': {
196+ 'Meta': {'object_name': 'User'},
197+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
198+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
199+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
200+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
201+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
202+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
203+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
204+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
205+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
206+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
207+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
208+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
209+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
210+ },
211+ 'contenttypes.contenttype': {
212+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
213+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
214+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
215+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
216+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
217+ },
218+ 'teams.continent': {
219+ 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'},
220+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
221+ 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'})
222+ },
223+ 'teams.country': {
224+ 'Meta': {'ordering': "('name',)", 'object_name': 'Country'},
225+ 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}),
226+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
227+ 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'})
228+ },
229+ 'teams.language': {
230+ 'Meta': {'ordering': "('name',)", 'object_name': 'Language'},
231+ 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}),
232+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
233+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'})
234+ },
235+ 'teams.team': {
236+ 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"},
237+ 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
238+ 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
239+ 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
240+ 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
241+ 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
242+ 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}),
243+ 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}),
244+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
245+ 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
246+ 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
247+ 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
248+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
249+ 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
250+ 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}),
251+ 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}),
252+ 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
253+ 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
254+ 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
255+ 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}),
256+ 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}),
257+ 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}),
258+ 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
259+ 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
260+ 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
261+ 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
262+ 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
263+ 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
264+ 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
265+ },
266+ 'userprofiles.userprofile': {
267+ 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'},
268+ 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
269+ 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
270+ 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
271+ 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
272+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
273+ 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
274+ 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
275+ 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
276+ 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
277+ 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}),
278+ 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
279+ 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}),
280+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
281+ 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
282+ }
283+ }
284+
285+ complete_apps = ['teams']
286
287=== modified file 'loco_directory/teams/models.py'
288--- loco_directory/teams/models.py 2013-02-16 18:50:41 +0000
289+++ loco_directory/teams/models.py 2013-02-19 22:38:24 +0000
290@@ -116,7 +116,7 @@
291 languages = models.ManyToManyField(Language)
292 flickr_id = models.CharField(_("Flickr User/Group ID"), max_length=20, null=True, blank=True,
293 help_text=_("To get your Flickr user id go to http://idgettr.com. Ex. 47353004@N03"))
294- picasa_id = models.CharField(_("Picasa User ID"), max_length=20, null=True, blank=True,
295+ picasa_id = models.CharField(_("Picasa User ID"), max_length=30, null=True, blank=True,
296 help_text=_("Ex. toto@gmail.com, so your Picasa id is : toto"))
297 pixie_id = models.CharField(_("Pix.ie User ID"), max_length=20, null=True, blank=True,
298 help_text=_("Your Pix.ie Username"))
299
300=== modified file 'loco_directory/teams/urls.py'
301--- loco_directory/teams/urls.py 2013-02-16 18:50:41 +0000
302+++ loco_directory/teams/urls.py 2013-02-19 22:38:24 +0000
303@@ -2,13 +2,13 @@
304
305 urlpatterns = patterns('',
306 url(r'^$', 'teams.views.team_list', name='team-list'),
307- url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/edit$', 'teams.views.team_edit', name='team-edit'),
308+ url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/edit/$', 'teams.views.team_edit', name='team-edit'),
309 url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/merge/(?P<other_team_slug>[a-zA-Z0-9\-\.\+?]+)/$', 'teams.views.team_merge', name='team-merge'),
310 url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/merge', 'teams.views.select_other_team', name='select-other-team'),
311- url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/events/history', 'teams.views.team_event_history', name='team-event-history'),
312- url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/events', 'teams.views.team_event_list', name='team-event-list'),
313- url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/meetings/history', 'teams.views.team_meeting_history', name='team-meeting-history'),
314- url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/meetings', 'teams.views.team_meeting_list', name='team-meeting-list'),
315+ url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/events/history/$', 'teams.views.team_event_history', name='team-event-history'),
316+ url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/events/$', 'teams.views.team_event_list', name='team-event-list'),
317+ url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/meetings/history/$', 'teams.views.team_meeting_history', name='team-meeting-history'),
318+ url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/meetings/$', 'teams.views.team_meeting_list', name='team-meeting-list'),
319 url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical', 'teams.views.team_ical', name='team-calendar'),
320- url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)', 'teams.views.team_detail', name='team-detail'),
321+ url(r'(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/$', 'teams.views.team_detail', name='team-detail'),
322 )
323
324=== modified file 'loco_directory/teams/views.py'
325--- loco_directory/teams/views.py 2013-02-16 18:50:41 +0000
326+++ loco_directory/teams/views.py 2013-02-19 22:38:24 +0000
327@@ -304,7 +304,6 @@
328 return render_to_response('teams/team_update.html',
329 {'form': form,
330 'team': team_object,
331- 'user': request.user,
332 }, RequestContext(request))
333
334

Subscribers

People subscribed via source and target branches