Merge lp:~mboehn/lancms/lc2-django1.7 into lp:lancms
- lc2-django1.7
- Merge into lancms2
Proposed by
Mathias Bøhn Grytemark
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 106 | ||||
Proposed branch: | lp:~mboehn/lancms/lc2-django1.7 | ||||
Merge into: | lp:lancms | ||||
Diff against target: |
1525 lines (+94/-1296) 18 files modified
core/migrations/0001_initial.py (+79/-77) core/migrations/0002_auto__add_field_userprofile_phone.py (+0/-72) core/migrations/0003_auto__chg_field_userprofile_postalcode.py (+0/-70) core/migrations/0004_auto__add_organization.py (+0/-83) core/migrations/0005_events.py (+0/-83) core/migrations/0006_add_model_event.py (+0/-90) core/migrations/0007_auto__add_field_organization_is_active__chg_field_organization_owner.py (+0/-93) core/migrations/0008_auto__add_field_organization_urlslug.py (+0/-88) core/migrations/0009_auto__add_field_organization_externalurl.py (+0/-89) core/migrations/0010_auto__add_unique_organization_urlslug.py (+0/-87) core/migrations/0011_auto__add_field_event_is_active__add_field_event_urlslug__add_field_ev.py (+0/-108) core/migrations/0012_auto__add_field_event_startdate__add_field_event_enddate.py (+0/-102) core/migrations/0013_auto__del_field_event_startdate__del_field_event_enddate__add_field_ev.py (+0/-126) core/migrations/0014_auto__add_field_event_about.py (+0/-95) fabfile.py (+1/-1) lancms2/settings.py (+3/-21) requirements.txt (+10/-10) templates/base.html (+1/-1) |
||||
To merge this branch: | bzr merge lp:~mboehn/lancms/lc2-django1.7 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mathias Bøhn Grytemark | self-review | Approve | |
Review via email:
|
Commit message
Upgraded to Django 1.7.
Description of the change
Upgraded all requirements to support Django 1.7.
Tested basic features, including facebook-connect.
Upgraded to Django 1.7, and removed South.
To post a comment you must log in.
Revision history for this message
![](/+icing/build/overlay/assets/skins/sam/images/close.gif)
Mathias Bøhn Grytemark (mboehn) wrote : | # |
review:
Approve
(self-review)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'core/migrations/0001_initial.py' |
2 | --- core/migrations/0001_initial.py 2014-01-10 08:57:23 +0000 |
3 | +++ core/migrations/0001_initial.py 2015-01-03 18:47:57 +0000 |
4 | @@ -1,78 +1,80 @@ |
5 | # -*- coding: utf-8 -*- |
6 | -import datetime |
7 | -from south.db import db |
8 | -from south.v2 import SchemaMigration |
9 | -from django.db import models |
10 | - |
11 | - |
12 | -class Migration(SchemaMigration): |
13 | - |
14 | - def forwards(self, orm): |
15 | - # Adding model 'UserProfile' |
16 | - db.create_table(u'core_userprofile', ( |
17 | - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), |
18 | - ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)), |
19 | - ('date_of_birth', self.gf('django.db.models.fields.DateField')(null=True)), |
20 | - ('streetaddress', self.gf('django.db.models.fields.CharField')(max_length=255, null=True)), |
21 | - ('country', self.gf('django_countries.fields.CountryField')(max_length=2, null=True)), |
22 | - ('postalcode', self.gf('django.db.models.fields.IntegerField')(null=True)), |
23 | - ('gender', self.gf('django.db.models.fields.CharField')(max_length=6, null=True)), |
24 | - )) |
25 | - db.send_create_signal(u'core', ['UserProfile']) |
26 | - |
27 | - |
28 | - def backwards(self, orm): |
29 | - # Deleting model 'UserProfile' |
30 | - db.delete_table(u'core_userprofile') |
31 | - |
32 | - |
33 | - models = { |
34 | - u'auth.group': { |
35 | - 'Meta': {'object_name': 'Group'}, |
36 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
37 | - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
38 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) |
39 | - }, |
40 | - u'auth.permission': { |
41 | - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, |
42 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
43 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), |
44 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
45 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
46 | - }, |
47 | - u'auth.user': { |
48 | - 'Meta': {'object_name': 'User'}, |
49 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
50 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
51 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
52 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), |
53 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
54 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
55 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
56 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
57 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
58 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
59 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
60 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), |
61 | - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
62 | - }, |
63 | - u'contenttypes.contenttype': { |
64 | - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, |
65 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
66 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
67 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
68 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
69 | - }, |
70 | - u'core.userprofile': { |
71 | - 'Meta': {'object_name': 'UserProfile'}, |
72 | - 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'null': 'True'}), |
73 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
74 | - 'gender': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'}), |
75 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
76 | - 'postalcode': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), |
77 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), |
78 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}) |
79 | - } |
80 | - } |
81 | - |
82 | - complete_apps = ['core'] |
83 | \ No newline at end of file |
84 | +from __future__ import unicode_literals |
85 | + |
86 | +from django.db import models, migrations |
87 | +import django_countries.fields |
88 | +from django.conf import settings |
89 | + |
90 | + |
91 | +class Migration(migrations.Migration): |
92 | + |
93 | + dependencies = [ |
94 | + ('auth', '0001_initial'), |
95 | + migrations.swappable_dependency(settings.AUTH_USER_MODEL), |
96 | + ] |
97 | + |
98 | + operations = [ |
99 | + migrations.CreateModel( |
100 | + name='Event', |
101 | + fields=[ |
102 | + ('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')), |
103 | + ('name', models.CharField(verbose_name='Name', max_length=64)), |
104 | + ('about', models.TextField(verbose_name='About', null=True)), |
105 | + ('is_active', models.BooleanField(verbose_name='Activated', default=False)), |
106 | + ('urlslug', models.SlugField(verbose_name='URL-slug', unique=True)), |
107 | + ('externalurl', models.URLField(verbose_name='External website', null=True)), |
108 | + ('startdatetime', models.DateTimeField(verbose_name='Start time', help_text='YYYY-MM-DD HH:MM')), |
109 | + ('enddatetime', models.DateTimeField(verbose_name='End time', help_text='YYYY-MM-DD HH:MM')), |
110 | + ], |
111 | + options={ |
112 | + 'verbose_name': 'Event', |
113 | + 'verbose_name_plural': 'Events', |
114 | + }, |
115 | + bases=(models.Model,), |
116 | + ), |
117 | + migrations.CreateModel( |
118 | + name='Organization', |
119 | + fields=[ |
120 | + ('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')), |
121 | + ('name', models.CharField(verbose_name='Name', max_length=64)), |
122 | + ('about', models.TextField(verbose_name='About', null=True)), |
123 | + ('is_active', models.BooleanField(verbose_name='Activated', default=False)), |
124 | + ('urlslug', models.SlugField(verbose_name='URL-slug', unique=True)), |
125 | + ('externalurl', models.URLField(verbose_name='External website', null=True)), |
126 | + ('owner', models.ForeignKey(verbose_name='Owner', editable=False, to='auth.Group', null=True)), |
127 | + ], |
128 | + options={ |
129 | + 'verbose_name': 'Organization', |
130 | + 'verbose_name_plural': 'Organizations', |
131 | + }, |
132 | + bases=(models.Model,), |
133 | + ), |
134 | + migrations.CreateModel( |
135 | + name='UserProfile', |
136 | + fields=[ |
137 | + ('id', models.AutoField(serialize=False, primary_key=True, auto_created=True, verbose_name='ID')), |
138 | + ('date_of_birth', models.DateField(null=True)), |
139 | + ('streetaddress', models.CharField(max_length=255, null=True)), |
140 | + ('country', django_countries.fields.CountryField(max_length=2, null=True)), |
141 | + ('postalcode', models.PositiveSmallIntegerField(null=True)), |
142 | + ('gender', models.CharField(max_length=6, null=True, choices=[('female', 'Female'), ('male', 'Male')])), |
143 | + ('phone', models.CharField(max_length=20, null=True)), |
144 | + ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)), |
145 | + ], |
146 | + options={ |
147 | + }, |
148 | + bases=(models.Model,), |
149 | + ), |
150 | + migrations.AddField( |
151 | + model_name='event', |
152 | + name='organization', |
153 | + field=models.ForeignKey(verbose_name='Organization', editable=False, to='core.Organization'), |
154 | + preserve_default=True, |
155 | + ), |
156 | + migrations.AddField( |
157 | + model_name='event', |
158 | + name='owner', |
159 | + field=models.ForeignKey(verbose_name='Owner', editable=False, to='auth.Group'), |
160 | + preserve_default=True, |
161 | + ), |
162 | + ] |
163 | |
164 | === removed file 'core/migrations/0002_auto__add_field_userprofile_phone.py' |
165 | --- core/migrations/0002_auto__add_field_userprofile_phone.py 2014-01-10 09:45:19 +0000 |
166 | +++ core/migrations/0002_auto__add_field_userprofile_phone.py 1970-01-01 00:00:00 +0000 |
167 | @@ -1,72 +0,0 @@ |
168 | -# -*- coding: utf-8 -*- |
169 | -import datetime |
170 | -from south.db import db |
171 | -from south.v2 import SchemaMigration |
172 | -from django.db import models |
173 | - |
174 | - |
175 | -class Migration(SchemaMigration): |
176 | - |
177 | - def forwards(self, orm): |
178 | - # Adding field 'UserProfile.phone' |
179 | - db.add_column(u'core_userprofile', 'phone', |
180 | - self.gf('django.db.models.fields.CharField')(max_length=20, null=True), |
181 | - keep_default=False) |
182 | - |
183 | - |
184 | - def backwards(self, orm): |
185 | - # Deleting field 'UserProfile.phone' |
186 | - db.delete_column(u'core_userprofile', 'phone') |
187 | - |
188 | - |
189 | - models = { |
190 | - u'auth.group': { |
191 | - 'Meta': {'object_name': 'Group'}, |
192 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
193 | - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
194 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) |
195 | - }, |
196 | - u'auth.permission': { |
197 | - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, |
198 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
199 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), |
200 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
201 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
202 | - }, |
203 | - u'auth.user': { |
204 | - 'Meta': {'object_name': 'User'}, |
205 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
206 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
207 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
208 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), |
209 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
210 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
211 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
212 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
213 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
214 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
215 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
216 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), |
217 | - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
218 | - }, |
219 | - u'contenttypes.contenttype': { |
220 | - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, |
221 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
222 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
223 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
224 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
225 | - }, |
226 | - u'core.userprofile': { |
227 | - 'Meta': {'object_name': 'UserProfile'}, |
228 | - 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'null': 'True'}), |
229 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
230 | - 'gender': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'}), |
231 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
232 | - 'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), |
233 | - 'postalcode': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), |
234 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), |
235 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}) |
236 | - } |
237 | - } |
238 | - |
239 | - complete_apps = ['core'] |
240 | \ No newline at end of file |
241 | |
242 | === removed file 'core/migrations/0003_auto__chg_field_userprofile_postalcode.py' |
243 | --- core/migrations/0003_auto__chg_field_userprofile_postalcode.py 2014-01-10 18:17:27 +0000 |
244 | +++ core/migrations/0003_auto__chg_field_userprofile_postalcode.py 1970-01-01 00:00:00 +0000 |
245 | @@ -1,70 +0,0 @@ |
246 | -# -*- coding: utf-8 -*- |
247 | -import datetime |
248 | -from south.db import db |
249 | -from south.v2 import SchemaMigration |
250 | -from django.db import models |
251 | - |
252 | - |
253 | -class Migration(SchemaMigration): |
254 | - |
255 | - def forwards(self, orm): |
256 | - |
257 | - # Changing field 'UserProfile.postalcode' |
258 | - db.alter_column(u'core_userprofile', 'postalcode', self.gf('django.db.models.fields.PositiveSmallIntegerField')(null=True)) |
259 | - |
260 | - def backwards(self, orm): |
261 | - |
262 | - # Changing field 'UserProfile.postalcode' |
263 | - db.alter_column(u'core_userprofile', 'postalcode', self.gf('django.db.models.fields.IntegerField')(null=True)) |
264 | - |
265 | - models = { |
266 | - u'auth.group': { |
267 | - 'Meta': {'object_name': 'Group'}, |
268 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
269 | - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
270 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) |
271 | - }, |
272 | - u'auth.permission': { |
273 | - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, |
274 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
275 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), |
276 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
277 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
278 | - }, |
279 | - u'auth.user': { |
280 | - 'Meta': {'object_name': 'User'}, |
281 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
282 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
283 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
284 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), |
285 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
286 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
287 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
288 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
289 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
290 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
291 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
292 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), |
293 | - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
294 | - }, |
295 | - u'contenttypes.contenttype': { |
296 | - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, |
297 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
298 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
299 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
300 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
301 | - }, |
302 | - u'core.userprofile': { |
303 | - 'Meta': {'object_name': 'UserProfile'}, |
304 | - 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'null': 'True'}), |
305 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
306 | - 'gender': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'}), |
307 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
308 | - 'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), |
309 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
310 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), |
311 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}) |
312 | - } |
313 | - } |
314 | - |
315 | - complete_apps = ['core'] |
316 | \ No newline at end of file |
317 | |
318 | === removed file 'core/migrations/0004_auto__add_organization.py' |
319 | --- core/migrations/0004_auto__add_organization.py 2014-01-11 17:07:22 +0000 |
320 | +++ core/migrations/0004_auto__add_organization.py 1970-01-01 00:00:00 +0000 |
321 | @@ -1,83 +0,0 @@ |
322 | -# -*- coding: utf-8 -*- |
323 | -from south.utils import datetime_utils as datetime |
324 | -from south.db import db |
325 | -from south.v2 import SchemaMigration |
326 | -from django.db import models |
327 | - |
328 | - |
329 | -class Migration(SchemaMigration): |
330 | - |
331 | - def forwards(self, orm): |
332 | - # Adding model 'Organization' |
333 | - db.create_table(u'core_organization', ( |
334 | - (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), |
335 | - ('name', self.gf('django.db.models.fields.CharField')(max_length=64)), |
336 | - ('about', self.gf('django.db.models.fields.TextField')(null=True)), |
337 | - ('owner', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.Group'])), |
338 | - )) |
339 | - db.send_create_signal(u'core', ['Organization']) |
340 | - |
341 | - |
342 | - def backwards(self, orm): |
343 | - # Deleting model 'Organization' |
344 | - db.delete_table(u'core_organization') |
345 | - |
346 | - |
347 | - models = { |
348 | - u'auth.group': { |
349 | - 'Meta': {'object_name': 'Group'}, |
350 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
351 | - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
352 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) |
353 | - }, |
354 | - u'auth.permission': { |
355 | - 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, |
356 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
357 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), |
358 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
359 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
360 | - }, |
361 | - u'auth.user': { |
362 | - 'Meta': {'object_name': 'User'}, |
363 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
364 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
365 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
366 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), |
367 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
368 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
369 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
370 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
371 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
372 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
373 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
374 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), |
375 | - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
376 | - }, |
377 | - u'contenttypes.contenttype': { |
378 | - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, |
379 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
380 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
381 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
382 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
383 | - }, |
384 | - u'core.organization': { |
385 | - 'Meta': {'object_name': 'Organization'}, |
386 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
387 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
388 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
389 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.Group']"}) |
390 | - }, |
391 | - u'core.userprofile': { |
392 | - 'Meta': {'object_name': 'UserProfile'}, |
393 | - 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'null': 'True'}), |
394 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
395 | - 'gender': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'}), |
396 | - u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
397 | - 'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), |
398 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
399 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), |
400 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}) |
401 | - } |
402 | - } |
403 | - |
404 | - complete_apps = ['core'] |
405 | \ No newline at end of file |
406 | |
407 | === removed file 'core/migrations/0005_events.py' |
408 | --- core/migrations/0005_events.py 2014-01-12 13:25:35 +0000 |
409 | +++ core/migrations/0005_events.py 1970-01-01 00:00:00 +0000 |
410 | @@ -1,83 +0,0 @@ |
411 | -# -*- coding: utf-8 -*- |
412 | -from south.utils import datetime_utils as datetime |
413 | -from south.db import db |
414 | -from south.v2 import DataMigration |
415 | -from django.db import models |
416 | - |
417 | -class Migration(DataMigration): |
418 | - |
419 | - def forwards(self, orm): |
420 | - "Write your forwards methods here." |
421 | - # Note: Don't use "from appname.models import ModelName". |
422 | - # Use orm.ModelName to refer to models in this application, |
423 | - # and orm['appname.ModelName'] for models in other applications. |
424 | - |
425 | - def backwards(self, orm): |
426 | - "Write your backwards methods here." |
427 | - |
428 | - models = { |
429 | - 'auth.group': { |
430 | - 'Meta': {'object_name': 'Group'}, |
431 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
432 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), |
433 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'blank': 'True', 'to': "orm['auth.Permission']"}) |
434 | - }, |
435 | - 'auth.permission': { |
436 | - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, |
437 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
438 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
439 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
440 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
441 | - }, |
442 | - 'auth.user': { |
443 | - 'Meta': {'object_name': 'User'}, |
444 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
445 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
446 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
447 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'symmetrical': 'False', 'to': "orm['auth.Group']", 'related_name': "'user_set'"}), |
448 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
449 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
450 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
451 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
452 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
453 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
454 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
455 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'symmetrical': 'False', 'to': "orm['auth.Permission']", 'related_name': "'user_set'"}), |
456 | - 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) |
457 | - }, |
458 | - 'contenttypes.contenttype': { |
459 | - 'Meta': {'db_table': "'django_content_type'", 'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType'}, |
460 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
461 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
462 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
463 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
464 | - }, |
465 | - 'core.event': { |
466 | - 'Meta': {'object_name': 'Event'}, |
467 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
468 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
469 | - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Organization']"}), |
470 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}) |
471 | - }, |
472 | - 'core.organization': { |
473 | - 'Meta': {'object_name': 'Organization'}, |
474 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
475 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
476 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
477 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}) |
478 | - }, |
479 | - 'core.userprofile': { |
480 | - 'Meta': {'object_name': 'UserProfile'}, |
481 | - 'country': ('django_countries.fields.CountryField', [], {'null': 'True', 'max_length': '2'}), |
482 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
483 | - 'gender': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '6'}), |
484 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
485 | - 'phone': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '20'}), |
486 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
487 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '255'}), |
488 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'unique': 'True', 'to': "orm['auth.User']"}) |
489 | - } |
490 | - } |
491 | - |
492 | - complete_apps = ['core'] |
493 | - symmetrical = True |
494 | |
495 | === removed file 'core/migrations/0006_add_model_event.py' |
496 | --- core/migrations/0006_add_model_event.py 2014-01-12 13:25:35 +0000 |
497 | +++ core/migrations/0006_add_model_event.py 1970-01-01 00:00:00 +0000 |
498 | @@ -1,90 +0,0 @@ |
499 | -# -*- coding: utf-8 -*- |
500 | -from south.utils import datetime_utils as datetime |
501 | -from south.db import db |
502 | -from south.v2 import SchemaMigration |
503 | -from django.db import models |
504 | - |
505 | - |
506 | -class Migration(SchemaMigration): |
507 | - |
508 | - def forwards(self, orm): |
509 | - # Adding model 'Event' |
510 | - db.create_table('core_event', ( |
511 | - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), |
512 | - ('organization', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.Organization'])), |
513 | - ('name', self.gf('django.db.models.fields.CharField')(max_length=64)), |
514 | - ('owner', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.Group'])), |
515 | - )) |
516 | - db.send_create_signal('core', ['Event']) |
517 | - |
518 | - |
519 | - def backwards(self, orm): |
520 | - # Deleting model 'Event' |
521 | - db.delete_table('core_event') |
522 | - |
523 | - |
524 | - models = { |
525 | - 'auth.group': { |
526 | - 'Meta': {'object_name': 'Group'}, |
527 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
528 | - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
529 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Permission']", 'blank': 'True'}) |
530 | - }, |
531 | - 'auth.permission': { |
532 | - 'Meta': {'object_name': 'Permission', 'unique_together': "(('content_type', 'codename'),)", 'ordering': "('content_type__app_label', 'content_type__model', 'codename')"}, |
533 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
534 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
535 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
536 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
537 | - }, |
538 | - 'auth.user': { |
539 | - 'Meta': {'object_name': 'User'}, |
540 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
541 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
542 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
543 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'user_set'", 'symmetrical': 'False', 'to': "orm['auth.Group']", 'blank': 'True'}), |
544 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
545 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
546 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
547 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
548 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
549 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
550 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
551 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'user_set'", 'symmetrical': 'False', 'to': "orm['auth.Permission']", 'blank': 'True'}), |
552 | - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
553 | - }, |
554 | - 'contenttypes.contenttype': { |
555 | - 'Meta': {'db_table': "'django_content_type'", 'object_name': 'ContentType', 'unique_together': "(('app_label', 'model'),)", 'ordering': "('name',)"}, |
556 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
557 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
558 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
559 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
560 | - }, |
561 | - 'core.event': { |
562 | - 'Meta': {'object_name': 'Event'}, |
563 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
564 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
565 | - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Organization']"}), |
566 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}) |
567 | - }, |
568 | - 'core.organization': { |
569 | - 'Meta': {'object_name': 'Organization'}, |
570 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
571 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
572 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
573 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}) |
574 | - }, |
575 | - 'core.userprofile': { |
576 | - 'Meta': {'object_name': 'UserProfile'}, |
577 | - 'country': ('django_countries.fields.CountryField', [], {'null': 'True', 'max_length': '2'}), |
578 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
579 | - 'gender': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '6'}), |
580 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
581 | - 'phone': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '20'}), |
582 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
583 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '255'}), |
584 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'unique': 'True', 'to': "orm['auth.User']"}) |
585 | - } |
586 | - } |
587 | - |
588 | - complete_apps = ['core'] |
589 | \ No newline at end of file |
590 | |
591 | === removed file 'core/migrations/0007_auto__add_field_organization_is_active__chg_field_organization_owner.py' |
592 | --- core/migrations/0007_auto__add_field_organization_is_active__chg_field_organization_owner.py 2014-01-17 21:05:26 +0000 |
593 | +++ core/migrations/0007_auto__add_field_organization_is_active__chg_field_organization_owner.py 1970-01-01 00:00:00 +0000 |
594 | @@ -1,93 +0,0 @@ |
595 | -# -*- coding: utf-8 -*- |
596 | -from south.utils import datetime_utils as datetime |
597 | -from south.db import db |
598 | -from south.v2 import SchemaMigration |
599 | -from django.db import models |
600 | - |
601 | - |
602 | -class Migration(SchemaMigration): |
603 | - |
604 | - def forwards(self, orm): |
605 | - # Adding field 'Organization.is_active' |
606 | - db.add_column('core_organization', 'is_active', |
607 | - self.gf('django.db.models.fields.BooleanField')(default=False), |
608 | - keep_default=False) |
609 | - |
610 | - |
611 | - # Changing field 'Organization.owner' |
612 | - db.alter_column('core_organization', 'owner_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['auth.Group'])) |
613 | - |
614 | - def backwards(self, orm): |
615 | - # Deleting field 'Organization.is_active' |
616 | - db.delete_column('core_organization', 'is_active') |
617 | - |
618 | - |
619 | - # Changing field 'Organization.owner' |
620 | - db.alter_column('core_organization', 'owner_id', self.gf('django.db.models.fields.related.ForeignKey')(default=False, to=orm['auth.Group'])) |
621 | - |
622 | - models = { |
623 | - 'auth.group': { |
624 | - 'Meta': {'object_name': 'Group'}, |
625 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
626 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), |
627 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) |
628 | - }, |
629 | - 'auth.permission': { |
630 | - 'Meta': {'object_name': 'Permission', 'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)"}, |
631 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
632 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
633 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
634 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
635 | - }, |
636 | - 'auth.user': { |
637 | - 'Meta': {'object_name': 'User'}, |
638 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
639 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
640 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
641 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True'}), |
642 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
643 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
644 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
645 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
646 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
647 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
648 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
649 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'related_name': "'user_set'", 'blank': 'True'}), |
650 | - 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) |
651 | - }, |
652 | - 'contenttypes.contenttype': { |
653 | - 'Meta': {'object_name': 'ContentType', 'db_table': "'django_content_type'", 'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)"}, |
654 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
655 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
656 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
657 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
658 | - }, |
659 | - 'core.event': { |
660 | - 'Meta': {'object_name': 'Event'}, |
661 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
662 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
663 | - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Organization']"}), |
664 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}) |
665 | - }, |
666 | - 'core.organization': { |
667 | - 'Meta': {'object_name': 'Organization'}, |
668 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
669 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
670 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
671 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
672 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'null': 'True', 'to': "orm['auth.Group']"}) |
673 | - }, |
674 | - 'core.userprofile': { |
675 | - 'Meta': {'object_name': 'UserProfile'}, |
676 | - 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'null': 'True'}), |
677 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
678 | - 'gender': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'}), |
679 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
680 | - 'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), |
681 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
682 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), |
683 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'unique': 'True', 'to': "orm['auth.User']"}) |
684 | - } |
685 | - } |
686 | - |
687 | - complete_apps = ['core'] |
688 | \ No newline at end of file |
689 | |
690 | === removed file 'core/migrations/0008_auto__add_field_organization_urlslug.py' |
691 | --- core/migrations/0008_auto__add_field_organization_urlslug.py 2014-01-17 21:06:47 +0000 |
692 | +++ core/migrations/0008_auto__add_field_organization_urlslug.py 1970-01-01 00:00:00 +0000 |
693 | @@ -1,88 +0,0 @@ |
694 | -# -*- coding: utf-8 -*- |
695 | -from south.utils import datetime_utils as datetime |
696 | -from south.db import db |
697 | -from south.v2 import SchemaMigration |
698 | -from django.db import models |
699 | - |
700 | - |
701 | -class Migration(SchemaMigration): |
702 | - |
703 | - def forwards(self, orm): |
704 | - # Adding field 'Organization.urlslug' |
705 | - db.add_column('core_organization', 'urlslug', |
706 | - self.gf('django.db.models.fields.SlugField')(max_length=50, default='nuxis'), |
707 | - keep_default=False) |
708 | - |
709 | - |
710 | - def backwards(self, orm): |
711 | - # Deleting field 'Organization.urlslug' |
712 | - db.delete_column('core_organization', 'urlslug') |
713 | - |
714 | - |
715 | - models = { |
716 | - 'auth.group': { |
717 | - 'Meta': {'object_name': 'Group'}, |
718 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
719 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), |
720 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'symmetrical': 'False', 'to': "orm['auth.Permission']"}) |
721 | - }, |
722 | - 'auth.permission': { |
723 | - 'Meta': {'object_name': 'Permission', 'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)"}, |
724 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
725 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
726 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
727 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
728 | - }, |
729 | - 'auth.user': { |
730 | - 'Meta': {'object_name': 'User'}, |
731 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
732 | - 'email': ('django.db.models.fields.EmailField', [], {'blank': 'True', 'max_length': '75'}), |
733 | - 'first_name': ('django.db.models.fields.CharField', [], {'blank': 'True', 'max_length': '30'}), |
734 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'blank': 'True', 'to': "orm['auth.Group']", 'related_name': "'user_set'"}), |
735 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
736 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
737 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
738 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
739 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
740 | - 'last_name': ('django.db.models.fields.CharField', [], {'blank': 'True', 'max_length': '30'}), |
741 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
742 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'blank': 'True', 'to': "orm['auth.Permission']", 'related_name': "'user_set'"}), |
743 | - 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) |
744 | - }, |
745 | - 'contenttypes.contenttype': { |
746 | - 'Meta': {'object_name': 'ContentType', 'db_table': "'django_content_type'", 'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)"}, |
747 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
748 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
749 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
750 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
751 | - }, |
752 | - 'core.event': { |
753 | - 'Meta': {'object_name': 'Event'}, |
754 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
755 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
756 | - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Organization']"}), |
757 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}) |
758 | - }, |
759 | - 'core.organization': { |
760 | - 'Meta': {'object_name': 'Organization'}, |
761 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
762 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
763 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
764 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
765 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'null': 'True', 'to': "orm['auth.Group']"}), |
766 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) |
767 | - }, |
768 | - 'core.userprofile': { |
769 | - 'Meta': {'object_name': 'UserProfile'}, |
770 | - 'country': ('django_countries.fields.CountryField', [], {'null': 'True', 'max_length': '2'}), |
771 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
772 | - 'gender': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '6'}), |
773 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
774 | - 'phone': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '20'}), |
775 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
776 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '255'}), |
777 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'unique': 'True', 'to': "orm['auth.User']"}) |
778 | - } |
779 | - } |
780 | - |
781 | - complete_apps = ['core'] |
782 | \ No newline at end of file |
783 | |
784 | === removed file 'core/migrations/0009_auto__add_field_organization_externalurl.py' |
785 | --- core/migrations/0009_auto__add_field_organization_externalurl.py 2014-01-17 21:33:18 +0000 |
786 | +++ core/migrations/0009_auto__add_field_organization_externalurl.py 1970-01-01 00:00:00 +0000 |
787 | @@ -1,89 +0,0 @@ |
788 | -# -*- coding: utf-8 -*- |
789 | -from south.utils import datetime_utils as datetime |
790 | -from south.db import db |
791 | -from south.v2 import SchemaMigration |
792 | -from django.db import models |
793 | - |
794 | - |
795 | -class Migration(SchemaMigration): |
796 | - |
797 | - def forwards(self, orm): |
798 | - # Adding field 'Organization.externalurl' |
799 | - db.add_column('core_organization', 'externalurl', |
800 | - self.gf('django.db.models.fields.URLField')(max_length=200, null=True), |
801 | - keep_default=False) |
802 | - |
803 | - |
804 | - def backwards(self, orm): |
805 | - # Deleting field 'Organization.externalurl' |
806 | - db.delete_column('core_organization', 'externalurl') |
807 | - |
808 | - |
809 | - models = { |
810 | - 'auth.group': { |
811 | - 'Meta': {'object_name': 'Group'}, |
812 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
813 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), |
814 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'symmetrical': 'False', 'to': "orm['auth.Permission']"}) |
815 | - }, |
816 | - 'auth.permission': { |
817 | - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, |
818 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
819 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
820 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
821 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
822 | - }, |
823 | - 'auth.user': { |
824 | - 'Meta': {'object_name': 'User'}, |
825 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
826 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
827 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
828 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True', 'related_name': "'user_set'"}), |
829 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
830 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
831 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
832 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
833 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
834 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
835 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
836 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True', 'related_name': "'user_set'"}), |
837 | - 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) |
838 | - }, |
839 | - 'contenttypes.contenttype': { |
840 | - 'Meta': {'db_table': "'django_content_type'", 'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType'}, |
841 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
842 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
843 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
844 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
845 | - }, |
846 | - 'core.event': { |
847 | - 'Meta': {'object_name': 'Event'}, |
848 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
849 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
850 | - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Organization']"}), |
851 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}) |
852 | - }, |
853 | - 'core.organization': { |
854 | - 'Meta': {'object_name': 'Organization'}, |
855 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
856 | - 'externalurl': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), |
857 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
858 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
859 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
860 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'null': 'True', 'to': "orm['auth.Group']"}), |
861 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}) |
862 | - }, |
863 | - 'core.userprofile': { |
864 | - 'Meta': {'object_name': 'UserProfile'}, |
865 | - 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'null': 'True'}), |
866 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
867 | - 'gender': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'}), |
868 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
869 | - 'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), |
870 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
871 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), |
872 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'unique': 'True', 'to': "orm['auth.User']"}) |
873 | - } |
874 | - } |
875 | - |
876 | - complete_apps = ['core'] |
877 | \ No newline at end of file |
878 | |
879 | === removed file 'core/migrations/0010_auto__add_unique_organization_urlslug.py' |
880 | --- core/migrations/0010_auto__add_unique_organization_urlslug.py 2014-01-18 12:58:14 +0000 |
881 | +++ core/migrations/0010_auto__add_unique_organization_urlslug.py 1970-01-01 00:00:00 +0000 |
882 | @@ -1,87 +0,0 @@ |
883 | -# -*- coding: utf-8 -*- |
884 | -from south.utils import datetime_utils as datetime |
885 | -from south.db import db |
886 | -from south.v2 import SchemaMigration |
887 | -from django.db import models |
888 | - |
889 | - |
890 | -class Migration(SchemaMigration): |
891 | - |
892 | - def forwards(self, orm): |
893 | - # Adding unique constraint on 'Organization', fields ['urlslug'] |
894 | - db.create_unique('core_organization', ['urlslug']) |
895 | - |
896 | - |
897 | - def backwards(self, orm): |
898 | - # Removing unique constraint on 'Organization', fields ['urlslug'] |
899 | - db.delete_unique('core_organization', ['urlslug']) |
900 | - |
901 | - |
902 | - models = { |
903 | - 'auth.group': { |
904 | - 'Meta': {'object_name': 'Group'}, |
905 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
906 | - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
907 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True', 'symmetrical': 'False'}) |
908 | - }, |
909 | - 'auth.permission': { |
910 | - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, |
911 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
912 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
913 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
914 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
915 | - }, |
916 | - 'auth.user': { |
917 | - 'Meta': {'object_name': 'User'}, |
918 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
919 | - 'email': ('django.db.models.fields.EmailField', [], {'blank': 'True', 'max_length': '75'}), |
920 | - 'first_name': ('django.db.models.fields.CharField', [], {'blank': 'True', 'max_length': '30'}), |
921 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True', 'symmetrical': 'False', 'related_name': "'user_set'"}), |
922 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
923 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
924 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
925 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
926 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
927 | - 'last_name': ('django.db.models.fields.CharField', [], {'blank': 'True', 'max_length': '30'}), |
928 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
929 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True', 'symmetrical': 'False', 'related_name': "'user_set'"}), |
930 | - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
931 | - }, |
932 | - 'contenttypes.contenttype': { |
933 | - 'Meta': {'db_table': "'django_content_type'", 'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType'}, |
934 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
935 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
936 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
937 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
938 | - }, |
939 | - 'core.event': { |
940 | - 'Meta': {'object_name': 'Event'}, |
941 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
942 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
943 | - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Organization']"}), |
944 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}) |
945 | - }, |
946 | - 'core.organization': { |
947 | - 'Meta': {'object_name': 'Organization'}, |
948 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
949 | - 'externalurl': ('django.db.models.fields.URLField', [], {'null': 'True', 'max_length': '200'}), |
950 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
951 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
952 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
953 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True'}), |
954 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) |
955 | - }, |
956 | - 'core.userprofile': { |
957 | - 'Meta': {'object_name': 'UserProfile'}, |
958 | - 'country': ('django_countries.fields.CountryField', [], {'null': 'True', 'max_length': '2'}), |
959 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
960 | - 'gender': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '6'}), |
961 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
962 | - 'phone': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '20'}), |
963 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
964 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '255'}), |
965 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) |
966 | - } |
967 | - } |
968 | - |
969 | - complete_apps = ['core'] |
970 | \ No newline at end of file |
971 | |
972 | === removed file 'core/migrations/0011_auto__add_field_event_is_active__add_field_event_urlslug__add_field_ev.py' |
973 | --- core/migrations/0011_auto__add_field_event_is_active__add_field_event_urlslug__add_field_ev.py 2014-01-18 13:16:12 +0000 |
974 | +++ core/migrations/0011_auto__add_field_event_is_active__add_field_event_urlslug__add_field_ev.py 1970-01-01 00:00:00 +0000 |
975 | @@ -1,108 +0,0 @@ |
976 | -# -*- coding: utf-8 -*- |
977 | -from south.utils import datetime_utils as datetime |
978 | -from south.db import db |
979 | -from south.v2 import SchemaMigration |
980 | -from django.db import models |
981 | - |
982 | - |
983 | -class Migration(SchemaMigration): |
984 | - |
985 | - def forwards(self, orm): |
986 | - # Adding field 'Event.is_active' |
987 | - db.add_column('core_event', 'is_active', |
988 | - self.gf('django.db.models.fields.BooleanField')(default=False), |
989 | - keep_default=False) |
990 | - |
991 | - # Adding field 'Event.urlslug' |
992 | - db.add_column('core_event', 'urlslug', |
993 | - self.gf('django.db.models.fields.SlugField')(max_length=50, default=1, unique=True), |
994 | - keep_default=False) |
995 | - |
996 | - # Adding field 'Event.externalurl' |
997 | - db.add_column('core_event', 'externalurl', |
998 | - self.gf('django.db.models.fields.URLField')(max_length=200, null=True), |
999 | - keep_default=False) |
1000 | - |
1001 | - |
1002 | - def backwards(self, orm): |
1003 | - # Deleting field 'Event.is_active' |
1004 | - db.delete_column('core_event', 'is_active') |
1005 | - |
1006 | - # Deleting field 'Event.urlslug' |
1007 | - db.delete_column('core_event', 'urlslug') |
1008 | - |
1009 | - # Deleting field 'Event.externalurl' |
1010 | - db.delete_column('core_event', 'externalurl') |
1011 | - |
1012 | - |
1013 | - models = { |
1014 | - 'auth.group': { |
1015 | - 'Meta': {'object_name': 'Group'}, |
1016 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1017 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), |
1018 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Permission']", 'blank': 'True'}) |
1019 | - }, |
1020 | - 'auth.permission': { |
1021 | - 'Meta': {'unique_together': "(('content_type', 'codename'),)", 'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'object_name': 'Permission'}, |
1022 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1023 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
1024 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1025 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
1026 | - }, |
1027 | - 'auth.user': { |
1028 | - 'Meta': {'object_name': 'User'}, |
1029 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
1030 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
1031 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
1032 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'blank': 'True', 'related_name': "'user_set'"}), |
1033 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1034 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
1035 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1036 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1037 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
1038 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
1039 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
1040 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Permission']", 'blank': 'True', 'related_name': "'user_set'"}), |
1041 | - 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) |
1042 | - }, |
1043 | - 'contenttypes.contenttype': { |
1044 | - 'Meta': {'unique_together': "(('app_label', 'model'),)", 'ordering': "('name',)", 'db_table': "'django_content_type'", 'object_name': 'ContentType'}, |
1045 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1046 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1047 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1048 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
1049 | - }, |
1050 | - 'core.event': { |
1051 | - 'Meta': {'object_name': 'Event'}, |
1052 | - 'externalurl': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), |
1053 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1054 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1055 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
1056 | - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Organization']"}), |
1057 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}), |
1058 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True'}) |
1059 | - }, |
1060 | - 'core.organization': { |
1061 | - 'Meta': {'object_name': 'Organization'}, |
1062 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
1063 | - 'externalurl': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), |
1064 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1065 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1066 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
1067 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True'}), |
1068 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True'}) |
1069 | - }, |
1070 | - 'core.userprofile': { |
1071 | - 'Meta': {'object_name': 'UserProfile'}, |
1072 | - 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'null': 'True'}), |
1073 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
1074 | - 'gender': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'}), |
1075 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1076 | - 'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), |
1077 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
1078 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), |
1079 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) |
1080 | - } |
1081 | - } |
1082 | - |
1083 | - complete_apps = ['core'] |
1084 | |
1085 | === removed file 'core/migrations/0012_auto__add_field_event_startdate__add_field_event_enddate.py' |
1086 | --- core/migrations/0012_auto__add_field_event_startdate__add_field_event_enddate.py 2014-01-18 17:53:50 +0000 |
1087 | +++ core/migrations/0012_auto__add_field_event_startdate__add_field_event_enddate.py 1970-01-01 00:00:00 +0000 |
1088 | @@ -1,102 +0,0 @@ |
1089 | -# -*- coding: utf-8 -*- |
1090 | -from south.utils import datetime_utils as datetime |
1091 | -from south.db import db |
1092 | -from south.v2 import SchemaMigration |
1093 | -from django.db import models |
1094 | - |
1095 | - |
1096 | -class Migration(SchemaMigration): |
1097 | - |
1098 | - def forwards(self, orm): |
1099 | - # Adding field 'Event.startdate' |
1100 | - db.add_column('core_event', 'startdate', |
1101 | - self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2014, 1, 18, 0, 0)), |
1102 | - keep_default=False) |
1103 | - |
1104 | - # Adding field 'Event.enddate' |
1105 | - db.add_column('core_event', 'enddate', |
1106 | - self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2014, 1, 18, 0, 0)), |
1107 | - keep_default=False) |
1108 | - |
1109 | - |
1110 | - def backwards(self, orm): |
1111 | - # Deleting field 'Event.startdate' |
1112 | - db.delete_column('core_event', 'startdate') |
1113 | - |
1114 | - # Deleting field 'Event.enddate' |
1115 | - db.delete_column('core_event', 'enddate') |
1116 | - |
1117 | - |
1118 | - models = { |
1119 | - 'auth.group': { |
1120 | - 'Meta': {'object_name': 'Group'}, |
1121 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1122 | - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), |
1123 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True', 'symmetrical': 'False'}) |
1124 | - }, |
1125 | - 'auth.permission': { |
1126 | - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, |
1127 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1128 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
1129 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1130 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
1131 | - }, |
1132 | - 'auth.user': { |
1133 | - 'Meta': {'object_name': 'User'}, |
1134 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
1135 | - 'email': ('django.db.models.fields.EmailField', [], {'blank': 'True', 'max_length': '75'}), |
1136 | - 'first_name': ('django.db.models.fields.CharField', [], {'blank': 'True', 'max_length': '30'}), |
1137 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'user_set'", 'to': "orm['auth.Group']", 'blank': 'True', 'symmetrical': 'False'}), |
1138 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1139 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
1140 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1141 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1142 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
1143 | - 'last_name': ('django.db.models.fields.CharField', [], {'blank': 'True', 'max_length': '30'}), |
1144 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
1145 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'user_set'", 'to': "orm['auth.Permission']", 'blank': 'True', 'symmetrical': 'False'}), |
1146 | - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) |
1147 | - }, |
1148 | - 'contenttypes.contenttype': { |
1149 | - 'Meta': {'db_table': "'django_content_type'", 'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType'}, |
1150 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1151 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1152 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1153 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
1154 | - }, |
1155 | - 'core.event': { |
1156 | - 'Meta': {'object_name': 'Event'}, |
1157 | - 'enddate': ('django.db.models.fields.DateTimeField', [], {}), |
1158 | - 'externalurl': ('django.db.models.fields.URLField', [], {'null': 'True', 'max_length': '200'}), |
1159 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1160 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1161 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
1162 | - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Organization']"}), |
1163 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}), |
1164 | - 'startdate': ('django.db.models.fields.DateTimeField', [], {}), |
1165 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) |
1166 | - }, |
1167 | - 'core.organization': { |
1168 | - 'Meta': {'object_name': 'Organization'}, |
1169 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
1170 | - 'externalurl': ('django.db.models.fields.URLField', [], {'null': 'True', 'max_length': '200'}), |
1171 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1172 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1173 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
1174 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'null': 'True', 'to': "orm['auth.Group']"}), |
1175 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50'}) |
1176 | - }, |
1177 | - 'core.userprofile': { |
1178 | - 'Meta': {'object_name': 'UserProfile'}, |
1179 | - 'country': ('django_countries.fields.CountryField', [], {'null': 'True', 'max_length': '2'}), |
1180 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
1181 | - 'gender': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '6'}), |
1182 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1183 | - 'phone': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '20'}), |
1184 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
1185 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '255'}), |
1186 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'unique': 'True', 'to': "orm['auth.User']"}) |
1187 | - } |
1188 | - } |
1189 | - |
1190 | - complete_apps = ['core'] |
1191 | \ No newline at end of file |
1192 | |
1193 | === removed file 'core/migrations/0013_auto__del_field_event_startdate__del_field_event_enddate__add_field_ev.py' |
1194 | --- core/migrations/0013_auto__del_field_event_startdate__del_field_event_enddate__add_field_ev.py 2014-01-18 17:53:50 +0000 |
1195 | +++ core/migrations/0013_auto__del_field_event_startdate__del_field_event_enddate__add_field_ev.py 1970-01-01 00:00:00 +0000 |
1196 | @@ -1,126 +0,0 @@ |
1197 | -# -*- coding: utf-8 -*- |
1198 | -from south.utils import datetime_utils as datetime |
1199 | -from south.db import db |
1200 | -from south.v2 import SchemaMigration |
1201 | -from django.db import models |
1202 | - |
1203 | - |
1204 | -class Migration(SchemaMigration): |
1205 | - |
1206 | - def forwards(self, orm): |
1207 | - # Deleting field 'Event.startdate' |
1208 | - db.delete_column('core_event', 'startdate') |
1209 | - |
1210 | - # Deleting field 'Event.enddate' |
1211 | - db.delete_column('core_event', 'enddate') |
1212 | - |
1213 | - # Adding field 'Event.startdatetime' |
1214 | - db.add_column('core_event', 'startdatetime', |
1215 | - self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2014, 1, 18, 0, 0)), |
1216 | - keep_default=False) |
1217 | - |
1218 | - # Adding field 'Event.enddatetime' |
1219 | - db.add_column('core_event', 'enddatetime', |
1220 | - self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime(2014, 1, 18, 0, 0)), |
1221 | - keep_default=False) |
1222 | - |
1223 | - |
1224 | - def backwards(self, orm): |
1225 | - |
1226 | - # User chose to not deal with backwards NULL issues for 'Event.startdate' |
1227 | - raise RuntimeError("Cannot reverse this migration. 'Event.startdate' and its values cannot be restored.") |
1228 | - |
1229 | - # The following code is provided here to aid in writing a correct migration # Adding field 'Event.startdate' |
1230 | - db.add_column('core_event', 'startdate', |
1231 | - self.gf('django.db.models.fields.DateTimeField')(), |
1232 | - keep_default=False) |
1233 | - |
1234 | - |
1235 | - # User chose to not deal with backwards NULL issues for 'Event.enddate' |
1236 | - raise RuntimeError("Cannot reverse this migration. 'Event.enddate' and its values cannot be restored.") |
1237 | - |
1238 | - # The following code is provided here to aid in writing a correct migration # Adding field 'Event.enddate' |
1239 | - db.add_column('core_event', 'enddate', |
1240 | - self.gf('django.db.models.fields.DateTimeField')(), |
1241 | - keep_default=False) |
1242 | - |
1243 | - # Deleting field 'Event.startdatetime' |
1244 | - db.delete_column('core_event', 'startdatetime') |
1245 | - |
1246 | - # Deleting field 'Event.enddatetime' |
1247 | - db.delete_column('core_event', 'enddatetime') |
1248 | - |
1249 | - |
1250 | - models = { |
1251 | - 'auth.group': { |
1252 | - 'Meta': {'object_name': 'Group'}, |
1253 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1254 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), |
1255 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'blank': 'True', 'to': "orm['auth.Permission']"}) |
1256 | - }, |
1257 | - 'auth.permission': { |
1258 | - 'Meta': {'object_name': 'Permission', 'unique_together': "(('content_type', 'codename'),)", 'ordering': "('content_type__app_label', 'content_type__model', 'codename')"}, |
1259 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1260 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
1261 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1262 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
1263 | - }, |
1264 | - 'auth.user': { |
1265 | - 'Meta': {'object_name': 'User'}, |
1266 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
1267 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
1268 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
1269 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'blank': 'True', 'related_name': "'user_set'", 'to': "orm['auth.Group']"}), |
1270 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1271 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
1272 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1273 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1274 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
1275 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
1276 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
1277 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'blank': 'True', 'related_name': "'user_set'", 'to': "orm['auth.Permission']"}), |
1278 | - 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) |
1279 | - }, |
1280 | - 'contenttypes.contenttype': { |
1281 | - 'Meta': {'object_name': 'ContentType', 'unique_together': "(('app_label', 'model'),)", 'ordering': "('name',)", 'db_table': "'django_content_type'"}, |
1282 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1283 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1284 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1285 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
1286 | - }, |
1287 | - 'core.event': { |
1288 | - 'Meta': {'object_name': 'Event'}, |
1289 | - 'enddatetime': ('django.db.models.fields.DateTimeField', [], {}), |
1290 | - 'externalurl': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), |
1291 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1292 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1293 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
1294 | - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Organization']"}), |
1295 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}), |
1296 | - 'startdatetime': ('django.db.models.fields.DateTimeField', [], {}), |
1297 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True'}) |
1298 | - }, |
1299 | - 'core.organization': { |
1300 | - 'Meta': {'object_name': 'Organization'}, |
1301 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
1302 | - 'externalurl': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True'}), |
1303 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1304 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1305 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
1306 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'null': 'True', 'to': "orm['auth.Group']"}), |
1307 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True'}) |
1308 | - }, |
1309 | - 'core.userprofile': { |
1310 | - 'Meta': {'object_name': 'UserProfile'}, |
1311 | - 'country': ('django_countries.fields.CountryField', [], {'max_length': '2', 'null': 'True'}), |
1312 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
1313 | - 'gender': ('django.db.models.fields.CharField', [], {'max_length': '6', 'null': 'True'}), |
1314 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1315 | - 'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), |
1316 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
1317 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}), |
1318 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'unique': 'True', 'to': "orm['auth.User']"}) |
1319 | - } |
1320 | - } |
1321 | - |
1322 | - complete_apps = ['core'] |
1323 | \ No newline at end of file |
1324 | |
1325 | === removed file 'core/migrations/0014_auto__add_field_event_about.py' |
1326 | --- core/migrations/0014_auto__add_field_event_about.py 2014-01-18 19:12:33 +0000 |
1327 | +++ core/migrations/0014_auto__add_field_event_about.py 1970-01-01 00:00:00 +0000 |
1328 | @@ -1,95 +0,0 @@ |
1329 | -# -*- coding: utf-8 -*- |
1330 | -from south.utils import datetime_utils as datetime |
1331 | -from south.db import db |
1332 | -from south.v2 import SchemaMigration |
1333 | -from django.db import models |
1334 | - |
1335 | - |
1336 | -class Migration(SchemaMigration): |
1337 | - |
1338 | - def forwards(self, orm): |
1339 | - # Adding field 'Event.about' |
1340 | - db.add_column('core_event', 'about', |
1341 | - self.gf('django.db.models.fields.TextField')(null=True), |
1342 | - keep_default=False) |
1343 | - |
1344 | - |
1345 | - def backwards(self, orm): |
1346 | - # Deleting field 'Event.about' |
1347 | - db.delete_column('core_event', 'about') |
1348 | - |
1349 | - |
1350 | - models = { |
1351 | - 'auth.group': { |
1352 | - 'Meta': {'object_name': 'Group'}, |
1353 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1354 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), |
1355 | - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Permission']", 'blank': 'True'}) |
1356 | - }, |
1357 | - 'auth.permission': { |
1358 | - 'Meta': {'unique_together': "(('content_type', 'codename'),)", 'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'object_name': 'Permission'}, |
1359 | - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1360 | - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), |
1361 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1362 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) |
1363 | - }, |
1364 | - 'auth.user': { |
1365 | - 'Meta': {'object_name': 'User'}, |
1366 | - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
1367 | - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), |
1368 | - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
1369 | - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Group']", 'related_name': "'user_set'", 'blank': 'True'}), |
1370 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1371 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), |
1372 | - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1373 | - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1374 | - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), |
1375 | - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), |
1376 | - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), |
1377 | - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Permission']", 'related_name': "'user_set'", 'blank': 'True'}), |
1378 | - 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) |
1379 | - }, |
1380 | - 'contenttypes.contenttype': { |
1381 | - 'Meta': {'unique_together': "(('app_label', 'model'),)", 'ordering': "('name',)", 'db_table': "'django_content_type'", 'object_name': 'ContentType'}, |
1382 | - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1383 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1384 | - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), |
1385 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) |
1386 | - }, |
1387 | - 'core.event': { |
1388 | - 'Meta': {'object_name': 'Event'}, |
1389 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
1390 | - 'enddatetime': ('django.db.models.fields.DateTimeField', [], {}), |
1391 | - 'externalurl': ('django.db.models.fields.URLField', [], {'null': 'True', 'max_length': '200'}), |
1392 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1393 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1394 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
1395 | - 'organization': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Organization']"}), |
1396 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']"}), |
1397 | - 'startdatetime': ('django.db.models.fields.DateTimeField', [], {}), |
1398 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True'}) |
1399 | - }, |
1400 | - 'core.organization': { |
1401 | - 'Meta': {'object_name': 'Organization'}, |
1402 | - 'about': ('django.db.models.fields.TextField', [], {'null': 'True'}), |
1403 | - 'externalurl': ('django.db.models.fields.URLField', [], {'null': 'True', 'max_length': '200'}), |
1404 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1405 | - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), |
1406 | - 'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}), |
1407 | - 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True'}), |
1408 | - 'urlslug': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'unique': 'True'}) |
1409 | - }, |
1410 | - 'core.userprofile': { |
1411 | - 'Meta': {'object_name': 'UserProfile'}, |
1412 | - 'country': ('django_countries.fields.CountryField', [], {'null': 'True', 'max_length': '2'}), |
1413 | - 'date_of_birth': ('django.db.models.fields.DateField', [], {'null': 'True'}), |
1414 | - 'gender': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '6'}), |
1415 | - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), |
1416 | - 'phone': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '20'}), |
1417 | - 'postalcode': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}), |
1418 | - 'streetaddress': ('django.db.models.fields.CharField', [], {'null': 'True', 'max_length': '255'}), |
1419 | - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) |
1420 | - } |
1421 | - } |
1422 | - |
1423 | - complete_apps = ['core'] |
1424 | \ No newline at end of file |
1425 | |
1426 | === modified file 'fabfile.py' |
1427 | --- fabfile.py 2014-01-18 12:01:28 +0000 |
1428 | +++ fabfile.py 2015-01-03 18:47:57 +0000 |
1429 | @@ -48,7 +48,7 @@ |
1430 | |
1431 | def _create_virtualenv (): |
1432 | with cd ('%s' % env.path_root): |
1433 | - run ('virtualenv virtualenv') |
1434 | + run ('virtualenv virtualenv -p python3') |
1435 | run ('source %svirtualenv/bin/activate' % env.path_root) |
1436 | print (green ('Created (or recreated) virtual environment')) |
1437 | |
1438 | |
1439 | === modified file 'lancms2/settings.py' |
1440 | --- lancms2/settings.py 2014-08-29 21:19:07 +0000 |
1441 | +++ lancms2/settings.py 2015-01-03 18:47:57 +0000 |
1442 | @@ -44,7 +44,6 @@ |
1443 | 'core', |
1444 | 'debug_toolbar', # for DEBUG |
1445 | 'django_countries', |
1446 | - 'south', |
1447 | 'bootstrapform', |
1448 | 'ticket', |
1449 | 'crew', |
1450 | @@ -102,7 +101,9 @@ |
1451 | ##### |
1452 | MEDIA_ROOT = os.path.join (BASE_DIR, 'media/') |
1453 | STATIC_ROOT = os.path.join (BASE_DIR, 'static/') |
1454 | -TEMPLATE_DIRS = os.path.join (BASE_DIR, 'templates/') |
1455 | +TEMPLATE_DIRS = ( |
1456 | + os.path.join(BASE_DIR, 'templates/'), |
1457 | +) |
1458 | |
1459 | LOGIN_REDIRECT_URL = 'core.views.selfprofile' |
1460 | LOGOUT_URL = 'allauth.account.views.logout' |
1461 | @@ -140,25 +141,6 @@ |
1462 | |
1463 | ##### end allauth |
1464 | |
1465 | -##### start south |
1466 | -SOUTH_MIGRATION_MODULES = { |
1467 | - 'allauth': 'ignore', |
1468 | - 'socialaccount': 'ignore', |
1469 | - 'auth': 'ignore', |
1470 | - 'django_countries': 'ignore', |
1471 | - 'contenttypes': 'ignore', |
1472 | - 'sessions': 'ignore', |
1473 | - 'messages': 'ignore', |
1474 | - 'staticfiles': 'ignore', |
1475 | - 'debug_toolbar': 'ignore', |
1476 | - 'account': 'ignore', |
1477 | - 'admin': 'ignore', |
1478 | - 'facebook': 'ignore', |
1479 | -} |
1480 | -##### end south |
1481 | - |
1482 | - |
1483 | - |
1484 | ##### import settings from lancms2/local_settings.py |
1485 | try: |
1486 | from local_settings import * |
1487 | |
1488 | === modified file 'requirements.txt' |
1489 | --- requirements.txt 2015-01-03 14:46:29 +0000 |
1490 | +++ requirements.txt 2015-01-03 18:47:57 +0000 |
1491 | @@ -1,11 +1,11 @@ |
1492 | -Django==1.6.1 |
1493 | -South==0.8.4 |
1494 | -django-allauth==0.15.0 |
1495 | +Django==1.7.2 |
1496 | +defusedxml==0.4.1 |
1497 | +django-allauth==0.18.0 |
1498 | +django-bootstrap-form==3.1 |
1499 | django-countries==3.0.2 |
1500 | -django-debug-toolbar==1.0.1 |
1501 | -oauthlib==0.6.0 |
1502 | -python3-openid==3.0.3 |
1503 | -requests==2.2.0 |
1504 | -requests-oauthlib==0.4.0 |
1505 | -sqlparse==0.1.10 |
1506 | -django-bootstrap-form |
1507 | +django-debug-toolbar==1.2.2 |
1508 | +oauthlib==0.7.2 |
1509 | +python3-openid==3.0.5 |
1510 | +requests==2.5.1 |
1511 | +requests-oauthlib==0.4.2 |
1512 | +sqlparse==0.1.14 |
1513 | |
1514 | === modified file 'templates/base.html' |
1515 | --- templates/base.html 2014-01-19 12:05:42 +0000 |
1516 | +++ templates/base.html 2015-01-03 18:47:57 +0000 |
1517 | @@ -33,7 +33,7 @@ |
1518 | <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Organizations" %} <b class="caret"></b></a> |
1519 | <ul class="dropdown-menu">{% comment %}FIXME: label 'owner' should be .pull-right, but I can't seem to get that working -- mboehn{% endcomment %} |
1520 | {% for org in organizations %} |
1521 | - <li><a href="{% url 'organization_front' slug=org.urlslug %}">{{org}}{% if user|owns_org:org %} <span class="label label-success">Owner</span>{% endif %}</a></li> |
1522 | + <li><a href="{% url 'organization_front' slug=org.urlslug %}">{{org.name}}{% if user|owns_org:org %} <span class="label label-success">Owner</span>{% endif %}</a></li> |
1523 | {% endfor %} |
1524 | </ul> |
1525 | </li> |
Works for me. Hope it works for everybody else too.