Merge lp:~lucyllewy/loco-team-portal/django-1.8 into lp:loco-team-portal
- django-1.8
- Merge into 0.2
Proposed by
Lucy Llewellyn
Status: | Needs review |
---|---|
Proposed branch: | lp:~lucyllewy/loco-team-portal/django-1.8 |
Merge into: | lp:loco-team-portal |
Diff against target: |
9903 lines (+1780/-5831) 163 files modified
Makefile (+5/-3) loco_directory/app/feeds.py (+12/-0) loco_directory/app/local_settings.py.sample (+1/-1) loco_directory/app/settings.py (+7/-3) loco_directory/app/urls.py (+2/-13) loco_directory/articles/migrations/0001_initial.py (+55/-164) loco_directory/articles/migrations/0002_auto_20160816_0016.py (+24/-0) loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py (+0/-153) loco_directory/articles/models.py (+1/-1) loco_directory/articles/urls.py (+1/-1) loco_directory/common/management/commands/init.py (+1/-1) loco_directory/common/mixins.py (+6/-5) loco_directory/common/widgets.py (+1/-2) loco_directory/django.wsgi (+1/-1) loco_directory/events/feeds.py (+4/-2) loco_directory/events/forms.py (+12/-8) loco_directory/events/migrations/0001_initial.py (+91/-205) loco_directory/events/migrations/0002_add_profile_fields.py (+0/-170) loco_directory/events/migrations/0002_auto_20160815_2321.py (+24/-0) loco_directory/events/migrations/0003_auto_20160815_2328.py (+44/-0) loco_directory/events/migrations/0003_migrate_profile_data.py (+0/-173) loco_directory/events/migrations/0004_auto_20160815_2334.py (+29/-0) loco_directory/events/migrations/0004_remove_user.py (+0/-181) loco_directory/events/migrations/0005_allow_external_registration.py (+0/-166) loco_directory/events/migrations/0005_teamevent_registration.py (+20/-0) loco_directory/events/migrations/0006_auto_20160815_2352.py (+40/-0) loco_directory/events/migrations/0006_event_channel.py (+0/-169) loco_directory/events/migrations/0007_auto_20160815_2359.py (+47/-0) loco_directory/events/migrations/0007_event_contact.py (+0/-171) loco_directory/events/migrations/0008_add_global_event_channel.py (+0/-183) loco_directory/events/migrations/0008_auto_20160816_0011.py (+36/-0) loco_directory/events/migrations/0009_auto_20160816_0019.py (+28/-0) loco_directory/events/migrations/0009_global_event_activities.py (+0/-184) loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py (+0/-184) loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py (+0/-185) loco_directory/events/models.py (+15/-8) loco_directory/events/urls.py (+1/-1) loco_directory/events/views.py (+30/-28) loco_directory/manage.py (+6/-8) loco_directory/meetings/feeds.py (+4/-2) loco_directory/meetings/forms.py (+11/-7) loco_directory/meetings/migrations/0001_add_meetings.py (+0/-153) loco_directory/meetings/migrations/0001_initial.py (+40/-0) loco_directory/meetings/migrations/0002_auto_20160815_2342.py (+45/-0) loco_directory/meetings/migrations/0002_channel_logs.py (+0/-135) loco_directory/meetings/migrations/0003_add_chair.py (+0/-130) loco_directory/meetings/migrations/0003_auto_20160815_2344.py (+19/-0) loco_directory/meetings/migrations/0004_add_agenda.py (+0/-152) loco_directory/meetings/migrations/0004_basemeeting_minutes.py (+20/-0) loco_directory/meetings/migrations/0005_add_meeting_minutes.py (+0/-142) loco_directory/meetings/migrations/0005_auto_20160815_2352.py (+33/-0) loco_directory/meetings/migrations/0006_add_timezone.py (+0/-154) loco_directory/meetings/migrations/0006_teammeeting_meeting_tz.py (+20/-0) loco_directory/meetings/migrations/0007_auto_20160815_2359.py (+69/-0) loco_directory/meetings/models.py (+14/-6) loco_directory/meetings/urls.py (+1/-1) loco_directory/meetings/views.py (+15/-14) loco_directory/services/__init__.py (+4/-4) loco_directory/services/urls.py (+1/-1) loco_directory/teams/feeds.py (+3/-2) loco_directory/teams/migrations/0001_initial.py (+57/-89) loco_directory/teams/migrations/0002_add_mugshot_field.py (+0/-52) loco_directory/teams/migrations/0002_auto_20160815_2321.py (+45/-0) loco_directory/teams/migrations/0003_add_countries.py (+0/-94) loco_directory/teams/migrations/0003_auto_20160815_2324.py (+32/-0) loco_directory/teams/migrations/0004_add_languages.py (+0/-81) loco_directory/teams/migrations/0004_auto_20160815_2328.py (+44/-0) loco_directory/teams/migrations/0005_add_profile_fields.py (+0/-142) loco_directory/teams/migrations/0005_team_flickr_id.py (+20/-0) loco_directory/teams/migrations/0006_auto_20160815_2330.py (+19/-0) loco_directory/teams/migrations/0006_migrate_profile_fields.py (+0/-142) loco_directory/teams/migrations/0007_auto_20160815_2334.py (+31/-0) loco_directory/teams/migrations/0007_remove_old_person_fields.py (+0/-136) loco_directory/teams/migrations/0008_add_flickr_field.py (+0/-111) loco_directory/teams/migrations/0008_team_active.py (+20/-0) loco_directory/teams/migrations/0009_auto_20160815_2339.py (+22/-0) loco_directory/teams/migrations/0009_change_slug_field.py (+0/-115) loco_directory/teams/migrations/0010_add_photos_feed_fields.py (+0/-121) loco_directory/teams/migrations/0010_team_microbloghashtag.py (+20/-0) loco_directory/teams/migrations/0011_add_team_active.py (+0/-116) loco_directory/teams/migrations/0011_auto_20160815_2347.py (+19/-0) loco_directory/teams/migrations/0012_add_team_microbloghashtag.py (+0/-117) loco_directory/teams/migrations/0012_auto_20160815_2352.py (+24/-0) loco_directory/teams/migrations/0013_add_timezone.py (+0/-119) loco_directory/teams/migrations/0013_team_tz.py (+20/-0) loco_directory/teams/migrations/0014_add_display_name.py (+0/-125) loco_directory/teams/migrations/0014_team_override_name.py (+20/-0) loco_directory/teams/migrations/0015_auto_20160816_0011.py (+19/-0) loco_directory/teams/migrations/0015_auto__chg_field_team_name.py (+0/-125) loco_directory/teams/migrations/0016_auto_20160816_0022.py (+19/-0) loco_directory/teams/migrations/0016_auto__chg_field_team_picasa_id.py (+0/-125) loco_directory/teams/models.py (+5/-5) loco_directory/teams/urls.py (+1/-1) loco_directory/teams/views.py (+13/-12) loco_directory/templates/404.html (+3/-3) loco_directory/templates/about_loco.html (+3/-3) loco_directory/templates/articles/article_detail.html (+2/-2) loco_directory/templates/base.html (+9/-9) loco_directory/templates/events/event_history_list.html (+1/-1) loco_directory/templates/events/event_list.html (+7/-7) loco_directory/templates/events/global_event_detail.html (+5/-5) loco_directory/templates/events/global_event_detail.inc.html (+1/-1) loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html (+2/-2) loco_directory/templates/events/global_jam_dashboard.html (+5/-5) loco_directory/templates/events/team_event_comment_new.inc.html (+1/-1) loco_directory/templates/events/team_event_detail.html (+4/-4) loco_directory/templates/events/team_event_detail.inc.html (+14/-12) loco_directory/templates/events/team_event_detail_attendee.inc.html (+2/-2) loco_directory/templates/events/team_event_detail_comments.inc.html (+10/-8) loco_directory/templates/events/team_event_li.inc.html (+4/-2) loco_directory/templates/events/team_event_list.inc.html (+5/-3) loco_directory/templates/events/team_event_register.html (+1/-1) loco_directory/templates/events/team_event_update.html (+1/-1) loco_directory/templates/index.html (+11/-11) loco_directory/templates/lc_edit.html (+2/-2) loco_directory/templates/loco_council.html (+10/-8) loco_directory/templates/loco_setup.html (+1/-1) loco_directory/templates/meetings/agenda_item_delete_confirm.html (+2/-2) loco_directory/templates/meetings/agenda_item_new.html (+1/-1) loco_directory/templates/meetings/agenda_item_update.html (+4/-4) loco_directory/templates/meetings/meeting_history_list.html (+1/-1) loco_directory/templates/meetings/meeting_list.html (+3/-3) loco_directory/templates/meetings/team_meeting_detail.html (+5/-5) loco_directory/templates/meetings/team_meeting_detail_agenda.inc.html (+3/-3) loco_directory/templates/meetings/team_meeting_detail_basic.inc.html (+9/-7) loco_directory/templates/meetings/team_meeting_li.inc.html (+4/-2) loco_directory/templates/meetings/team_meeting_list.inc.html (+5/-3) loco_directory/templates/meetings/team_meeting_update.html (+1/-1) loco_directory/templates/profiles/details.html (+13/-7) loco_directory/templates/teams/merge_teams.html (+1/-1) loco_directory/templates/teams/select_other_team.html (+1/-1) loco_directory/templates/teams/team_detail.html (+24/-22) loco_directory/templates/teams/team_event_history.html (+23/-21) loco_directory/templates/teams/team_event_list.html (+4/-4) loco_directory/templates/teams/team_meeting_history.html (+23/-21) loco_directory/templates/teams/team_meeting_list.html (+3/-3) loco_directory/templates/teams/team_reapprovals.html (+2/-2) loco_directory/templates/venues/venue_detail.html (+7/-5) loco_directory/userprofiles/migrations/0001_initial.py (+36/-89) loco_directory/userprofiles/migrations/0002_add_mugshot.py (+0/-75) loco_directory/userprofiles/migrations/0002_auto_20160815_2339.py (+18/-0) loco_directory/userprofiles/migrations/0003_userprofile_mugshot.py (+20/-0) loco_directory/userprofiles/models.py (+3/-3) loco_directory/userprofiles/urls.py (+1/-1) loco_directory/userprofiles/views.py (+1/-1) loco_directory/venues/migrations/0001_initial.py (+31/-49) loco_directory/venues/migrations/0002_add_unique_together.py (+0/-44) loco_directory/venues/migrations/0002_auto_20160815_2320.py (+18/-0) loco_directory/venues/migrations/0003_add_country.py (+0/-47) loco_directory/venues/migrations/0003_auto_20160815_2321.py (+20/-0) loco_directory/venues/migrations/0004_remove_venue_map_field.py (+0/-46) loco_directory/venues/migrations/0004_remove_venue_map_url.py (+18/-0) loco_directory/venues/migrations/0005_add_spr.py (+0/-47) loco_directory/venues/migrations/0005_venue_spr.py (+20/-0) loco_directory/venues/migrations/0006_add_venue_timezone.py (+0/-48) loco_directory/venues/migrations/0006_venue_tz.py (+20/-0) loco_directory/venues/migrations/0007_auto_20160816_0001.py (+26/-0) loco_directory/venues/migrations/0007_auto__add_field_venue_continent.py (+0/-50) loco_directory/venues/models.py (+1/-1) loco_directory/venues/urls.py (+1/-1) loco_directory/venues/views.py (+2/-1) requirements/dev.txt (+4/-5) requirements/prod.txt (+4/-5) |
To merge this branch: | bzr merge lp:~lucyllewy/loco-team-portal/django-1.8 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
LoCo Team Portal Developers | Pending | ||
Review via email: mp+302983@code.launchpad.net |
Commit message
Description of the change
update to django 1.8
1.8 is a long-term support branch of dhango so we're now good until 2018
excepting any security-
To post a comment you must log in.
Unmerged revisions
- 86. By Lucy Llewellyn
-
update django to 1.8 and fix the nuclear fallout
- 85. By Lucy Llewellyn
-
movidy Makefile to fake initial migrations
- 84. By Lucy Llewellyn
-
merge my django-1.5 branch
- 83. By Lucy Llewellyn
-
merge remainder of trunk
- 82. By Lucy Llewellyn
-
convert migrations from revision 615
- 81. By Lucy Llewellyn
-
convert migrations from revision 611
- 80. By Lucy Llewellyn
-
convert migrations from revision 578
- 79. By Lucy Llewellyn
-
convert migrations from revision 517
- 78. By Lucy Llewellyn
-
convert migrations from revision 476
- 77. By Lucy Llewellyn
-
convert migrations from revision 475
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile' | |||
2 | --- Makefile 2016-02-12 00:54:37 +0000 | |||
3 | +++ Makefile 2016-08-16 07:31:30 +0000 | |||
4 | @@ -24,8 +24,10 @@ | |||
5 | 24 | 24 | ||
6 | 25 | loco_directory/loco_directory.db: env apps | 25 | loco_directory/loco_directory.db: env apps |
7 | 26 | wget http://people.ubuntu.com/~daker/ltp/ltp.db -O loco_directory/ltp.db | 26 | wget http://people.ubuntu.com/~daker/ltp/ltp.db -O loco_directory/ltp.db |
10 | 27 | $(django_manage) syncdb | 27 | $(django_manage) migrate --fake teams 0004_auto_20160815_2328 |
11 | 28 | $(django_manage) migrate | 28 | $(django_manage) migrate --fake events 0003_auto_20160815_2328 |
12 | 29 | $(django_manage) migrate --fake meetings 0002_auto_20160815_2342 | ||
13 | 30 | $(django_manage) migrate --fake-initial | ||
14 | 29 | 31 | ||
15 | 30 | db: loco_directory/loco_directory.db | 32 | db: loco_directory/loco_directory.db |
16 | 31 | 33 | ||
17 | @@ -46,7 +48,7 @@ | |||
18 | 46 | rm -rf lp_data/ | 48 | rm -rf lp_data/ |
19 | 47 | rm -rf data/ | 49 | rm -rf data/ |
20 | 48 | rm -rf loco_directory/bzr_apps/ | 50 | rm -rf loco_directory/bzr_apps/ |
22 | 49 | rm loco_directory/loco_directory.db | 51 | rm loco_directory/ltp.db |
23 | 50 | 52 | ||
24 | 51 | depends: | 53 | depends: |
25 | 52 | apt-get install python2.7 python2.7-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes gettext | 54 | apt-get install python2.7 python2.7-dev python-virtualenv libjs-jquery libjs-jquery-ui iso-codes gettext |
26 | 53 | 55 | ||
27 | === removed file 'loco_directory/__init__.py' | |||
28 | === added directory 'loco_directory/app' | |||
29 | === added file 'loco_directory/app/__init__.py' | |||
30 | === added file 'loco_directory/app/feeds.py' | |||
31 | --- loco_directory/app/feeds.py 1970-01-01 00:00:00 +0000 | |||
32 | +++ loco_directory/app/feeds.py 2016-08-16 07:31:30 +0000 | |||
33 | @@ -0,0 +1,12 @@ | |||
34 | 1 | from django.conf.urls import * | ||
35 | 2 | |||
36 | 3 | from events.feeds import TeamEventFeed, GlobalEventFeed | ||
37 | 4 | from meetings.feeds import TeamMeetingFeed | ||
38 | 5 | from teams.feeds import TeamFeed | ||
39 | 6 | |||
40 | 7 | urlpatterns = patterns('', | ||
41 | 8 | url(r'^teams/(?P<bits>.*)$', TeamFeed()), | ||
42 | 9 | url(r'^events/(?P<bits>.*)$', TeamEventFeed()), | ||
43 | 10 | url(r'^globalevents/(?P<bits>.*)$', GlobalEventFeed()), | ||
44 | 11 | url(r'^meetings/(?P<bits>.*)$', TeamMeetingFeed()), | ||
45 | 12 | ) | ||
46 | 0 | 13 | ||
47 | === renamed file 'loco_directory/local_settings.py.sample' => 'loco_directory/app/local_settings.py.sample' | |||
48 | --- loco_directory/local_settings.py.sample 2012-12-26 16:16:17 +0000 | |||
49 | +++ loco_directory/app/local_settings.py.sample 2016-08-16 07:31:30 +0000 | |||
50 | @@ -9,7 +9,7 @@ | |||
51 | 9 | }, | 9 | }, |
52 | 10 | } | 10 | } |
53 | 11 | 11 | ||
55 | 12 | SECRET_KEY = '' | 12 | SECRET_KEY = 'abc123' |
56 | 13 | 13 | ||
57 | 14 | DEBUG_USERS = ('') | 14 | DEBUG_USERS = ('') |
58 | 15 | 15 | ||
59 | 16 | 16 | ||
60 | === renamed file 'loco_directory/settings.py' => 'loco_directory/app/settings.py' | |||
61 | --- loco_directory/settings.py 2013-03-31 01:10:52 +0000 | |||
62 | +++ loco_directory/app/settings.py 2016-08-16 07:31:30 +0000 | |||
63 | @@ -39,7 +39,7 @@ | |||
64 | 39 | log.error('Missing library: %s, Install package: %s\n' % (module, package)) | 39 | log.error('Missing library: %s, Install package: %s\n' % (module, package)) |
65 | 40 | sys.exit(1) | 40 | sys.exit(1) |
66 | 41 | 41 | ||
68 | 42 | PROJECT_PATH = os.path.dirname(os.path.abspath(__file__)) | 42 | PROJECT_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) |
69 | 43 | 43 | ||
70 | 44 | DEBUG = True | 44 | DEBUG = True |
71 | 45 | TEMPLATE_DEBUG = DEBUG | 45 | TEMPLATE_DEBUG = DEBUG |
72 | @@ -70,6 +70,7 @@ | |||
73 | 70 | # If running in a Windows environment this must be set to the same as your | 70 | # If running in a Windows environment this must be set to the same as your |
74 | 71 | # system time zone. | 71 | # system time zone. |
75 | 72 | TIME_ZONE = 'UTC' | 72 | TIME_ZONE = 'UTC' |
76 | 73 | USE_TZ = True | ||
77 | 73 | 74 | ||
78 | 74 | # Language code for this installation. All choices can be found here: | 75 | # Language code for this installation. All choices can be found here: |
79 | 75 | # http://www.i18nguy.com/unicode/language-identifiers.html | 76 | # http://www.i18nguy.com/unicode/language-identifiers.html |
80 | @@ -109,11 +110,13 @@ | |||
81 | 109 | 'django.middleware.locale.LocaleMiddleware', | 110 | 'django.middleware.locale.LocaleMiddleware', |
82 | 110 | 'django.middleware.common.CommonMiddleware', | 111 | 'django.middleware.common.CommonMiddleware', |
83 | 111 | 'django.contrib.auth.middleware.AuthenticationMiddleware', | 112 | 'django.contrib.auth.middleware.AuthenticationMiddleware', |
84 | 113 | 'django.contrib.messages.middleware.MessageMiddleware', | ||
85 | 112 | ) | 114 | ) |
86 | 113 | 115 | ||
87 | 114 | # list with template context processors. see http://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors | 116 | # list with template context processors. see http://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors |
88 | 115 | TEMPLATE_CONTEXT_PROCESSORS = ( | 117 | TEMPLATE_CONTEXT_PROCESSORS = ( |
89 | 116 | "django.contrib.auth.context_processors.auth", | 118 | "django.contrib.auth.context_processors.auth", |
90 | 119 | "django.contrib.messages.context_processors.messages", | ||
91 | 117 | "django.core.context_processors.debug", | 120 | "django.core.context_processors.debug", |
92 | 118 | "django.core.context_processors.i18n", | 121 | "django.core.context_processors.i18n", |
93 | 119 | "django.core.context_processors.media", | 122 | "django.core.context_processors.media", |
94 | @@ -128,7 +131,7 @@ | |||
95 | 128 | "common.context_processors.languages_menu", | 131 | "common.context_processors.languages_menu", |
96 | 129 | ) | 132 | ) |
97 | 130 | 133 | ||
99 | 131 | ROOT_URLCONF = 'loco_directory.urls' | 134 | ROOT_URLCONF = 'app.urls' |
100 | 132 | 135 | ||
101 | 133 | TEMPLATE_DIRS = ( | 136 | TEMPLATE_DIRS = ( |
102 | 134 | # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". | 137 | # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". |
103 | @@ -151,6 +154,7 @@ | |||
104 | 151 | 'django.contrib.contenttypes', | 154 | 'django.contrib.contenttypes', |
105 | 152 | 'django.contrib.sessions', | 155 | 'django.contrib.sessions', |
106 | 153 | 'django.contrib.admin', | 156 | 'django.contrib.admin', |
107 | 157 | 'django.contrib.messages', | ||
108 | 154 | 'common', | 158 | 'common', |
109 | 155 | 'teams', | 159 | 'teams', |
110 | 156 | 'venues', | 160 | 'venues', |
111 | @@ -159,7 +163,6 @@ | |||
112 | 159 | 'articles', | 163 | 'articles', |
113 | 160 | 'userprofiles', | 164 | 'userprofiles', |
114 | 161 | 'django_openid_auth', | 165 | 'django_openid_auth', |
115 | 162 | 'south', | ||
116 | 163 | ] | 166 | ] |
117 | 164 | 167 | ||
118 | 165 | AUTHENTICATION_BACKENDS = ( | 168 | AUTHENTICATION_BACKENDS = ( |
119 | @@ -169,6 +172,7 @@ | |||
120 | 169 | 172 | ||
121 | 170 | AUTH_PROFILE_MODULE = 'userprofiles.UserProfile' | 173 | AUTH_PROFILE_MODULE = 'userprofiles.UserProfile' |
122 | 171 | 174 | ||
123 | 175 | SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' | ||
124 | 172 | 176 | ||
125 | 173 | OPENID_STRICT_USERNAMES = True | 177 | OPENID_STRICT_USERNAMES = True |
126 | 174 | OPENID_FOLLOW_RENAMES = True | 178 | OPENID_FOLLOW_RENAMES = True |
127 | 175 | 179 | ||
128 | === renamed file 'loco_directory/urls.py' => 'loco_directory/app/urls.py' | |||
129 | --- loco_directory/urls.py 2013-10-30 00:31:14 +0000 | |||
130 | +++ loco_directory/app/urls.py 2016-08-16 07:31:30 +0000 | |||
131 | @@ -1,4 +1,4 @@ | |||
133 | 1 | from django.conf.urls.defaults import * | 1 | from django.conf.urls import * |
134 | 2 | from django.conf import settings | 2 | from django.conf import settings |
135 | 3 | from django.contrib import admin | 3 | from django.contrib import admin |
136 | 4 | import ubuntu_website | 4 | import ubuntu_website |
137 | @@ -7,17 +7,6 @@ | |||
138 | 7 | 7 | ||
139 | 8 | admin.autodiscover() | 8 | admin.autodiscover() |
140 | 9 | 9 | ||
141 | 10 | from events.feeds import TeamEventFeed, GlobalEventFeed | ||
142 | 11 | from meetings.feeds import TeamMeetingFeed | ||
143 | 12 | from teams.feeds import TeamFeed | ||
144 | 13 | |||
145 | 14 | feeds = { | ||
146 | 15 | 'teams': TeamFeed, | ||
147 | 16 | 'events': TeamEventFeed, | ||
148 | 17 | 'globalevents': GlobalEventFeed, | ||
149 | 18 | 'meetings': TeamMeetingFeed, | ||
150 | 19 | } | ||
151 | 20 | |||
152 | 21 | urlpatterns = patterns('', | 10 | urlpatterns = patterns('', |
153 | 22 | url(r'^$', 'common.views.index', name='home'), | 11 | url(r'^$', 'common.views.index', name='home'), |
154 | 23 | url(r'^language/', 'common.views.set_language', name='set_language'), | 12 | url(r'^language/', 'common.views.set_language', name='set_language'), |
155 | @@ -42,7 +31,7 @@ | |||
156 | 42 | url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'), | 31 | url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'), |
157 | 43 | url(r'^services/', include('services.urls')), | 32 | url(r'^services/', include('services.urls')), |
158 | 44 | url(r'^search/', 'common.views.site_search', name='site_search'), | 33 | url(r'^search/', 'common.views.site_search', name='site_search'), |
160 | 45 | url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}, name='feed_view'), | 34 | url(r'^feeds/', include('app.feeds')), |
161 | 46 | url(r'^', include('userprofiles.urls')), | 35 | url(r'^', include('userprofiles.urls')), |
162 | 47 | ) | 36 | ) |
163 | 48 | 37 | ||
164 | 49 | 38 | ||
165 | === renamed file 'loco_directory/version.py' => 'loco_directory/app/version.py' | |||
166 | === modified file 'loco_directory/articles/migrations/0001_initial.py' | |||
167 | --- loco_directory/articles/migrations/0001_initial.py 2011-06-01 22:19:20 +0000 | |||
168 | +++ loco_directory/articles/migrations/0001_initial.py 2016-08-16 07:31:30 +0000 | |||
169 | @@ -1,164 +1,55 @@ | |||
334 | 1 | 1 | # -*- coding: utf-8 -*- | |
335 | 2 | from south.db import db | 2 | from __future__ import unicode_literals |
336 | 3 | from django.db import models | 3 | |
337 | 4 | from articles.models import * | 4 | from django.db import models, migrations |
338 | 5 | 5 | import datetime | |
339 | 6 | class Migration: | 6 | |
340 | 7 | 7 | ||
341 | 8 | def forwards(self, orm): | 8 | class Migration(migrations.Migration): |
342 | 9 | 9 | ||
343 | 10 | # Adding model 'Feed' | 10 | dependencies = [ |
344 | 11 | db.create_table('articles_feed', ( | 11 | ('userprofiles', '0003_userprofile_mugshot'), |
345 | 12 | ('id', orm['articles.Feed:id']), | 12 | ('teams', '0013_team_tz'), |
346 | 13 | ('user', orm['articles.Feed:user']), | 13 | ] |
347 | 14 | ('team', orm['articles.Feed:team']), | 14 | |
348 | 15 | ('url', orm['articles.Feed:url']), | 15 | operations = [ |
349 | 16 | ('title', orm['articles.Feed:title']), | 16 | migrations.CreateModel( |
350 | 17 | ('last_updated', orm['articles.Feed:last_updated']), | 17 | name='Article', |
351 | 18 | ('active', orm['articles.Feed:active']), | 18 | fields=[ |
352 | 19 | )) | 19 | ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), |
353 | 20 | db.send_create_signal('articles', ['Feed']) | 20 | ('uid', models.CharField(max_length=256)), |
354 | 21 | 21 | ('author', models.CharField(max_length=128, null=True, blank=True)), | |
355 | 22 | # Adding model 'Article' | 22 | ('published', models.DateTimeField(null=True, blank=True)), |
356 | 23 | db.create_table('articles_article', ( | 23 | ('imported', models.DateTimeField(null=True, blank=True)), |
357 | 24 | ('id', orm['articles.Article:id']), | 24 | ('link', models.URLField(max_length=1024, null=True, blank=True)), |
358 | 25 | ('source', orm['articles.Article:source']), | 25 | ('title', models.CharField(max_length=128, null=True, blank=True)), |
359 | 26 | ('uid', orm['articles.Article:uid']), | 26 | ('snippet', models.CharField(max_length=512, null=True, blank=True)), |
360 | 27 | ('author', orm['articles.Article:author']), | 27 | ], |
361 | 28 | ('published', orm['articles.Article:published']), | 28 | options={ |
362 | 29 | ('imported', orm['articles.Article:imported']), | 29 | 'ordering': ['-imported', '-published'], |
363 | 30 | ('link', orm['articles.Article:link']), | 30 | }, |
364 | 31 | ('title', orm['articles.Article:title']), | 31 | bases=(models.Model,), |
365 | 32 | ('snippet', orm['articles.Article:snippet']), | 32 | ), |
366 | 33 | )) | 33 | migrations.CreateModel( |
367 | 34 | db.send_create_signal('articles', ['Article']) | 34 | name='Feed', |
368 | 35 | 35 | fields=[ | |
369 | 36 | 36 | ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | |
370 | 37 | 37 | ('url', models.URLField()), | |
371 | 38 | def backwards(self, orm): | 38 | ('title', models.CharField(max_length=128, null=True, blank=True)), |
372 | 39 | 39 | ('last_updated', models.DateTimeField(default=datetime.datetime(1970, 1, 1, 0, 0))), | |
373 | 40 | # Deleting model 'Feed' | 40 | ('active', models.BooleanField(default=True)), |
374 | 41 | db.delete_table('articles_feed') | 41 | ('team', models.ForeignKey(blank=True, to='teams.Team', null=True)), |
375 | 42 | 42 | ('user', models.ForeignKey(blank=True, to='userprofiles.UserProfile', null=True)), | |
376 | 43 | # Deleting model 'Article' | 43 | ], |
377 | 44 | db.delete_table('articles_article') | 44 | options={ |
378 | 45 | 45 | 'ordering': ('title',), | |
379 | 46 | 46 | }, | |
380 | 47 | 47 | bases=(models.Model,), | |
381 | 48 | models = { | 48 | ), |
382 | 49 | 'articles.article': { | 49 | migrations.AddField( |
383 | 50 | 'author': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | 50 | model_name='article', |
384 | 51 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | 51 | name='source', |
385 | 52 | 'imported': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | 52 | field=models.ForeignKey(blank=True, to='articles.Feed', null=True), |
386 | 53 | 'link': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), | 53 | preserve_default=True, |
387 | 54 | 'published': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | 54 | ), |
388 | 55 | 'snippet': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), | 55 | ] |
225 | 56 | 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['articles.Feed']", 'null': 'True', 'blank': 'True'}), | ||
226 | 57 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | ||
227 | 58 | 'uid': ('django.db.models.fields.CharField', [], {'max_length': '256'}) | ||
228 | 59 | }, | ||
229 | 60 | 'articles.feed': { | ||
230 | 61 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
231 | 62 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
232 | 63 | 'last_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1970, 1, 1, 0, 0)'}), | ||
233 | 64 | 'team': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Team']", 'null': 'True', 'blank': 'True'}), | ||
234 | 65 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | ||
235 | 66 | 'url': ('django.db.models.fields.URLField', [], {'max_length': '200'}), | ||
236 | 67 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'}) | ||
237 | 68 | }, | ||
238 | 69 | 'auth.group': { | ||
239 | 70 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
240 | 71 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
241 | 72 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}) | ||
242 | 73 | }, | ||
243 | 74 | 'auth.permission': { | ||
244 | 75 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
245 | 76 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
246 | 77 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
247 | 78 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
248 | 79 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
249 | 80 | }, | ||
250 | 81 | 'auth.user': { | ||
251 | 82 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
252 | 83 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
253 | 84 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
254 | 85 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}), | ||
255 | 86 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
256 | 87 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
257 | 88 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
258 | 89 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
259 | 90 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
260 | 91 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
261 | 92 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
262 | 93 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}), | ||
263 | 94 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
264 | 95 | }, | ||
265 | 96 | 'contenttypes.contenttype': { | ||
266 | 97 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
267 | 98 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
268 | 99 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
269 | 100 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
270 | 101 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
271 | 102 | }, | ||
272 | 103 | 'teams.continent': { | ||
273 | 104 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
274 | 105 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
275 | 106 | }, | ||
276 | 107 | 'teams.country': { | ||
277 | 108 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}), | ||
278 | 109 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
279 | 110 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
280 | 111 | }, | ||
281 | 112 | 'teams.language': { | ||
282 | 113 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
283 | 114 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
284 | 115 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
285 | 116 | }, | ||
286 | 117 | 'teams.team': { | ||
287 | 118 | 'Meta': {'db_table': "'teams'"}, | ||
288 | 119 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
289 | 120 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
290 | 121 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
291 | 122 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
292 | 123 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
293 | 124 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
294 | 125 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}), | ||
295 | 126 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
296 | 127 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
297 | 128 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
298 | 129 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
299 | 130 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
300 | 131 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
301 | 132 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}), | ||
302 | 133 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
303 | 134 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
304 | 135 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
305 | 136 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
306 | 137 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
307 | 138 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
308 | 139 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
309 | 140 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
310 | 141 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
311 | 142 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
312 | 143 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
313 | 144 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
314 | 145 | }, | ||
315 | 146 | 'userprofiles.userprofile': { | ||
316 | 147 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
317 | 148 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
318 | 149 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
319 | 150 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
320 | 151 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
321 | 152 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
322 | 153 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
323 | 154 | 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
324 | 155 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
325 | 156 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
326 | 157 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
327 | 158 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
328 | 159 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
329 | 160 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
330 | 161 | } | ||
331 | 162 | } | ||
332 | 163 | |||
333 | 164 | complete_apps = ['articles'] | ||
389 | 165 | 56 | ||
390 | === added file 'loco_directory/articles/migrations/0002_auto_20160816_0016.py' | |||
391 | --- loco_directory/articles/migrations/0002_auto_20160816_0016.py 1970-01-01 00:00:00 +0000 | |||
392 | +++ loco_directory/articles/migrations/0002_auto_20160816_0016.py 2016-08-16 07:31:30 +0000 | |||
393 | @@ -0,0 +1,24 @@ | |||
394 | 1 | # -*- coding: utf-8 -*- | ||
395 | 2 | from __future__ import unicode_literals | ||
396 | 3 | |||
397 | 4 | from django.db import models, migrations | ||
398 | 5 | |||
399 | 6 | |||
400 | 7 | class Migration(migrations.Migration): | ||
401 | 8 | |||
402 | 9 | dependencies = [ | ||
403 | 10 | ('articles', '0001_initial'), | ||
404 | 11 | ] | ||
405 | 12 | |||
406 | 13 | operations = [ | ||
407 | 14 | migrations.RemoveField( | ||
408 | 15 | model_name='article', | ||
409 | 16 | name='snippet', | ||
410 | 17 | ), | ||
411 | 18 | migrations.AddField( | ||
412 | 19 | model_name='article', | ||
413 | 20 | name='content', | ||
414 | 21 | field=models.TextField(null=True, blank=True), | ||
415 | 22 | preserve_default=True, | ||
416 | 23 | ), | ||
417 | 24 | ] | ||
418 | 0 | 25 | ||
419 | === removed file 'loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py' | |||
420 | --- loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py 2012-12-12 22:38:29 +0000 | |||
421 | +++ loco_directory/articles/migrations/0002_auto__del_field_article_snippet__add_field_article_content.py 1970-01-01 00:00:00 +0000 | |||
422 | @@ -1,153 +0,0 @@ | |||
423 | 1 | # encoding: utf-8 | ||
424 | 2 | import datetime | ||
425 | 3 | from south.db import db | ||
426 | 4 | from south.v2 import SchemaMigration | ||
427 | 5 | from django.db import models | ||
428 | 6 | |||
429 | 7 | class Migration(SchemaMigration): | ||
430 | 8 | |||
431 | 9 | def forwards(self, orm): | ||
432 | 10 | |||
433 | 11 | # Deleting field 'article.snippet' | ||
434 | 12 | db.delete_column('articles_article', 'snippet') | ||
435 | 13 | |||
436 | 14 | # Adding field 'Article.content' | ||
437 | 15 | db.add_column('articles_article', 'content', self.gf('django.db.models.fields.TextField')(null=True, blank=True), keep_default=False) | ||
438 | 16 | |||
439 | 17 | |||
440 | 18 | def backwards(self, orm): | ||
441 | 19 | |||
442 | 20 | # Adding field 'article.snippet' | ||
443 | 21 | db.add_column('articles_article', 'snippet', self.gf('django.db.models.fields.CharField')(max_length=512, null=True, blank=True), keep_default=False) | ||
444 | 22 | |||
445 | 23 | # Deleting field 'Article.content' | ||
446 | 24 | db.delete_column('articles_article', 'content') | ||
447 | 25 | |||
448 | 26 | |||
449 | 27 | models = { | ||
450 | 28 | 'articles.article': { | ||
451 | 29 | 'Meta': {'ordering': "['-imported', '-published']", 'object_name': 'Article'}, | ||
452 | 30 | 'author': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | ||
453 | 31 | 'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
454 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
455 | 33 | 'imported': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
456 | 34 | 'link': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), | ||
457 | 35 | 'published': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), | ||
458 | 36 | 'source': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['articles.Feed']", 'null': 'True', 'blank': 'True'}), | ||
459 | 37 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | ||
460 | 38 | 'uid': ('django.db.models.fields.CharField', [], {'max_length': '256'}) | ||
461 | 39 | }, | ||
462 | 40 | 'articles.feed': { | ||
463 | 41 | 'Meta': {'ordering': "('title',)", 'object_name': 'Feed'}, | ||
464 | 42 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
465 | 43 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
466 | 44 | 'last_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(1970, 1, 1, 0, 0)'}), | ||
467 | 45 | 'team': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Team']", 'null': 'True', 'blank': 'True'}), | ||
468 | 46 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), | ||
469 | 47 | 'url': ('django.db.models.fields.URLField', [], {'max_length': '200'}), | ||
470 | 48 | 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'}) | ||
471 | 49 | }, | ||
472 | 50 | 'auth.group': { | ||
473 | 51 | 'Meta': {'object_name': 'Group'}, | ||
474 | 52 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
475 | 53 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
476 | 54 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
477 | 55 | }, | ||
478 | 56 | 'auth.permission': { | ||
479 | 57 | 'Meta': {'ordering': "('content_type__app_label', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
480 | 58 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
481 | 59 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
482 | 60 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
483 | 61 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
484 | 62 | }, | ||
485 | 63 | 'auth.user': { | ||
486 | 64 | 'Meta': {'object_name': 'User'}, | ||
487 | 65 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
488 | 66 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
489 | 67 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
490 | 68 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
491 | 69 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
492 | 70 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
493 | 71 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
494 | 72 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
495 | 73 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
496 | 74 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
497 | 75 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
498 | 76 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
499 | 77 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
500 | 78 | }, | ||
501 | 79 | 'contenttypes.contenttype': { | ||
502 | 80 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
503 | 81 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
504 | 82 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
505 | 83 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
506 | 84 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
507 | 85 | }, | ||
508 | 86 | 'teams.continent': { | ||
509 | 87 | 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'}, | ||
510 | 88 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
511 | 89 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
512 | 90 | }, | ||
513 | 91 | 'teams.country': { | ||
514 | 92 | 'Meta': {'ordering': "('name',)", 'object_name': 'Country'}, | ||
515 | 93 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
516 | 94 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
517 | 95 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
518 | 96 | }, | ||
519 | 97 | 'teams.language': { | ||
520 | 98 | 'Meta': {'ordering': "('name',)", 'object_name': 'Language'}, | ||
521 | 99 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
522 | 100 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
523 | 101 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
524 | 102 | }, | ||
525 | 103 | 'teams.team': { | ||
526 | 104 | 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"}, | ||
527 | 105 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
528 | 106 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}), | ||
529 | 107 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
530 | 108 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
531 | 109 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
532 | 110 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}), | ||
533 | 111 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
534 | 112 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
535 | 113 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
536 | 114 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
537 | 115 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
538 | 116 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
539 | 117 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
540 | 118 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
541 | 119 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
542 | 120 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
543 | 121 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
544 | 122 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
545 | 123 | 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}), | ||
546 | 124 | 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), | ||
547 | 125 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
548 | 126 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
549 | 127 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
550 | 128 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
551 | 129 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
552 | 130 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
553 | 131 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
554 | 132 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
555 | 133 | }, | ||
556 | 134 | 'userprofiles.userprofile': { | ||
557 | 135 | 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'}, | ||
558 | 136 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
559 | 137 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
560 | 138 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
561 | 139 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
562 | 140 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
563 | 141 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
564 | 142 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
565 | 143 | 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
566 | 144 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
567 | 145 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
568 | 146 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
569 | 147 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
570 | 148 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
571 | 149 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
572 | 150 | } | ||
573 | 151 | } | ||
574 | 152 | |||
575 | 153 | complete_apps = ['articles'] | ||
576 | 154 | 0 | ||
577 | === modified file 'loco_directory/articles/models.py' | |||
578 | --- loco_directory/articles/models.py 2012-12-25 22:00:46 +0000 | |||
579 | +++ loco_directory/articles/models.py 2016-08-16 07:31:30 +0000 | |||
580 | @@ -37,7 +37,7 @@ | |||
581 | 37 | class Feed(models.Model): | 37 | class Feed(models.Model): |
582 | 38 | user = models.ForeignKey(UserProfile, blank=True, null=True) | 38 | user = models.ForeignKey(UserProfile, blank=True, null=True) |
583 | 39 | team = models.ForeignKey(Team, blank=True, null=True) | 39 | team = models.ForeignKey(Team, blank=True, null=True) |
585 | 40 | url = models.URLField(verify_exists=False) | 40 | url = models.URLField() |
586 | 41 | title = models.CharField(max_length=128, null=True, blank=True) | 41 | title = models.CharField(max_length=128, null=True, blank=True) |
587 | 42 | last_updated = models.DateTimeField(null=False, blank=False, default=datetime.datetime(1970, 1, 1)) | 42 | last_updated = models.DateTimeField(null=False, blank=False, default=datetime.datetime(1970, 1, 1)) |
588 | 43 | active = models.BooleanField(default=True) | 43 | active = models.BooleanField(default=True) |
589 | 44 | 44 | ||
590 | === modified file 'loco_directory/articles/urls.py' | |||
591 | --- loco_directory/articles/urls.py 2012-12-13 22:48:12 +0000 | |||
592 | +++ loco_directory/articles/urls.py 2016-08-16 07:31:30 +0000 | |||
593 | @@ -1,5 +1,5 @@ | |||
594 | 1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
596 | 2 | from django.conf.urls.defaults import * | 2 | from django.conf.urls import * |
597 | 3 | 3 | ||
598 | 4 | urlpatterns = patterns('', | 4 | urlpatterns = patterns('', |
599 | 5 | url(r'^(?P<article_id>\d+)-(?P<article_slug>[a-zA-Z0-9\-\.\+?]+)/$', | 5 | url(r'^(?P<article_id>\d+)-(?P<article_slug>[a-zA-Z0-9\-\.\+?]+)/$', |
600 | 6 | 6 | ||
601 | === modified file 'loco_directory/common/management/commands/init.py' | |||
602 | --- loco_directory/common/management/commands/init.py 2013-01-14 21:02:55 +0000 | |||
603 | +++ loco_directory/common/management/commands/init.py 2016-08-16 07:31:30 +0000 | |||
604 | @@ -4,7 +4,7 @@ | |||
605 | 4 | from django.core.management.base import NoArgsCommand | 4 | from django.core.management.base import NoArgsCommand |
606 | 5 | from django.contrib.auth.models import Group | 5 | from django.contrib.auth.models import Group |
607 | 6 | 6 | ||
609 | 7 | import settings | 7 | import app.settings |
610 | 8 | import subprocess | 8 | import subprocess |
611 | 9 | import sys | 9 | import sys |
612 | 10 | import os | 10 | import os |
613 | 11 | 11 | ||
614 | === modified file 'loco_directory/common/mixins.py' | |||
615 | --- loco_directory/common/mixins.py 2012-06-01 23:45:18 +0000 | |||
616 | +++ loco_directory/common/mixins.py 2016-08-16 07:31:30 +0000 | |||
617 | @@ -1,6 +1,5 @@ | |||
618 | 1 | import pytz | 1 | import pytz |
619 | 2 | 2 | ||
620 | 3 | |||
621 | 4 | class LocalTimeMixin(object): | 3 | class LocalTimeMixin(object): |
622 | 5 | '''Provides methods for converting between UTC and localtime | 4 | '''Provides methods for converting between UTC and localtime |
623 | 6 | 5 | ||
624 | @@ -19,12 +18,14 @@ | |||
625 | 19 | 'Converts a datetime in UTC to a datetime in this object\'s timezone' | 18 | 'Converts a datetime in UTC to a datetime in this object\'s timezone' |
626 | 20 | if dt is None: | 19 | if dt is None: |
627 | 21 | return None | 20 | return None |
630 | 22 | as_utc = pytz.utc.localize(dt) | 21 | if dt.tzinfo is None: |
631 | 23 | return as_utc.astimezone(self.timezone) | 22 | dt = pytz.utc.localize(dt) |
632 | 23 | return dt.astimezone(self.timezone) | ||
633 | 24 | 24 | ||
634 | 25 | def fromlocaltime(self, dt): | 25 | def fromlocaltime(self, dt): |
635 | 26 | 'Converts a datetime in this object\'s timezone to a datetime in UTC' | 26 | 'Converts a datetime in this object\'s timezone to a datetime in UTC' |
636 | 27 | if dt is None: | 27 | if dt is None: |
637 | 28 | return None | 28 | return None |
640 | 29 | local = self.timezone.localize(dt) | 29 | if dt.tzinfo is None: |
641 | 30 | return local.astimezone(pytz.utc) | 30 | dt = self.timezone.localize(dt) |
642 | 31 | return dt.astimezone(pytz.utc) | ||
643 | 31 | 32 | ||
644 | === modified file 'loco_directory/common/widgets.py' | |||
645 | --- loco_directory/common/widgets.py 2012-06-01 23:45:18 +0000 | |||
646 | +++ loco_directory/common/widgets.py 2016-08-16 07:31:30 +0000 | |||
647 | @@ -7,14 +7,13 @@ | |||
648 | 7 | from django.utils.safestring import mark_safe | 7 | from django.utils.safestring import mark_safe |
649 | 8 | import copy | 8 | import copy |
650 | 9 | 9 | ||
651 | 10 | |||
652 | 11 | class PopupRelatedFieldWidgetWrapper(forms.Widget): | 10 | class PopupRelatedFieldWidgetWrapper(forms.Widget): |
653 | 12 | """ | 11 | """ |
654 | 13 | This class is a wrapper to a given widget to add the add icon for the | 12 | This class is a wrapper to a given widget to add the add icon for the |
655 | 14 | admin interface. | 13 | admin interface. |
656 | 15 | """ | 14 | """ |
657 | 16 | def __init__(self, widget, popup_url): | 15 | def __init__(self, widget, popup_url): |
659 | 17 | self.is_hidden = widget.is_hidden | 16 | # self.is_hidden = widget.is_hidden |
660 | 18 | self.needs_multipart_form = widget.needs_multipart_form | 17 | self.needs_multipart_form = widget.needs_multipart_form |
661 | 19 | self.attrs = widget.attrs | 18 | self.attrs = widget.attrs |
662 | 20 | self.choices = widget.choices | 19 | self.choices = widget.choices |
663 | 21 | 20 | ||
664 | === modified file 'loco_directory/django.wsgi' | |||
665 | --- loco_directory/django.wsgi 2011-11-11 23:17:48 +0000 | |||
666 | +++ loco_directory/django.wsgi 2016-08-16 07:31:30 +0000 | |||
667 | @@ -15,7 +15,7 @@ | |||
668 | 15 | sys.path.append(parentdir) | 15 | sys.path.append(parentdir) |
669 | 16 | 16 | ||
670 | 17 | # setup environment | 17 | # setup environment |
672 | 18 | os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' | 18 | os.environ['DJANGO_SETTINGS_MODULE'] = 'app.settings' |
673 | 19 | 19 | ||
674 | 20 | # setup application | 20 | # setup application |
675 | 21 | application = django.core.handlers.wsgi.WSGIHandler() | 21 | application = django.core.handlers.wsgi.WSGIHandler() |
676 | 22 | 22 | ||
677 | === modified file 'loco_directory/events/feeds.py' | |||
678 | --- loco_directory/events/feeds.py 2013-03-31 01:15:06 +0000 | |||
679 | +++ loco_directory/events/feeds.py 2016-08-16 07:31:30 +0000 | |||
680 | @@ -1,6 +1,6 @@ | |||
681 | 1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
682 | 2 | from django.core.urlresolvers import reverse | 2 | from django.core.urlresolvers import reverse |
684 | 3 | from django.contrib.syndication.feeds import Feed, FeedDoesNotExist | 3 | from django.contrib.syndication.views import Feed, FeedDoesNotExist |
685 | 4 | from django.utils.translation import ugettext as _ | 4 | from django.utils.translation import ugettext as _ |
686 | 5 | from django.utils import translation | 5 | from django.utils import translation |
687 | 6 | from django.template import loader, Context | 6 | from django.template import loader, Context |
688 | @@ -12,7 +12,9 @@ | |||
689 | 12 | 12 | ||
690 | 13 | 13 | ||
691 | 14 | class TeamEventFeed(Feed): | 14 | class TeamEventFeed(Feed): |
693 | 15 | def get_object(self, bits): | 15 | |
694 | 16 | def get_object(self, request, bits): | ||
695 | 17 | bits = bits.split('/') | ||
696 | 16 | if len(bits) >= 1: | 18 | if len(bits) >= 1: |
697 | 17 | try: | 19 | try: |
698 | 18 | lang = bits[1] | 20 | lang = bits[1] |
699 | 19 | 21 | ||
700 | === modified file 'loco_directory/events/forms.py' | |||
701 | --- loco_directory/events/forms.py 2013-04-08 20:08:25 +0000 | |||
702 | +++ loco_directory/events/forms.py 2016-08-16 07:31:30 +0000 | |||
703 | @@ -38,9 +38,13 @@ | |||
704 | 38 | """ | 38 | """ |
705 | 39 | a form to create/update a BaseEvent | 39 | a form to create/update a BaseEvent |
706 | 40 | """ | 40 | """ |
707 | 41 | |||
708 | 42 | date_begin = forms.SplitDateTimeField(widget=DateTimeWidget) | ||
709 | 43 | date_end = forms.SplitDateTimeField(widget=DateTimeWidget) | ||
710 | 44 | |||
711 | 41 | class Meta: | 45 | class Meta: |
712 | 42 | model = BaseEvent | 46 | model = BaseEvent |
714 | 43 | exclude = ('date_created') | 47 | exclude = ('date_created',) |
715 | 44 | 48 | ||
716 | 45 | class Media: | 49 | class Media: |
717 | 46 | css = {'all': ( | 50 | css = {'all': ( |
718 | @@ -51,10 +55,10 @@ | |||
719 | 51 | settings.MEDIA_URL + 'js/events-ui.js', | 55 | settings.MEDIA_URL + 'js/events-ui.js', |
720 | 52 | ) | 56 | ) |
721 | 53 | 57 | ||
726 | 54 | def __init__(self, *args, **kargs): | 58 | # def __init__(self, *args, **kargs): |
727 | 55 | super(BaseEventForm, self).__init__(*args, **kargs) | 59 | # super(BaseEventForm, self).__init__(*args, **kargs) |
728 | 56 | self.fields['date_begin'].widget = DateTimeWidget() | 60 | # self.fields['date_begin'].widget = DateTimeWidget() |
729 | 57 | self.fields['date_end'].widget = DateTimeWidget() | 61 | # self.fields['date_end'].widget = DateTimeWidget() |
730 | 58 | 62 | ||
731 | 59 | def clean(self): | 63 | def clean(self): |
732 | 60 | begin = self.cleaned_data.get('date_begin') | 64 | begin = self.cleaned_data.get('date_begin') |
733 | @@ -70,7 +74,7 @@ | |||
734 | 70 | """ | 74 | """ |
735 | 71 | class Meta(BaseEventForm.Meta): | 75 | class Meta(BaseEventForm.Meta): |
736 | 72 | model = TeamEvent | 76 | model = TeamEvent |
738 | 73 | exclude = ('teams', 'date_created', 'created_by') | 77 | exclude = ('teams', 'date_created', 'created_by',) |
739 | 74 | 78 | ||
740 | 75 | def __init__(self, teams=[], *args, **kargs): | 79 | def __init__(self, teams=[], *args, **kargs): |
741 | 76 | super(TeamEventForm, self).__init__(*args, **kargs) | 80 | super(TeamEventForm, self).__init__(*args, **kargs) |
742 | @@ -167,7 +171,7 @@ | |||
743 | 167 | """ | 171 | """ |
744 | 168 | class Meta: | 172 | class Meta: |
745 | 169 | model = Attendee | 173 | model = Attendee |
747 | 170 | exclude = ('attendee_profile', 'team_event') | 174 | exclude = ('attendee_profile', 'team_event',) |
748 | 171 | 175 | ||
749 | 172 | 176 | ||
750 | 173 | class TeamEventCommentForm(forms.ModelForm, RenderableMixin): | 177 | class TeamEventCommentForm(forms.ModelForm, RenderableMixin): |
751 | @@ -176,4 +180,4 @@ | |||
752 | 176 | """ | 180 | """ |
753 | 177 | class Meta: | 181 | class Meta: |
754 | 178 | model = TeamEventComment | 182 | model = TeamEventComment |
756 | 179 | exclude = ('team_event', 'date_created', 'commenter_profile') | 183 | exclude = ('team_event', 'date_created', 'commenter_profile',) |
757 | 180 | 184 | ||
758 | === modified file 'loco_directory/events/migrations/0001_initial.py' | |||
759 | --- loco_directory/events/migrations/0001_initial.py 2010-02-04 00:39:29 +0000 | |||
760 | +++ loco_directory/events/migrations/0001_initial.py 2016-08-16 07:31:30 +0000 | |||
761 | @@ -1,205 +1,91 @@ | |||
967 | 1 | 1 | # -*- coding: utf-8 -*- | |
968 | 2 | from south.db import db | 2 | from __future__ import unicode_literals |
969 | 3 | from django.db import models | 3 | |
970 | 4 | from events.models import * | 4 | from django.db import models, migrations |
971 | 5 | 5 | import datetime | |
972 | 6 | class Migration: | 6 | from django.conf import settings |
973 | 7 | 7 | ||
974 | 8 | def forwards(self, orm): | 8 | |
975 | 9 | 9 | class Migration(migrations.Migration): | |
976 | 10 | # Adding model 'BaseEvent' | 10 | |
977 | 11 | db.create_table('events_baseevent', ( | 11 | dependencies = [ |
978 | 12 | ('id', orm['events.BaseEvent:id']), | 12 | migrations.swappable_dependency(settings.AUTH_USER_MODEL), |
979 | 13 | ('name', orm['events.BaseEvent:name']), | 13 | ('venues', '0001_initial'), |
980 | 14 | ('date_begin', orm['events.BaseEvent:date_begin']), | 14 | ('teams', '0001_initial'), |
981 | 15 | ('date_end', orm['events.BaseEvent:date_end']), | 15 | ] |
982 | 16 | ('description', orm['events.BaseEvent:description']), | 16 | |
983 | 17 | ('announce', orm['events.BaseEvent:announce']), | 17 | operations = [ |
984 | 18 | ('date_created', orm['events.BaseEvent:date_created']), | 18 | migrations.CreateModel( |
985 | 19 | )) | 19 | name='Attendee', |
986 | 20 | db.send_create_signal('events', ['BaseEvent']) | 20 | fields=[ |
987 | 21 | 21 | ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | |
988 | 22 | # Adding model 'TeamEvent' | 22 | ('promise', models.CharField(help_text='how safe do you come', max_length=50, choices=[(b'sure', 'come for sure'), (b'maybe', 'maybe coming'), (b'not', 'not coming')])), |
989 | 23 | db.create_table('events_teamevent', ( | 23 | ('guests', models.PositiveSmallIntegerField(help_text='the number of guests coming with attendee')), |
990 | 24 | ('baseevent_ptr', orm['events.TeamEvent:baseevent_ptr']), | 24 | ('attendee', models.ForeignKey(help_text='the name of the attendee', to=settings.AUTH_USER_MODEL)), |
991 | 25 | ('global_event', orm['events.TeamEvent:global_event']), | 25 | ], |
992 | 26 | ('venue', orm['events.TeamEvent:venue']), | 26 | options={ |
993 | 27 | )) | 27 | }, |
994 | 28 | db.send_create_signal('events', ['TeamEvent']) | 28 | bases=(models.Model,), |
995 | 29 | 29 | ), | |
996 | 30 | # Adding model 'GlobalEvent' | 30 | migrations.CreateModel( |
997 | 31 | db.create_table('events_globalevent', ( | 31 | name='BaseEvent', |
998 | 32 | ('baseevent_ptr', orm['events.GlobalEvent:baseevent_ptr']), | 32 | fields=[ |
999 | 33 | ('microbloghashtag', orm['events.GlobalEvent:microbloghashtag']), | 33 | ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), |
1000 | 34 | ('pictag', orm['events.GlobalEvent:pictag']), | 34 | ('name', models.CharField(max_length=150, verbose_name='Name of the Event')), |
1001 | 35 | )) | 35 | ('date_begin', models.DateTimeField(help_text='start date and local time of the event', verbose_name='Begins', db_index=True)), |
1002 | 36 | db.send_create_signal('events', ['GlobalEvent']) | 36 | ('date_end', models.DateTimeField(help_text='end date and local time of the event', verbose_name='Ends', db_index=True)), |
1003 | 37 | 37 | ('description', models.TextField(help_text='Description of the Event', null=True, blank=True)), | |
1004 | 38 | # Adding model 'TeamEventComment' | 38 | ('announce', models.URLField(help_text='URL to the announcement', null=True, blank=True)), |
1005 | 39 | db.create_table('events_teameventcomment', ( | 39 | ('date_created', models.DateTimeField(default=datetime.datetime.now, help_text='the date and time when the event was created', db_index=True)), |
1006 | 40 | ('id', orm['events.TeamEventComment:id']), | 40 | ], |
1007 | 41 | ('team_event', orm['events.TeamEventComment:team_event']), | 41 | options={ |
1008 | 42 | ('date_created', orm['events.TeamEventComment:date_created']), | 42 | }, |
1009 | 43 | ('comment_by', orm['events.TeamEventComment:comment_by']), | 43 | bases=(models.Model,), |
1010 | 44 | ('comment', orm['events.TeamEventComment:comment']), | 44 | ), |
1011 | 45 | )) | 45 | migrations.CreateModel( |
1012 | 46 | db.send_create_signal('events', ['TeamEventComment']) | 46 | name='GlobalEvent', |
1013 | 47 | 47 | fields=[ | |
1014 | 48 | # Adding model 'Attendee' | 48 | ('baseevent_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='events.BaseEvent')), |
1015 | 49 | db.create_table('events_attendee', ( | 49 | ('microbloghashtag', models.CharField(help_text='Hash Tag used for microbloggers to mention this event', max_length=50, null=True, verbose_name='Microblogging Hash Tag', blank=True)), |
1016 | 50 | ('id', orm['events.Attendee:id']), | 50 | ('pictag', models.CharField(help_text='tag used in welb albums like; picasa, flickr, and more', max_length=50, null=True, verbose_name='Picture Tag', blank=True)), |
1017 | 51 | ('team_event', orm['events.Attendee:team_event']), | 51 | ], |
1018 | 52 | ('attendee', orm['events.Attendee:attendee']), | 52 | options={ |
1019 | 53 | ('promise', orm['events.Attendee:promise']), | 53 | }, |
1020 | 54 | ('guests', orm['events.Attendee:guests']), | 54 | bases=('events.baseevent',), |
1021 | 55 | )) | 55 | ), |
1022 | 56 | db.send_create_signal('events', ['Attendee']) | 56 | migrations.CreateModel( |
1023 | 57 | 57 | name='TeamEvent', | |
1024 | 58 | # Adding ManyToManyField 'TeamEvent.teams' | 58 | fields=[ |
1025 | 59 | db.create_table('events_teamevent_teams', ( | 59 | ('baseevent_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='events.BaseEvent')), |
1026 | 60 | ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), | 60 | ('global_event', models.ForeignKey(blank=True, to='events.GlobalEvent', help_text='this team event is part of the selected global event', null=True, verbose_name='Related Global Event')), |
1027 | 61 | ('teamevent', models.ForeignKey(orm.TeamEvent, null=False)), | 61 | ('teams', models.ManyToManyField(help_text='teams of this event.', to='teams.Team', verbose_name='Teams Participating', db_index=True)), |
1028 | 62 | ('team', models.ForeignKey(orm['teams.Team'], null=False)) | 62 | ('venue', models.ForeignKey(blank=True, to='venues.Venue', help_text='Venue of the Event', null=True, verbose_name='Venue of the Event')), |
1029 | 63 | )) | 63 | ], |
1030 | 64 | 64 | options={ | |
1031 | 65 | # Creating unique_together for [team_event, attendee] on Attendee. | 65 | }, |
1032 | 66 | db.create_unique('events_attendee', ['team_event_id', 'attendee_id']) | 66 | bases=('events.baseevent',), |
1033 | 67 | 67 | ), | |
1034 | 68 | 68 | migrations.CreateModel( | |
1035 | 69 | 69 | name='TeamEventComment', | |
1036 | 70 | def backwards(self, orm): | 70 | fields=[ |
1037 | 71 | 71 | ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | |
1038 | 72 | # Deleting unique_together for [team_event, attendee] on Attendee. | 72 | ('date_created', models.DateTimeField(default=datetime.datetime.now, help_text='the date and time when the event comment was created', db_index=True)), |
1039 | 73 | db.delete_unique('events_attendee', ['team_event_id', 'attendee_id']) | 73 | ('comment', models.TextField(help_text='Comment this Event', db_index=True)), |
1040 | 74 | 74 | ('comment_by', models.ForeignKey(to=settings.AUTH_USER_MODEL)), | |
1041 | 75 | # Deleting model 'BaseEvent' | 75 | ('team_event', models.ForeignKey(help_text='the Team Event', to='events.TeamEvent')), |
1042 | 76 | db.delete_table('events_baseevent') | 76 | ], |
1043 | 77 | 77 | options={ | |
1044 | 78 | # Deleting model 'TeamEvent' | 78 | }, |
1045 | 79 | db.delete_table('events_teamevent') | 79 | bases=(models.Model,), |
1046 | 80 | 80 | ), | |
1047 | 81 | # Deleting model 'GlobalEvent' | 81 | migrations.AddField( |
1048 | 82 | db.delete_table('events_globalevent') | 82 | model_name='attendee', |
1049 | 83 | 83 | name='team_event', | |
1050 | 84 | # Deleting model 'TeamEventComment' | 84 | field=models.ForeignKey(help_text='the Team Event', to='events.TeamEvent'), |
1051 | 85 | db.delete_table('events_teameventcomment') | 85 | preserve_default=True, |
1052 | 86 | 86 | ), | |
1053 | 87 | # Deleting model 'Attendee' | 87 | migrations.AlterUniqueTogether( |
1054 | 88 | db.delete_table('events_attendee') | 88 | name='attendee', |
1055 | 89 | 89 | unique_together=set([('team_event', 'attendee')]), | |
1056 | 90 | # Dropping ManyToManyField 'TeamEvent.teams' | 90 | ), |
1057 | 91 | db.delete_table('events_teamevent_teams') | 91 | ] |
853 | 92 | |||
854 | 93 | |||
855 | 94 | |||
856 | 95 | models = { | ||
857 | 96 | 'auth.group': { | ||
858 | 97 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
859 | 98 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
860 | 99 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}) | ||
861 | 100 | }, | ||
862 | 101 | 'auth.permission': { | ||
863 | 102 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
864 | 103 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
865 | 104 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
866 | 105 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
867 | 106 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
868 | 107 | }, | ||
869 | 108 | 'auth.user': { | ||
870 | 109 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
871 | 110 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
872 | 111 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
873 | 112 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}), | ||
874 | 113 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
875 | 114 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
876 | 115 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
877 | 116 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
878 | 117 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
879 | 118 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
880 | 119 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
881 | 120 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}), | ||
882 | 121 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
883 | 122 | }, | ||
884 | 123 | 'contenttypes.contenttype': { | ||
885 | 124 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
886 | 125 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
887 | 126 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
888 | 127 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
889 | 128 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
890 | 129 | }, | ||
891 | 130 | 'events.attendee': { | ||
892 | 131 | 'Meta': {'unique_together': "(('team_event', 'attendee'),)"}, | ||
893 | 132 | 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), | ||
894 | 133 | 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), | ||
895 | 134 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
896 | 135 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
897 | 136 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
898 | 137 | }, | ||
899 | 138 | 'events.baseevent': { | ||
900 | 139 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
901 | 140 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
902 | 141 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 2, 4, 0, 38, 13, 583247)', 'db_index': 'True'}), | ||
903 | 142 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
904 | 143 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
905 | 144 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
906 | 145 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
907 | 146 | }, | ||
908 | 147 | 'events.globalevent': { | ||
909 | 148 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
910 | 149 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
911 | 150 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
912 | 151 | }, | ||
913 | 152 | 'events.teamevent': { | ||
914 | 153 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
915 | 154 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
916 | 155 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}), | ||
917 | 156 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
918 | 157 | }, | ||
919 | 158 | 'events.teameventcomment': { | ||
920 | 159 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
921 | 160 | 'comment_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), | ||
922 | 161 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 2, 4, 0, 38, 13, 587465)', 'db_index': 'True'}), | ||
923 | 162 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
924 | 163 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
925 | 164 | }, | ||
926 | 165 | 'teams.team': { | ||
927 | 166 | 'Meta': {'db_table': "'teams'"}, | ||
928 | 167 | 'admins': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.TeamAdministrator']"}), | ||
929 | 168 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
930 | 169 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
931 | 170 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
932 | 171 | 'country': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
933 | 172 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
934 | 173 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
935 | 174 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
936 | 175 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
937 | 176 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
938 | 177 | 'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}), | ||
939 | 178 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
940 | 179 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
941 | 180 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
942 | 181 | 'owner': ('django.db.models.fields.SlugField', [], {'max_length': '50', 'null': 'True', 'db_index': 'True'}), | ||
943 | 182 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
944 | 183 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
945 | 184 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
946 | 185 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
947 | 186 | }, | ||
948 | 187 | 'teams.teamadministrator': { | ||
949 | 188 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
950 | 189 | 'lpid': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'db_index': 'True'}) | ||
951 | 190 | }, | ||
952 | 191 | 'venues.venue': { | ||
953 | 192 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
954 | 193 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
955 | 194 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
956 | 195 | 'country': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
957 | 196 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
958 | 197 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
959 | 198 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
960 | 199 | 'map_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
961 | 200 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
962 | 201 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
963 | 202 | } | ||
964 | 203 | } | ||
965 | 204 | |||
966 | 205 | complete_apps = ['events'] | ||
1058 | 206 | 92 | ||
1059 | === removed file 'loco_directory/events/migrations/0002_add_profile_fields.py' | |||
1060 | --- loco_directory/events/migrations/0002_add_profile_fields.py 2010-08-19 11:38:55 +0000 | |||
1061 | +++ loco_directory/events/migrations/0002_add_profile_fields.py 1970-01-01 00:00:00 +0000 | |||
1062 | @@ -1,170 +0,0 @@ | |||
1063 | 1 | |||
1064 | 2 | from south.db import db | ||
1065 | 3 | from django.db import models | ||
1066 | 4 | from events.models import * | ||
1067 | 5 | |||
1068 | 6 | class Migration: | ||
1069 | 7 | depends_on = ( | ||
1070 | 8 | ("userprofiles", "0001_initial"), | ||
1071 | 9 | ) | ||
1072 | 10 | |||
1073 | 11 | def forwards(self, orm): | ||
1074 | 12 | |||
1075 | 13 | # Adding field 'TeamEventComment.commenter_profile' | ||
1076 | 14 | db.add_column('events_teameventcomment', 'commenter_profile', orm['events.TeamEventComment:commenter_profile']) | ||
1077 | 15 | |||
1078 | 16 | # Adding field 'Attendee.attendee_profile' | ||
1079 | 17 | db.add_column('events_attendee', 'attendee_profile', orm['events.Attendee:attendee_profile']) | ||
1080 | 18 | |||
1081 | 19 | |||
1082 | 20 | |||
1083 | 21 | def backwards(self, orm): | ||
1084 | 22 | |||
1085 | 23 | # Deleting field 'TeamEventComment.commenter_profile' | ||
1086 | 24 | db.delete_column('events_teameventcomment', 'commenter_profile_id') | ||
1087 | 25 | |||
1088 | 26 | # Deleting field 'Attendee.attendee_profile' | ||
1089 | 27 | db.delete_column('events_attendee', 'attendee_profile_id') | ||
1090 | 28 | |||
1091 | 29 | |||
1092 | 30 | |||
1093 | 31 | models = { | ||
1094 | 32 | 'auth.group': { | ||
1095 | 33 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1096 | 34 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
1097 | 35 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}) | ||
1098 | 36 | }, | ||
1099 | 37 | 'auth.permission': { | ||
1100 | 38 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
1101 | 39 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1102 | 40 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
1103 | 41 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1104 | 42 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
1105 | 43 | }, | ||
1106 | 44 | 'auth.user': { | ||
1107 | 45 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
1108 | 46 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
1109 | 47 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
1110 | 48 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}), | ||
1111 | 49 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1112 | 50 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
1113 | 51 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1114 | 52 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1115 | 53 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
1116 | 54 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
1117 | 55 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
1118 | 56 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}), | ||
1119 | 57 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
1120 | 58 | }, | ||
1121 | 59 | 'contenttypes.contenttype': { | ||
1122 | 60 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
1123 | 61 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1124 | 62 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1125 | 63 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1126 | 64 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
1127 | 65 | }, | ||
1128 | 66 | 'events.attendee': { | ||
1129 | 67 | 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"}, | ||
1130 | 68 | 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), | ||
1131 | 69 | 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
1132 | 70 | 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), | ||
1133 | 71 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1134 | 72 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
1135 | 73 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
1136 | 74 | }, | ||
1137 | 75 | 'events.baseevent': { | ||
1138 | 76 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1139 | 77 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
1140 | 78 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 9, 53, 607179)', 'db_index': 'True'}), | ||
1141 | 79 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
1142 | 80 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
1143 | 81 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1144 | 82 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
1145 | 83 | }, | ||
1146 | 84 | 'events.globalevent': { | ||
1147 | 85 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
1148 | 86 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1149 | 87 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
1150 | 88 | }, | ||
1151 | 89 | 'events.teamevent': { | ||
1152 | 90 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
1153 | 91 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
1154 | 92 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}), | ||
1155 | 93 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
1156 | 94 | }, | ||
1157 | 95 | 'events.teameventcomment': { | ||
1158 | 96 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
1159 | 97 | 'comment_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), | ||
1160 | 98 | 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
1161 | 99 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 9, 53, 613146)', 'db_index': 'True'}), | ||
1162 | 100 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1163 | 101 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
1164 | 102 | }, | ||
1165 | 103 | 'teams.continent': { | ||
1166 | 104 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1167 | 105 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
1168 | 106 | }, | ||
1169 | 107 | 'teams.country': { | ||
1170 | 108 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}), | ||
1171 | 109 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1172 | 110 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
1173 | 111 | }, | ||
1174 | 112 | 'teams.language': { | ||
1175 | 113 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
1176 | 114 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1177 | 115 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
1178 | 116 | }, | ||
1179 | 117 | 'teams.team': { | ||
1180 | 118 | 'Meta': {'db_table': "'teams'"}, | ||
1181 | 119 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
1182 | 120 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1183 | 121 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
1184 | 122 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1185 | 123 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
1186 | 124 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}), | ||
1187 | 125 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
1188 | 126 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
1189 | 127 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1190 | 128 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1191 | 129 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
1192 | 130 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}), | ||
1193 | 131 | 'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}), | ||
1194 | 132 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1195 | 133 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1196 | 134 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
1197 | 135 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
1198 | 136 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
1199 | 137 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1200 | 138 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1201 | 139 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
1202 | 140 | }, | ||
1203 | 141 | 'userprofiles.userprofile': { | ||
1204 | 142 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1205 | 143 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1206 | 144 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1207 | 145 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1208 | 146 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1209 | 147 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1210 | 148 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1211 | 149 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1212 | 150 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
1213 | 151 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1214 | 152 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
1215 | 153 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
1216 | 154 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
1217 | 155 | }, | ||
1218 | 156 | 'venues.venue': { | ||
1219 | 157 | 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"}, | ||
1220 | 158 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
1221 | 159 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
1222 | 160 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
1223 | 161 | 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}), | ||
1224 | 162 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1225 | 163 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
1226 | 164 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
1227 | 165 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
1228 | 166 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
1229 | 167 | } | ||
1230 | 168 | } | ||
1231 | 169 | |||
1232 | 170 | complete_apps = ['events'] | ||
1233 | 171 | 0 | ||
1234 | === added file 'loco_directory/events/migrations/0002_auto_20160815_2321.py' | |||
1235 | --- loco_directory/events/migrations/0002_auto_20160815_2321.py 1970-01-01 00:00:00 +0000 | |||
1236 | +++ loco_directory/events/migrations/0002_auto_20160815_2321.py 2016-08-16 07:31:30 +0000 | |||
1237 | @@ -0,0 +1,24 @@ | |||
1238 | 1 | # -*- coding: utf-8 -*- | ||
1239 | 2 | from __future__ import unicode_literals | ||
1240 | 3 | |||
1241 | 4 | from django.db import models, migrations | ||
1242 | 5 | |||
1243 | 6 | |||
1244 | 7 | class Migration(migrations.Migration): | ||
1245 | 8 | |||
1246 | 9 | dependencies = [ | ||
1247 | 10 | ('events', '0001_initial'), | ||
1248 | 11 | ] | ||
1249 | 12 | |||
1250 | 13 | operations = [ | ||
1251 | 14 | migrations.AlterField( | ||
1252 | 15 | model_name='attendee', | ||
1253 | 16 | name='guests', | ||
1254 | 17 | field=models.PositiveSmallIntegerField(verbose_name='Additional Guests'), | ||
1255 | 18 | ), | ||
1256 | 19 | migrations.AlterField( | ||
1257 | 20 | model_name='attendee', | ||
1258 | 21 | name='promise', | ||
1259 | 22 | field=models.CharField(max_length=50, verbose_name='Attending Status', choices=[(b'sure', 'attending'), (b'maybe', 'might be attending'), (b'not', 'not attending')]), | ||
1260 | 23 | ), | ||
1261 | 24 | ] | ||
1262 | 0 | 25 | ||
1263 | === added file 'loco_directory/events/migrations/0003_auto_20160815_2328.py' | |||
1264 | --- loco_directory/events/migrations/0003_auto_20160815_2328.py 1970-01-01 00:00:00 +0000 | |||
1265 | +++ loco_directory/events/migrations/0003_auto_20160815_2328.py 2016-08-16 07:31:30 +0000 | |||
1266 | @@ -0,0 +1,44 @@ | |||
1267 | 1 | # -*- coding: utf-8 -*- | ||
1268 | 2 | from __future__ import unicode_literals | ||
1269 | 3 | |||
1270 | 4 | from django.db import models, migrations | ||
1271 | 5 | |||
1272 | 6 | |||
1273 | 7 | class Migration(migrations.Migration): | ||
1274 | 8 | |||
1275 | 9 | dependencies = [ | ||
1276 | 10 | ('userprofiles', '0001_initial'), | ||
1277 | 11 | ('events', '0002_auto_20160815_2321'), | ||
1278 | 12 | ] | ||
1279 | 13 | |||
1280 | 14 | operations = [ | ||
1281 | 15 | migrations.RemoveField( | ||
1282 | 16 | model_name='attendee', | ||
1283 | 17 | name='attendee', | ||
1284 | 18 | ), | ||
1285 | 19 | migrations.RemoveField( | ||
1286 | 20 | model_name='teameventcomment', | ||
1287 | 21 | name='comment_by', | ||
1288 | 22 | ), | ||
1289 | 23 | migrations.AddField( | ||
1290 | 24 | model_name='attendee', | ||
1291 | 25 | name='attendee_profile', | ||
1292 | 26 | field=models.ForeignKey(to='userprofiles.UserProfile', help_text='the name of the attendee', null=True), | ||
1293 | 27 | preserve_default=True, | ||
1294 | 28 | ), | ||
1295 | 29 | migrations.AddField( | ||
1296 | 30 | model_name='teameventcomment', | ||
1297 | 31 | name='commenter_profile', | ||
1298 | 32 | field=models.ForeignKey(to='userprofiles.UserProfile', null=True), | ||
1299 | 33 | preserve_default=True, | ||
1300 | 34 | ), | ||
1301 | 35 | migrations.AlterField( | ||
1302 | 36 | model_name='globalevent', | ||
1303 | 37 | name='pictag', | ||
1304 | 38 | field=models.CharField(help_text='tag used in web albums like; picasa, flickr, and more', max_length=50, null=True, verbose_name='Picture Tag', blank=True), | ||
1305 | 39 | ), | ||
1306 | 40 | migrations.AlterUniqueTogether( | ||
1307 | 41 | name='attendee', | ||
1308 | 42 | unique_together=set([('team_event', 'attendee_profile')]), | ||
1309 | 43 | ), | ||
1310 | 44 | ] | ||
1311 | 0 | 45 | ||
1312 | === removed file 'loco_directory/events/migrations/0003_migrate_profile_data.py' | |||
1313 | --- loco_directory/events/migrations/0003_migrate_profile_data.py 2010-08-18 14:15:44 +0000 | |||
1314 | +++ loco_directory/events/migrations/0003_migrate_profile_data.py 1970-01-01 00:00:00 +0000 | |||
1315 | @@ -1,173 +0,0 @@ | |||
1316 | 1 | |||
1317 | 2 | from south.db import db | ||
1318 | 3 | from django.db import models | ||
1319 | 4 | from events.models import * | ||
1320 | 5 | |||
1321 | 6 | class Migration: | ||
1322 | 7 | |||
1323 | 8 | def forwards(self, orm): | ||
1324 | 9 | for comment in orm['events.TeamEventComment'].objects.all(): | ||
1325 | 10 | if not comment.commenter_profile: | ||
1326 | 11 | commenter_profile, created = orm['userprofiles.UserProfile'].objects.get_or_create(user=comment.comment_by) | ||
1327 | 12 | if created: | ||
1328 | 13 | commenter_profile.save() | ||
1329 | 14 | comment.commenter_profile = commenter_profile | ||
1330 | 15 | comment.save() | ||
1331 | 16 | for attendee in orm['events.Attendee'].objects.all(): | ||
1332 | 17 | if not attendee.attendee_profile: | ||
1333 | 18 | attendee_profile, created = orm['userprofiles.UserProfile'].objects.get_or_create(user=attendee.attendee) | ||
1334 | 19 | if created: | ||
1335 | 20 | attendee_profile.save() | ||
1336 | 21 | attendee.attendee_profile = attendee_profile | ||
1337 | 22 | attendee.save() | ||
1338 | 23 | |||
1339 | 24 | def backwards(self, orm): | ||
1340 | 25 | for comment in orm['events.TeamEventComment'].objects.all(): | ||
1341 | 26 | if not comment.comment_by: | ||
1342 | 27 | comment.comment_by = comment.commenter_profile.user | ||
1343 | 28 | comment.save() | ||
1344 | 29 | for attendee in orm['events.Attendee'].objects.all(): | ||
1345 | 30 | if not attendee.attendee: | ||
1346 | 31 | attendee.attendee = attendee.attendee_profile.user | ||
1347 | 32 | attendee.save() | ||
1348 | 33 | |||
1349 | 34 | models = { | ||
1350 | 35 | 'auth.group': { | ||
1351 | 36 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1352 | 37 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
1353 | 38 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}) | ||
1354 | 39 | }, | ||
1355 | 40 | 'auth.permission': { | ||
1356 | 41 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
1357 | 42 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1358 | 43 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
1359 | 44 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1360 | 45 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
1361 | 46 | }, | ||
1362 | 47 | 'auth.user': { | ||
1363 | 48 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
1364 | 49 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
1365 | 50 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
1366 | 51 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}), | ||
1367 | 52 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1368 | 53 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
1369 | 54 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1370 | 55 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1371 | 56 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
1372 | 57 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
1373 | 58 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
1374 | 59 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}), | ||
1375 | 60 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
1376 | 61 | }, | ||
1377 | 62 | 'contenttypes.contenttype': { | ||
1378 | 63 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
1379 | 64 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1380 | 65 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1381 | 66 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1382 | 67 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
1383 | 68 | }, | ||
1384 | 69 | 'events.attendee': { | ||
1385 | 70 | 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"}, | ||
1386 | 71 | 'attendee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), | ||
1387 | 72 | 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
1388 | 73 | 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), | ||
1389 | 74 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1390 | 75 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
1391 | 76 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
1392 | 77 | }, | ||
1393 | 78 | 'events.baseevent': { | ||
1394 | 79 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1395 | 80 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
1396 | 81 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 10, 3, 333840)', 'db_index': 'True'}), | ||
1397 | 82 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
1398 | 83 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
1399 | 84 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1400 | 85 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
1401 | 86 | }, | ||
1402 | 87 | 'events.globalevent': { | ||
1403 | 88 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
1404 | 89 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1405 | 90 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
1406 | 91 | }, | ||
1407 | 92 | 'events.teamevent': { | ||
1408 | 93 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
1409 | 94 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
1410 | 95 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}), | ||
1411 | 96 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
1412 | 97 | }, | ||
1413 | 98 | 'events.teameventcomment': { | ||
1414 | 99 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
1415 | 100 | 'comment_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), | ||
1416 | 101 | 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
1417 | 102 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 10, 3, 336191)', 'db_index': 'True'}), | ||
1418 | 103 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1419 | 104 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
1420 | 105 | }, | ||
1421 | 106 | 'teams.continent': { | ||
1422 | 107 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1423 | 108 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
1424 | 109 | }, | ||
1425 | 110 | 'teams.country': { | ||
1426 | 111 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}), | ||
1427 | 112 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1428 | 113 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
1429 | 114 | }, | ||
1430 | 115 | 'teams.language': { | ||
1431 | 116 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
1432 | 117 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1433 | 118 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
1434 | 119 | }, | ||
1435 | 120 | 'teams.team': { | ||
1436 | 121 | 'Meta': {'db_table': "'teams'"}, | ||
1437 | 122 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
1438 | 123 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1439 | 124 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
1440 | 125 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1441 | 126 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
1442 | 127 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}), | ||
1443 | 128 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
1444 | 129 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
1445 | 130 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1446 | 131 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1447 | 132 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
1448 | 133 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}), | ||
1449 | 134 | 'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}), | ||
1450 | 135 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1451 | 136 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1452 | 137 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
1453 | 138 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
1454 | 139 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
1455 | 140 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1456 | 141 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1457 | 142 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
1458 | 143 | }, | ||
1459 | 144 | 'userprofiles.userprofile': { | ||
1460 | 145 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1461 | 146 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1462 | 147 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1463 | 148 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1464 | 149 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1465 | 150 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1466 | 151 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1467 | 152 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1468 | 153 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
1469 | 154 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1470 | 155 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
1471 | 156 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
1472 | 157 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
1473 | 158 | }, | ||
1474 | 159 | 'venues.venue': { | ||
1475 | 160 | 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"}, | ||
1476 | 161 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
1477 | 162 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
1478 | 163 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
1479 | 164 | 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}), | ||
1480 | 165 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1481 | 166 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
1482 | 167 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
1483 | 168 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
1484 | 169 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
1485 | 170 | } | ||
1486 | 171 | } | ||
1487 | 172 | |||
1488 | 173 | complete_apps = ['events'] | ||
1489 | 174 | 0 | ||
1490 | === added file 'loco_directory/events/migrations/0004_auto_20160815_2334.py' | |||
1491 | --- loco_directory/events/migrations/0004_auto_20160815_2334.py 1970-01-01 00:00:00 +0000 | |||
1492 | +++ loco_directory/events/migrations/0004_auto_20160815_2334.py 2016-08-16 07:31:30 +0000 | |||
1493 | @@ -0,0 +1,29 @@ | |||
1494 | 1 | # -*- coding: utf-8 -*- | ||
1495 | 2 | from __future__ import unicode_literals | ||
1496 | 3 | |||
1497 | 4 | from django.db import models, migrations | ||
1498 | 5 | |||
1499 | 6 | |||
1500 | 7 | class Migration(migrations.Migration): | ||
1501 | 8 | |||
1502 | 9 | dependencies = [ | ||
1503 | 10 | ('events', '0003_auto_20160815_2328'), | ||
1504 | 11 | ] | ||
1505 | 12 | |||
1506 | 13 | operations = [ | ||
1507 | 14 | migrations.AlterField( | ||
1508 | 15 | model_name='baseevent', | ||
1509 | 16 | name='announce', | ||
1510 | 17 | field=models.URLField(help_text='URL to the announcement', null=True, verbose_name='Announcement', blank=True), | ||
1511 | 18 | ), | ||
1512 | 19 | migrations.AlterField( | ||
1513 | 20 | model_name='baseevent', | ||
1514 | 21 | name='name', | ||
1515 | 22 | field=models.CharField(max_length=150, verbose_name='Event Name'), | ||
1516 | 23 | ), | ||
1517 | 24 | migrations.AlterField( | ||
1518 | 25 | model_name='teamevent', | ||
1519 | 26 | name='venue', | ||
1520 | 27 | field=models.ForeignKey(blank=True, to='venues.Venue', help_text='Venue of the Event', null=True, verbose_name='Event Venue'), | ||
1521 | 28 | ), | ||
1522 | 29 | ] | ||
1523 | 0 | 30 | ||
1524 | === removed file 'loco_directory/events/migrations/0004_remove_user.py' | |||
1525 | --- loco_directory/events/migrations/0004_remove_user.py 2010-08-18 14:15:44 +0000 | |||
1526 | +++ loco_directory/events/migrations/0004_remove_user.py 1970-01-01 00:00:00 +0000 | |||
1527 | @@ -1,181 +0,0 @@ | |||
1528 | 1 | |||
1529 | 2 | from south.db import db | ||
1530 | 3 | from django.db import models | ||
1531 | 4 | from events.models import * | ||
1532 | 5 | |||
1533 | 6 | class Migration: | ||
1534 | 7 | |||
1535 | 8 | def forwards(self, orm): | ||
1536 | 9 | |||
1537 | 10 | # Deleting field 'TeamEventComment.comment_by' | ||
1538 | 11 | db.delete_column('events_teameventcomment', 'comment_by_id') | ||
1539 | 12 | |||
1540 | 13 | # Deleting field 'Attendee.attendee' | ||
1541 | 14 | db.delete_column('events_attendee', 'attendee_id') | ||
1542 | 15 | |||
1543 | 16 | # Changing field 'BaseEvent.date_created' | ||
1544 | 17 | # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 11, 17, 963571), db_index=True)) | ||
1545 | 18 | db.alter_column('events_baseevent', 'date_created', orm['events.baseevent:date_created']) | ||
1546 | 19 | |||
1547 | 20 | # Changing field 'TeamEventComment.date_created' | ||
1548 | 21 | # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 11, 17, 966242), db_index=True)) | ||
1549 | 22 | db.alter_column('events_teameventcomment', 'date_created', orm['events.teameventcomment:date_created']) | ||
1550 | 23 | |||
1551 | 24 | |||
1552 | 25 | |||
1553 | 26 | def backwards(self, orm): | ||
1554 | 27 | |||
1555 | 28 | # Adding field 'TeamEventComment.comment_by' | ||
1556 | 29 | db.add_column('events_teameventcomment', 'comment_by', orm['events.teameventcomment:comment_by']) | ||
1557 | 30 | |||
1558 | 31 | # Adding field 'Attendee.attendee' | ||
1559 | 32 | db.add_column('events_attendee', 'attendee', orm['events.attendee:attendee']) | ||
1560 | 33 | |||
1561 | 34 | # Changing field 'BaseEvent.date_created' | ||
1562 | 35 | # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 10, 3, 333840), db_index=True)) | ||
1563 | 36 | db.alter_column('events_baseevent', 'date_created', orm['events.baseevent:date_created']) | ||
1564 | 37 | |||
1565 | 38 | # Changing field 'TeamEventComment.date_created' | ||
1566 | 39 | # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 8, 18, 10, 10, 3, 336191), db_index=True)) | ||
1567 | 40 | db.alter_column('events_teameventcomment', 'date_created', orm['events.teameventcomment:date_created']) | ||
1568 | 41 | |||
1569 | 42 | |||
1570 | 43 | |||
1571 | 44 | models = { | ||
1572 | 45 | 'auth.group': { | ||
1573 | 46 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1574 | 47 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
1575 | 48 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}) | ||
1576 | 49 | }, | ||
1577 | 50 | 'auth.permission': { | ||
1578 | 51 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
1579 | 52 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1580 | 53 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
1581 | 54 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1582 | 55 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
1583 | 56 | }, | ||
1584 | 57 | 'auth.user': { | ||
1585 | 58 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
1586 | 59 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
1587 | 60 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
1588 | 61 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'blank': 'True'}), | ||
1589 | 62 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1590 | 63 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
1591 | 64 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1592 | 65 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1593 | 66 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
1594 | 67 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
1595 | 68 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
1596 | 69 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'blank': 'True'}), | ||
1597 | 70 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
1598 | 71 | }, | ||
1599 | 72 | 'contenttypes.contenttype': { | ||
1600 | 73 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
1601 | 74 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1602 | 75 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1603 | 76 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1604 | 77 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
1605 | 78 | }, | ||
1606 | 79 | 'events.attendee': { | ||
1607 | 80 | 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"}, | ||
1608 | 81 | 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
1609 | 82 | 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), | ||
1610 | 83 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1611 | 84 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
1612 | 85 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
1613 | 86 | }, | ||
1614 | 87 | 'events.baseevent': { | ||
1615 | 88 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1616 | 89 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
1617 | 90 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 11, 17, 963571)', 'db_index': 'True'}), | ||
1618 | 91 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
1619 | 92 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
1620 | 93 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1621 | 94 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
1622 | 95 | }, | ||
1623 | 96 | 'events.globalevent': { | ||
1624 | 97 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
1625 | 98 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1626 | 99 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
1627 | 100 | }, | ||
1628 | 101 | 'events.teamevent': { | ||
1629 | 102 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
1630 | 103 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
1631 | 104 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True'}), | ||
1632 | 105 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
1633 | 106 | }, | ||
1634 | 107 | 'events.teameventcomment': { | ||
1635 | 108 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
1636 | 109 | 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
1637 | 110 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 8, 18, 10, 11, 17, 966242)', 'db_index': 'True'}), | ||
1638 | 111 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1639 | 112 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
1640 | 113 | }, | ||
1641 | 114 | 'teams.continent': { | ||
1642 | 115 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1643 | 116 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
1644 | 117 | }, | ||
1645 | 118 | 'teams.country': { | ||
1646 | 119 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']"}), | ||
1647 | 120 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1648 | 121 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
1649 | 122 | }, | ||
1650 | 123 | 'teams.language': { | ||
1651 | 124 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
1652 | 125 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1653 | 126 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
1654 | 127 | }, | ||
1655 | 128 | 'teams.team': { | ||
1656 | 129 | 'Meta': {'db_table': "'teams'"}, | ||
1657 | 130 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
1658 | 131 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1659 | 132 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
1660 | 133 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1661 | 134 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
1662 | 135 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']"}), | ||
1663 | 136 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
1664 | 137 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
1665 | 138 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1666 | 139 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1667 | 140 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
1668 | 141 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']"}), | ||
1669 | 142 | 'lp_name': ('django.db.models.fields.SlugField', [], {'max_length': '40', 'null': 'True', 'db_index': 'True'}), | ||
1670 | 143 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1671 | 144 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1672 | 145 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
1673 | 146 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
1674 | 147 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
1675 | 148 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1676 | 149 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1677 | 150 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
1678 | 151 | }, | ||
1679 | 152 | 'userprofiles.userprofile': { | ||
1680 | 153 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1681 | 154 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1682 | 155 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1683 | 156 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1684 | 157 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1685 | 158 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1686 | 159 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1687 | 160 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1688 | 161 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
1689 | 162 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1690 | 163 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
1691 | 164 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
1692 | 165 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
1693 | 166 | }, | ||
1694 | 167 | 'venues.venue': { | ||
1695 | 168 | 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"}, | ||
1696 | 169 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
1697 | 170 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
1698 | 171 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
1699 | 172 | 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}), | ||
1700 | 173 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1701 | 174 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
1702 | 175 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
1703 | 176 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
1704 | 177 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
1705 | 178 | } | ||
1706 | 179 | } | ||
1707 | 180 | |||
1708 | 181 | complete_apps = ['events'] | ||
1709 | 182 | 0 | ||
1710 | === removed file 'loco_directory/events/migrations/0005_allow_external_registration.py' | |||
1711 | --- loco_directory/events/migrations/0005_allow_external_registration.py 2010-11-27 03:56:49 +0000 | |||
1712 | +++ loco_directory/events/migrations/0005_allow_external_registration.py 1970-01-01 00:00:00 +0000 | |||
1713 | @@ -1,166 +0,0 @@ | |||
1714 | 1 | |||
1715 | 2 | from south.db import db | ||
1716 | 3 | from django.db import models | ||
1717 | 4 | from events.models import * | ||
1718 | 5 | |||
1719 | 6 | class Migration: | ||
1720 | 7 | |||
1721 | 8 | def forwards(self, orm): | ||
1722 | 9 | |||
1723 | 10 | # Adding field 'TeamEvent.registration' | ||
1724 | 11 | db.add_column('events_teamevent', 'registration', orm['events.teamevent:registration']) | ||
1725 | 12 | |||
1726 | 13 | |||
1727 | 14 | def backwards(self, orm): | ||
1728 | 15 | |||
1729 | 16 | # Deleting field 'TeamEvent.registration' | ||
1730 | 17 | db.delete_column('events_teamevent', 'registration') | ||
1731 | 18 | |||
1732 | 19 | |||
1733 | 20 | |||
1734 | 21 | |||
1735 | 22 | models = { | ||
1736 | 23 | 'auth.group': { | ||
1737 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1738 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
1739 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
1740 | 27 | }, | ||
1741 | 28 | 'auth.permission': { | ||
1742 | 29 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
1743 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1744 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
1745 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1746 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
1747 | 34 | }, | ||
1748 | 35 | 'auth.user': { | ||
1749 | 36 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
1750 | 37 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
1751 | 38 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
1752 | 39 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
1753 | 40 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1754 | 41 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
1755 | 42 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1756 | 43 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1757 | 44 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
1758 | 45 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
1759 | 46 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
1760 | 47 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
1761 | 48 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
1762 | 49 | }, | ||
1763 | 50 | 'contenttypes.contenttype': { | ||
1764 | 51 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
1765 | 52 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1766 | 53 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1767 | 54 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1768 | 55 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
1769 | 56 | }, | ||
1770 | 57 | 'events.attendee': { | ||
1771 | 58 | 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"}, | ||
1772 | 59 | 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
1773 | 60 | 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), | ||
1774 | 61 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1775 | 62 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
1776 | 63 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
1777 | 64 | }, | ||
1778 | 65 | 'events.baseevent': { | ||
1779 | 66 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1780 | 67 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
1781 | 68 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 11, 27, 3, 51, 37, 209550)', 'db_index': 'True'}), | ||
1782 | 69 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
1783 | 70 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
1784 | 71 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1785 | 72 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
1786 | 73 | }, | ||
1787 | 74 | 'events.globalevent': { | ||
1788 | 75 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
1789 | 76 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1790 | 77 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
1791 | 78 | }, | ||
1792 | 79 | 'events.teamevent': { | ||
1793 | 80 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
1794 | 81 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
1795 | 82 | 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1796 | 83 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}), | ||
1797 | 84 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
1798 | 85 | }, | ||
1799 | 86 | 'events.teameventcomment': { | ||
1800 | 87 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
1801 | 88 | 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
1802 | 89 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 11, 27, 3, 51, 37, 215508)', 'db_index': 'True'}), | ||
1803 | 90 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1804 | 91 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
1805 | 92 | }, | ||
1806 | 93 | 'teams.continent': { | ||
1807 | 94 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1808 | 95 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
1809 | 96 | }, | ||
1810 | 97 | 'teams.country': { | ||
1811 | 98 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
1812 | 99 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1813 | 100 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
1814 | 101 | }, | ||
1815 | 102 | 'teams.language': { | ||
1816 | 103 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
1817 | 104 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1818 | 105 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
1819 | 106 | }, | ||
1820 | 107 | 'teams.team': { | ||
1821 | 108 | 'Meta': {'db_table': "'teams'"}, | ||
1822 | 109 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
1823 | 110 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
1824 | 111 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1825 | 112 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
1826 | 113 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1827 | 114 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
1828 | 115 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
1829 | 116 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
1830 | 117 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
1831 | 118 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
1832 | 119 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1833 | 120 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1834 | 121 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
1835 | 122 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
1836 | 123 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
1837 | 124 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1838 | 125 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1839 | 126 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
1840 | 127 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
1841 | 128 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
1842 | 129 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
1843 | 130 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
1844 | 131 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1845 | 132 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1846 | 133 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
1847 | 134 | }, | ||
1848 | 135 | 'userprofiles.userprofile': { | ||
1849 | 136 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1850 | 137 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
1851 | 138 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1852 | 139 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1853 | 140 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1854 | 141 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1855 | 142 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1856 | 143 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1857 | 144 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
1858 | 145 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
1859 | 146 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
1860 | 147 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
1861 | 148 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
1862 | 149 | }, | ||
1863 | 150 | 'venues.venue': { | ||
1864 | 151 | 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"}, | ||
1865 | 152 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
1866 | 153 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
1867 | 154 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
1868 | 155 | 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}), | ||
1869 | 156 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1870 | 157 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
1871 | 158 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
1872 | 159 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
1873 | 160 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
1874 | 161 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
1875 | 162 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
1876 | 163 | } | ||
1877 | 164 | } | ||
1878 | 165 | |||
1879 | 166 | complete_apps = ['events'] | ||
1880 | 167 | 0 | ||
1881 | === added file 'loco_directory/events/migrations/0005_teamevent_registration.py' | |||
1882 | --- loco_directory/events/migrations/0005_teamevent_registration.py 1970-01-01 00:00:00 +0000 | |||
1883 | +++ loco_directory/events/migrations/0005_teamevent_registration.py 2016-08-16 07:31:30 +0000 | |||
1884 | @@ -0,0 +1,20 @@ | |||
1885 | 1 | # -*- coding: utf-8 -*- | ||
1886 | 2 | from __future__ import unicode_literals | ||
1887 | 3 | |||
1888 | 4 | from django.db import models, migrations | ||
1889 | 5 | |||
1890 | 6 | |||
1891 | 7 | class Migration(migrations.Migration): | ||
1892 | 8 | |||
1893 | 9 | dependencies = [ | ||
1894 | 10 | ('events', '0004_auto_20160815_2334'), | ||
1895 | 11 | ] | ||
1896 | 12 | |||
1897 | 13 | operations = [ | ||
1898 | 14 | migrations.AddField( | ||
1899 | 15 | model_name='teamevent', | ||
1900 | 16 | name='registration', | ||
1901 | 17 | field=models.URLField(help_text='URL to register attendance (leave blank to use the built-in registration system)', null=True, verbose_name='Registration URL', blank=True), | ||
1902 | 18 | preserve_default=True, | ||
1903 | 19 | ), | ||
1904 | 20 | ] | ||
1905 | 0 | 21 | ||
1906 | === added file 'loco_directory/events/migrations/0006_auto_20160815_2352.py' | |||
1907 | --- loco_directory/events/migrations/0006_auto_20160815_2352.py 1970-01-01 00:00:00 +0000 | |||
1908 | +++ loco_directory/events/migrations/0006_auto_20160815_2352.py 2016-08-16 07:31:30 +0000 | |||
1909 | @@ -0,0 +1,40 @@ | |||
1910 | 1 | # -*- coding: utf-8 -*- | ||
1911 | 2 | from __future__ import unicode_literals | ||
1912 | 3 | |||
1913 | 4 | from django.db import models, migrations | ||
1914 | 5 | |||
1915 | 6 | |||
1916 | 7 | class Migration(migrations.Migration): | ||
1917 | 8 | |||
1918 | 9 | dependencies = [ | ||
1919 | 10 | ('events', '0005_teamevent_registration'), | ||
1920 | 11 | ] | ||
1921 | 12 | |||
1922 | 13 | operations = [ | ||
1923 | 14 | migrations.AddField( | ||
1924 | 15 | model_name='teamevent', | ||
1925 | 16 | name='channel', | ||
1926 | 17 | field=models.CharField(help_text='Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl', max_length=25, null=True, verbose_name='Event Channel', blank=True), | ||
1927 | 18 | preserve_default=True, | ||
1928 | 19 | ), | ||
1929 | 20 | migrations.AlterField( | ||
1930 | 21 | model_name='baseevent', | ||
1931 | 22 | name='date_begin', | ||
1932 | 23 | field=models.DateTimeField(help_text='Local date and time the event starts', verbose_name='Begins', db_index=True), | ||
1933 | 24 | ), | ||
1934 | 25 | migrations.AlterField( | ||
1935 | 26 | model_name='baseevent', | ||
1936 | 27 | name='date_end', | ||
1937 | 28 | field=models.DateTimeField(help_text='Local date and time the event ends', verbose_name='Ends', db_index=True), | ||
1938 | 29 | ), | ||
1939 | 30 | migrations.AlterField( | ||
1940 | 31 | model_name='teamevent', | ||
1941 | 32 | name='venue', | ||
1942 | 33 | field=models.ForeignKey(blank=True, to='venues.Venue', help_text='Venue for the Event', null=True, verbose_name='Event Venue'), | ||
1943 | 34 | ), | ||
1944 | 35 | migrations.AlterField( | ||
1945 | 36 | model_name='teameventcomment', | ||
1946 | 37 | name='comment', | ||
1947 | 38 | field=models.TextField(help_text='Enter your comment for this event.', db_index=True), | ||
1948 | 39 | ), | ||
1949 | 40 | ] | ||
1950 | 0 | 41 | ||
1951 | === removed file 'loco_directory/events/migrations/0006_event_channel.py' | |||
1952 | --- loco_directory/events/migrations/0006_event_channel.py 2011-05-14 12:38:08 +0000 | |||
1953 | +++ loco_directory/events/migrations/0006_event_channel.py 1970-01-01 00:00:00 +0000 | |||
1954 | @@ -1,169 +0,0 @@ | |||
1955 | 1 | |||
1956 | 2 | from south.db import db | ||
1957 | 3 | from django.db import models | ||
1958 | 4 | from events.models import * | ||
1959 | 5 | |||
1960 | 6 | class Migration: | ||
1961 | 7 | |||
1962 | 8 | def forwards(self, orm): | ||
1963 | 9 | |||
1964 | 10 | # Adding field 'TeamEvent.channel' | ||
1965 | 11 | db.add_column('events_teamevent', 'channel', orm['events.teamevent:channel']) | ||
1966 | 12 | |||
1967 | 13 | |||
1968 | 14 | |||
1969 | 15 | def backwards(self, orm): | ||
1970 | 16 | |||
1971 | 17 | # Deleting field 'TeamEvent.channel' | ||
1972 | 18 | db.delete_column('events_teamevent', 'channel') | ||
1973 | 19 | |||
1974 | 20 | |||
1975 | 21 | |||
1976 | 22 | models = { | ||
1977 | 23 | 'auth.group': { | ||
1978 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1979 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
1980 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
1981 | 27 | }, | ||
1982 | 28 | 'auth.permission': { | ||
1983 | 29 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
1984 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
1985 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
1986 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1987 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
1988 | 34 | }, | ||
1989 | 35 | 'auth.user': { | ||
1990 | 36 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
1991 | 37 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
1992 | 38 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
1993 | 39 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
1994 | 40 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
1995 | 41 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
1996 | 42 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1997 | 43 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
1998 | 44 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
1999 | 45 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
2000 | 46 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
2001 | 47 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
2002 | 48 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
2003 | 49 | }, | ||
2004 | 50 | 'contenttypes.contenttype': { | ||
2005 | 51 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
2006 | 52 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2007 | 53 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2008 | 54 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2009 | 55 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
2010 | 56 | }, | ||
2011 | 57 | 'events.attendee': { | ||
2012 | 58 | 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"}, | ||
2013 | 59 | 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2014 | 60 | 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), | ||
2015 | 61 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2016 | 62 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
2017 | 63 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
2018 | 64 | }, | ||
2019 | 65 | 'events.baseevent': { | ||
2020 | 66 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2021 | 67 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
2022 | 68 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 5, 14, 12, 33, 17, 45383)', 'db_index': 'True'}), | ||
2023 | 69 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
2024 | 70 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2025 | 71 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2026 | 72 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
2027 | 73 | }, | ||
2028 | 74 | 'events.globalevent': { | ||
2029 | 75 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
2030 | 76 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2031 | 77 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
2032 | 78 | }, | ||
2033 | 79 | 'events.teamevent': { | ||
2034 | 80 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
2035 | 81 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2036 | 82 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
2037 | 83 | 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2038 | 84 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}), | ||
2039 | 85 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
2040 | 86 | }, | ||
2041 | 87 | 'events.teameventcomment': { | ||
2042 | 88 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
2043 | 89 | 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2044 | 90 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 5, 14, 12, 33, 17, 48101)', 'db_index': 'True'}), | ||
2045 | 91 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2046 | 92 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
2047 | 93 | }, | ||
2048 | 94 | 'teams.continent': { | ||
2049 | 95 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2050 | 96 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
2051 | 97 | }, | ||
2052 | 98 | 'teams.country': { | ||
2053 | 99 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
2054 | 100 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2055 | 101 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
2056 | 102 | }, | ||
2057 | 103 | 'teams.language': { | ||
2058 | 104 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
2059 | 105 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2060 | 106 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
2061 | 107 | }, | ||
2062 | 108 | 'teams.team': { | ||
2063 | 109 | 'Meta': {'db_table': "'teams'"}, | ||
2064 | 110 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
2065 | 111 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
2066 | 112 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
2067 | 113 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
2068 | 114 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2069 | 115 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
2070 | 116 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
2071 | 117 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
2072 | 118 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
2073 | 119 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2074 | 120 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2075 | 121 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2076 | 122 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2077 | 123 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
2078 | 124 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
2079 | 125 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2080 | 126 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2081 | 127 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2082 | 128 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
2083 | 129 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
2084 | 130 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2085 | 131 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2086 | 132 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
2087 | 133 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2088 | 134 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2089 | 135 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
2090 | 136 | }, | ||
2091 | 137 | 'userprofiles.userprofile': { | ||
2092 | 138 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2093 | 139 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2094 | 140 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2095 | 141 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2096 | 142 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2097 | 143 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2098 | 144 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2099 | 145 | 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2100 | 146 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2101 | 147 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
2102 | 148 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2103 | 149 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2104 | 150 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
2105 | 151 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
2106 | 152 | }, | ||
2107 | 153 | 'venues.venue': { | ||
2108 | 154 | 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"}, | ||
2109 | 155 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2110 | 156 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2111 | 157 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2112 | 158 | 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}), | ||
2113 | 159 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2114 | 160 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
2115 | 161 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
2116 | 162 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
2117 | 163 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2118 | 164 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2119 | 165 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
2120 | 166 | } | ||
2121 | 167 | } | ||
2122 | 168 | |||
2123 | 169 | complete_apps = ['events'] | ||
2124 | 170 | 0 | ||
2125 | === added file 'loco_directory/events/migrations/0007_auto_20160815_2359.py' | |||
2126 | --- loco_directory/events/migrations/0007_auto_20160815_2359.py 1970-01-01 00:00:00 +0000 | |||
2127 | +++ loco_directory/events/migrations/0007_auto_20160815_2359.py 2016-08-16 07:31:30 +0000 | |||
2128 | @@ -0,0 +1,47 @@ | |||
2129 | 1 | # -*- coding: utf-8 -*- | ||
2130 | 2 | from __future__ import unicode_literals | ||
2131 | 3 | |||
2132 | 4 | from django.db import models, migrations | ||
2133 | 5 | import datetime | ||
2134 | 6 | |||
2135 | 7 | |||
2136 | 8 | class Migration(migrations.Migration): | ||
2137 | 9 | |||
2138 | 10 | dependencies = [ | ||
2139 | 11 | ('userprofiles', '0003_userprofile_mugshot'), | ||
2140 | 12 | ('events', '0006_auto_20160815_2352'), | ||
2141 | 13 | ] | ||
2142 | 14 | |||
2143 | 15 | operations = [ | ||
2144 | 16 | migrations.AddField( | ||
2145 | 17 | model_name='teamevent', | ||
2146 | 18 | name='contact', | ||
2147 | 19 | field=models.ForeignKey(verbose_name='Event Contact', to='userprofiles.UserProfile', help_text='Contact person for this event.', null=True), | ||
2148 | 20 | preserve_default=True, | ||
2149 | 21 | ), | ||
2150 | 22 | migrations.AlterField( | ||
2151 | 23 | model_name='baseevent', | ||
2152 | 24 | name='announce', | ||
2153 | 25 | field=models.URLField(help_text='URL for the announcement', null=True, verbose_name='Announcement', blank=True), | ||
2154 | 26 | ), | ||
2155 | 27 | migrations.AlterField( | ||
2156 | 28 | model_name='baseevent', | ||
2157 | 29 | name='date_begin', | ||
2158 | 30 | field=models.DateTimeField(help_text='Local date and time that the event starts', verbose_name='Begins', db_index=True), | ||
2159 | 31 | ), | ||
2160 | 32 | migrations.AlterField( | ||
2161 | 33 | model_name='baseevent', | ||
2162 | 34 | name='date_end', | ||
2163 | 35 | field=models.DateTimeField(help_text='Local date and time that the event ends', verbose_name='Ends', db_index=True), | ||
2164 | 36 | ), | ||
2165 | 37 | migrations.AlterField( | ||
2166 | 38 | model_name='teamevent', | ||
2167 | 39 | name='teams', | ||
2168 | 40 | field=models.ManyToManyField(help_text='teams planning this event.', to=b'teams.Team', verbose_name='Teams Participating', db_index=True), | ||
2169 | 41 | ), | ||
2170 | 42 | migrations.AlterField( | ||
2171 | 43 | model_name='teameventcomment', | ||
2172 | 44 | name='date_created', | ||
2173 | 45 | field=models.DateTimeField(default=datetime.datetime.now, help_text='Comment date and time', db_index=True), | ||
2174 | 46 | ), | ||
2175 | 47 | ] | ||
2176 | 0 | 48 | ||
2177 | === removed file 'loco_directory/events/migrations/0007_event_contact.py' | |||
2178 | --- loco_directory/events/migrations/0007_event_contact.py 2011-06-29 23:33:23 +0000 | |||
2179 | +++ loco_directory/events/migrations/0007_event_contact.py 1970-01-01 00:00:00 +0000 | |||
2180 | @@ -1,171 +0,0 @@ | |||
2181 | 1 | |||
2182 | 2 | from south.db import db | ||
2183 | 3 | from django.db import models | ||
2184 | 4 | from events.models import * | ||
2185 | 5 | |||
2186 | 6 | class Migration: | ||
2187 | 7 | |||
2188 | 8 | def forwards(self, orm): | ||
2189 | 9 | |||
2190 | 10 | # Adding field 'TeamEvent.contact' | ||
2191 | 11 | db.add_column('events_teamevent', 'contact', orm['events.teamevent:contact']) | ||
2192 | 12 | |||
2193 | 13 | |||
2194 | 14 | |||
2195 | 15 | def backwards(self, orm): | ||
2196 | 16 | |||
2197 | 17 | # Deleting field 'TeamEvent.contact' | ||
2198 | 18 | db.delete_column('events_teamevent', 'contact_id') | ||
2199 | 19 | |||
2200 | 20 | |||
2201 | 21 | |||
2202 | 22 | models = { | ||
2203 | 23 | 'auth.group': { | ||
2204 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2205 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
2206 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
2207 | 27 | }, | ||
2208 | 28 | 'auth.permission': { | ||
2209 | 29 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
2210 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2211 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
2212 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2213 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
2214 | 34 | }, | ||
2215 | 35 | 'auth.user': { | ||
2216 | 36 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
2217 | 37 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
2218 | 38 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
2219 | 39 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
2220 | 40 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2221 | 41 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
2222 | 42 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
2223 | 43 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
2224 | 44 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
2225 | 45 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
2226 | 46 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
2227 | 47 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
2228 | 48 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
2229 | 49 | }, | ||
2230 | 50 | 'contenttypes.contenttype': { | ||
2231 | 51 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
2232 | 52 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2233 | 53 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2234 | 54 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2235 | 55 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
2236 | 56 | }, | ||
2237 | 57 | 'events.attendee': { | ||
2238 | 58 | 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)"}, | ||
2239 | 59 | 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2240 | 60 | 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), | ||
2241 | 61 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2242 | 62 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
2243 | 63 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
2244 | 64 | }, | ||
2245 | 65 | 'events.baseevent': { | ||
2246 | 66 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2247 | 67 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
2248 | 68 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 6, 29, 23, 33, 3, 429621)', 'db_index': 'True'}), | ||
2249 | 69 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
2250 | 70 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2251 | 71 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2252 | 72 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
2253 | 73 | }, | ||
2254 | 74 | 'events.globalevent': { | ||
2255 | 75 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
2256 | 76 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2257 | 77 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
2258 | 78 | }, | ||
2259 | 79 | 'events.teamevent': { | ||
2260 | 80 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
2261 | 81 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2262 | 82 | 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2263 | 83 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
2264 | 84 | 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2265 | 85 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}), | ||
2266 | 86 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
2267 | 87 | }, | ||
2268 | 88 | 'events.teameventcomment': { | ||
2269 | 89 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
2270 | 90 | 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2271 | 91 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 6, 29, 23, 33, 3, 432997)', 'db_index': 'True'}), | ||
2272 | 92 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2273 | 93 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
2274 | 94 | }, | ||
2275 | 95 | 'teams.continent': { | ||
2276 | 96 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2277 | 97 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
2278 | 98 | }, | ||
2279 | 99 | 'teams.country': { | ||
2280 | 100 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
2281 | 101 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2282 | 102 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
2283 | 103 | }, | ||
2284 | 104 | 'teams.language': { | ||
2285 | 105 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
2286 | 106 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2287 | 107 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
2288 | 108 | }, | ||
2289 | 109 | 'teams.team': { | ||
2290 | 110 | 'Meta': {'db_table': "'teams'"}, | ||
2291 | 111 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
2292 | 112 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
2293 | 113 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
2294 | 114 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
2295 | 115 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2296 | 116 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
2297 | 117 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
2298 | 118 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
2299 | 119 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
2300 | 120 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2301 | 121 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2302 | 122 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2303 | 123 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2304 | 124 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
2305 | 125 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
2306 | 126 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2307 | 127 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2308 | 128 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2309 | 129 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
2310 | 130 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
2311 | 131 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2312 | 132 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2313 | 133 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
2314 | 134 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2315 | 135 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2316 | 136 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2317 | 137 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
2318 | 138 | }, | ||
2319 | 139 | 'userprofiles.userprofile': { | ||
2320 | 140 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2321 | 141 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2322 | 142 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2323 | 143 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2324 | 144 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2325 | 145 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2326 | 146 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2327 | 147 | 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2328 | 148 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2329 | 149 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
2330 | 150 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2331 | 151 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2332 | 152 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
2333 | 153 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
2334 | 154 | }, | ||
2335 | 155 | 'venues.venue': { | ||
2336 | 156 | 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))"}, | ||
2337 | 157 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2338 | 158 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2339 | 159 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2340 | 160 | 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}), | ||
2341 | 161 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2342 | 162 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
2343 | 163 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
2344 | 164 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
2345 | 165 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2346 | 166 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2347 | 167 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
2348 | 168 | } | ||
2349 | 169 | } | ||
2350 | 170 | |||
2351 | 171 | complete_apps = ['events'] | ||
2352 | 172 | 0 | ||
2353 | === removed file 'loco_directory/events/migrations/0008_add_global_event_channel.py' | |||
2354 | --- loco_directory/events/migrations/0008_add_global_event_channel.py 2012-02-06 15:06:39 +0000 | |||
2355 | +++ loco_directory/events/migrations/0008_add_global_event_channel.py 1970-01-01 00:00:00 +0000 | |||
2356 | @@ -1,183 +0,0 @@ | |||
2357 | 1 | # encoding: utf-8 | ||
2358 | 2 | import datetime | ||
2359 | 3 | from south.db import db | ||
2360 | 4 | from south.v2 import SchemaMigration | ||
2361 | 5 | from django.db import models | ||
2362 | 6 | |||
2363 | 7 | class Migration(SchemaMigration): | ||
2364 | 8 | |||
2365 | 9 | def forwards(self, orm): | ||
2366 | 10 | |||
2367 | 11 | # Adding field 'GlobalEvent.channel' | ||
2368 | 12 | db.add_column('events_globalevent', 'channel', self.gf('django.db.models.fields.CharField')(max_length=25, null=True, blank=True), keep_default=False) | ||
2369 | 13 | |||
2370 | 14 | |||
2371 | 15 | def backwards(self, orm): | ||
2372 | 16 | |||
2373 | 17 | # Deleting field 'GlobalEvent.channel' | ||
2374 | 18 | db.delete_column('events_globalevent', 'channel') | ||
2375 | 19 | |||
2376 | 20 | |||
2377 | 21 | models = { | ||
2378 | 22 | 'auth.group': { | ||
2379 | 23 | 'Meta': {'object_name': 'Group'}, | ||
2380 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2381 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
2382 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
2383 | 27 | }, | ||
2384 | 28 | 'auth.permission': { | ||
2385 | 29 | 'Meta': {'ordering': "('content_type__app_label', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
2386 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2387 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
2388 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2389 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
2390 | 34 | }, | ||
2391 | 35 | 'auth.user': { | ||
2392 | 36 | 'Meta': {'object_name': 'User'}, | ||
2393 | 37 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
2394 | 38 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
2395 | 39 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
2396 | 40 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
2397 | 41 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2398 | 42 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
2399 | 43 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
2400 | 44 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
2401 | 45 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
2402 | 46 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
2403 | 47 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
2404 | 48 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
2405 | 49 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
2406 | 50 | }, | ||
2407 | 51 | 'contenttypes.contenttype': { | ||
2408 | 52 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
2409 | 53 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2410 | 54 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2411 | 55 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2412 | 56 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
2413 | 57 | }, | ||
2414 | 58 | 'events.attendee': { | ||
2415 | 59 | 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'}, | ||
2416 | 60 | 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2417 | 61 | 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), | ||
2418 | 62 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2419 | 63 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
2420 | 64 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
2421 | 65 | }, | ||
2422 | 66 | 'events.baseevent': { | ||
2423 | 67 | 'Meta': {'object_name': 'BaseEvent'}, | ||
2424 | 68 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2425 | 69 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
2426 | 70 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 2, 6, 15, 0, 9, 281269)', 'db_index': 'True'}), | ||
2427 | 71 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
2428 | 72 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2429 | 73 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2430 | 74 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
2431 | 75 | }, | ||
2432 | 76 | 'events.globalevent': { | ||
2433 | 77 | 'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']}, | ||
2434 | 78 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
2435 | 79 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2436 | 80 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2437 | 81 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
2438 | 82 | }, | ||
2439 | 83 | 'events.teamevent': { | ||
2440 | 84 | 'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']}, | ||
2441 | 85 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
2442 | 86 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2443 | 87 | 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2444 | 88 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
2445 | 89 | 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2446 | 90 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}), | ||
2447 | 91 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
2448 | 92 | }, | ||
2449 | 93 | 'events.teameventcomment': { | ||
2450 | 94 | 'Meta': {'object_name': 'TeamEventComment'}, | ||
2451 | 95 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
2452 | 96 | 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2453 | 97 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 2, 6, 15, 0, 9, 283350)', 'db_index': 'True'}), | ||
2454 | 98 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2455 | 99 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
2456 | 100 | }, | ||
2457 | 101 | 'teams.continent': { | ||
2458 | 102 | 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'}, | ||
2459 | 103 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2460 | 104 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
2461 | 105 | }, | ||
2462 | 106 | 'teams.country': { | ||
2463 | 107 | 'Meta': {'ordering': "('name',)", 'object_name': 'Country'}, | ||
2464 | 108 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
2465 | 109 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2466 | 110 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
2467 | 111 | }, | ||
2468 | 112 | 'teams.language': { | ||
2469 | 113 | 'Meta': {'ordering': "('name',)", 'object_name': 'Language'}, | ||
2470 | 114 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
2471 | 115 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2472 | 116 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
2473 | 117 | }, | ||
2474 | 118 | 'teams.team': { | ||
2475 | 119 | 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"}, | ||
2476 | 120 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
2477 | 121 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}), | ||
2478 | 122 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
2479 | 123 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
2480 | 124 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2481 | 125 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}), | ||
2482 | 126 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
2483 | 127 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
2484 | 128 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
2485 | 129 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2486 | 130 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2487 | 131 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2488 | 132 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2489 | 133 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
2490 | 134 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
2491 | 135 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2492 | 136 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2493 | 137 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2494 | 138 | 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}), | ||
2495 | 139 | 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), | ||
2496 | 140 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
2497 | 141 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2498 | 142 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2499 | 143 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
2500 | 144 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2501 | 145 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2502 | 146 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2503 | 147 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
2504 | 148 | }, | ||
2505 | 149 | 'userprofiles.userprofile': { | ||
2506 | 150 | 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'}, | ||
2507 | 151 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2508 | 152 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2509 | 153 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2510 | 154 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2511 | 155 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2512 | 156 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2513 | 157 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2514 | 158 | 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2515 | 159 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2516 | 160 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
2517 | 161 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2518 | 162 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2519 | 163 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
2520 | 164 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
2521 | 165 | }, | ||
2522 | 166 | 'venues.venue': { | ||
2523 | 167 | 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'}, | ||
2524 | 168 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2525 | 169 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2526 | 170 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2527 | 171 | 'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': 'True'}), | ||
2528 | 172 | 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}), | ||
2529 | 173 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2530 | 174 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
2531 | 175 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
2532 | 176 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
2533 | 177 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2534 | 178 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2535 | 179 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
2536 | 180 | } | ||
2537 | 181 | } | ||
2538 | 182 | |||
2539 | 183 | complete_apps = ['events'] | ||
2540 | 184 | 0 | ||
2541 | === added file 'loco_directory/events/migrations/0008_auto_20160816_0011.py' | |||
2542 | --- loco_directory/events/migrations/0008_auto_20160816_0011.py 1970-01-01 00:00:00 +0000 | |||
2543 | +++ loco_directory/events/migrations/0008_auto_20160816_0011.py 2016-08-16 07:31:30 +0000 | |||
2544 | @@ -0,0 +1,36 @@ | |||
2545 | 1 | # -*- coding: utf-8 -*- | ||
2546 | 2 | from __future__ import unicode_literals | ||
2547 | 3 | |||
2548 | 4 | from django.db import models, migrations | ||
2549 | 5 | |||
2550 | 6 | |||
2551 | 7 | class Migration(migrations.Migration): | ||
2552 | 8 | |||
2553 | 9 | dependencies = [ | ||
2554 | 10 | ('events', '0007_auto_20160815_2359'), | ||
2555 | 11 | ] | ||
2556 | 12 | |||
2557 | 13 | operations = [ | ||
2558 | 14 | migrations.AddField( | ||
2559 | 15 | model_name='globalevent', | ||
2560 | 16 | name='activities', | ||
2561 | 17 | field=models.TextField(help_text='Activities to do during the Event', null=True, blank=True), | ||
2562 | 18 | preserve_default=True, | ||
2563 | 19 | ), | ||
2564 | 20 | migrations.AddField( | ||
2565 | 21 | model_name='globalevent', | ||
2566 | 22 | name='channel', | ||
2567 | 23 | field=models.CharField(help_text='Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-locoteams', max_length=25, null=True, verbose_name='Event Channel', blank=True), | ||
2568 | 24 | preserve_default=True, | ||
2569 | 25 | ), | ||
2570 | 26 | migrations.AlterField( | ||
2571 | 27 | model_name='baseevent', | ||
2572 | 28 | name='date_begin', | ||
2573 | 29 | field=models.DateTimeField(help_text='Local date and time that the event starts', verbose_name='Local Start Time', db_index=True), | ||
2574 | 30 | ), | ||
2575 | 31 | migrations.AlterField( | ||
2576 | 32 | model_name='baseevent', | ||
2577 | 33 | name='date_end', | ||
2578 | 34 | field=models.DateTimeField(help_text='Local date and time that the event ends', verbose_name='Local End Time', db_index=True), | ||
2579 | 35 | ), | ||
2580 | 36 | ] | ||
2581 | 0 | 37 | ||
2582 | === added file 'loco_directory/events/migrations/0009_auto_20160816_0019.py' | |||
2583 | --- loco_directory/events/migrations/0009_auto_20160816_0019.py 1970-01-01 00:00:00 +0000 | |||
2584 | +++ loco_directory/events/migrations/0009_auto_20160816_0019.py 2016-08-16 07:31:30 +0000 | |||
2585 | @@ -0,0 +1,28 @@ | |||
2586 | 1 | # -*- coding: utf-8 -*- | ||
2587 | 2 | from __future__ import unicode_literals | ||
2588 | 3 | |||
2589 | 4 | from django.db import models, migrations | ||
2590 | 5 | from django.conf import settings | ||
2591 | 6 | import events.fields | ||
2592 | 7 | |||
2593 | 8 | |||
2594 | 9 | class Migration(migrations.Migration): | ||
2595 | 10 | |||
2596 | 11 | dependencies = [ | ||
2597 | 12 | migrations.swappable_dependency(settings.AUTH_USER_MODEL), | ||
2598 | 13 | ('events', '0008_auto_20160816_0011'), | ||
2599 | 14 | ] | ||
2600 | 15 | |||
2601 | 16 | operations = [ | ||
2602 | 17 | migrations.AddField( | ||
2603 | 18 | model_name='teamevent', | ||
2604 | 19 | name='created_by', | ||
2605 | 20 | field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, null=True), | ||
2606 | 21 | preserve_default=True, | ||
2607 | 22 | ), | ||
2608 | 23 | migrations.AlterField( | ||
2609 | 24 | model_name='attendee', | ||
2610 | 25 | name='guests', | ||
2611 | 26 | field=events.fields.GuestsField(verbose_name='Additional Guests'), | ||
2612 | 27 | ), | ||
2613 | 28 | ] | ||
2614 | 0 | 29 | ||
2615 | === removed file 'loco_directory/events/migrations/0009_global_event_activities.py' | |||
2616 | --- loco_directory/events/migrations/0009_global_event_activities.py 2012-02-09 15:00:00 +0000 | |||
2617 | +++ loco_directory/events/migrations/0009_global_event_activities.py 1970-01-01 00:00:00 +0000 | |||
2618 | @@ -1,184 +0,0 @@ | |||
2619 | 1 | # encoding: utf-8 | ||
2620 | 2 | import datetime | ||
2621 | 3 | from south.db import db | ||
2622 | 4 | from south.v2 import SchemaMigration | ||
2623 | 5 | from django.db import models | ||
2624 | 6 | |||
2625 | 7 | class Migration(SchemaMigration): | ||
2626 | 8 | |||
2627 | 9 | def forwards(self, orm): | ||
2628 | 10 | |||
2629 | 11 | # Adding field 'GlobalEvent.activities' | ||
2630 | 12 | db.add_column('events_globalevent', 'activities', self.gf('django.db.models.fields.TextField')(null=True, blank=True), keep_default=False) | ||
2631 | 13 | |||
2632 | 14 | |||
2633 | 15 | def backwards(self, orm): | ||
2634 | 16 | |||
2635 | 17 | # Deleting field 'GlobalEvent.activities' | ||
2636 | 18 | db.delete_column('events_globalevent', 'activities') | ||
2637 | 19 | |||
2638 | 20 | |||
2639 | 21 | models = { | ||
2640 | 22 | 'auth.group': { | ||
2641 | 23 | 'Meta': {'object_name': 'Group'}, | ||
2642 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2643 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
2644 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
2645 | 27 | }, | ||
2646 | 28 | 'auth.permission': { | ||
2647 | 29 | 'Meta': {'ordering': "('content_type__app_label', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
2648 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2649 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
2650 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2651 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
2652 | 34 | }, | ||
2653 | 35 | 'auth.user': { | ||
2654 | 36 | 'Meta': {'object_name': 'User'}, | ||
2655 | 37 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
2656 | 38 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
2657 | 39 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
2658 | 40 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
2659 | 41 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2660 | 42 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
2661 | 43 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
2662 | 44 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
2663 | 45 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
2664 | 46 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
2665 | 47 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
2666 | 48 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
2667 | 49 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
2668 | 50 | }, | ||
2669 | 51 | 'contenttypes.contenttype': { | ||
2670 | 52 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
2671 | 53 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2672 | 54 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2673 | 55 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2674 | 56 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
2675 | 57 | }, | ||
2676 | 58 | 'events.attendee': { | ||
2677 | 59 | 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'}, | ||
2678 | 60 | 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2679 | 61 | 'guests': ('django.db.models.fields.PositiveSmallIntegerField', [], {}), | ||
2680 | 62 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2681 | 63 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
2682 | 64 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
2683 | 65 | }, | ||
2684 | 66 | 'events.baseevent': { | ||
2685 | 67 | 'Meta': {'object_name': 'BaseEvent'}, | ||
2686 | 68 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2687 | 69 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
2688 | 70 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 2, 9, 2, 3, 36, 943335)', 'db_index': 'True'}), | ||
2689 | 71 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
2690 | 72 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2691 | 73 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2692 | 74 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
2693 | 75 | }, | ||
2694 | 76 | 'events.globalevent': { | ||
2695 | 77 | 'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']}, | ||
2696 | 78 | 'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2697 | 79 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
2698 | 80 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2699 | 81 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2700 | 82 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
2701 | 83 | }, | ||
2702 | 84 | 'events.teamevent': { | ||
2703 | 85 | 'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']}, | ||
2704 | 86 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
2705 | 87 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2706 | 88 | 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2707 | 89 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
2708 | 90 | 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2709 | 91 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}), | ||
2710 | 92 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
2711 | 93 | }, | ||
2712 | 94 | 'events.teameventcomment': { | ||
2713 | 95 | 'Meta': {'object_name': 'TeamEventComment'}, | ||
2714 | 96 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
2715 | 97 | 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2716 | 98 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2012, 2, 9, 2, 3, 36, 945829)', 'db_index': 'True'}), | ||
2717 | 99 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2718 | 100 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
2719 | 101 | }, | ||
2720 | 102 | 'teams.continent': { | ||
2721 | 103 | 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'}, | ||
2722 | 104 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2723 | 105 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
2724 | 106 | }, | ||
2725 | 107 | 'teams.country': { | ||
2726 | 108 | 'Meta': {'ordering': "('name',)", 'object_name': 'Country'}, | ||
2727 | 109 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
2728 | 110 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2729 | 111 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
2730 | 112 | }, | ||
2731 | 113 | 'teams.language': { | ||
2732 | 114 | 'Meta': {'ordering': "('name',)", 'object_name': 'Language'}, | ||
2733 | 115 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
2734 | 116 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2735 | 117 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
2736 | 118 | }, | ||
2737 | 119 | 'teams.team': { | ||
2738 | 120 | 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"}, | ||
2739 | 121 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
2740 | 122 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}), | ||
2741 | 123 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
2742 | 124 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
2743 | 125 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2744 | 126 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}), | ||
2745 | 127 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
2746 | 128 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
2747 | 129 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
2748 | 130 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2749 | 131 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2750 | 132 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2751 | 133 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2752 | 134 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
2753 | 135 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
2754 | 136 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2755 | 137 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2756 | 138 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2757 | 139 | 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}), | ||
2758 | 140 | 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), | ||
2759 | 141 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
2760 | 142 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2761 | 143 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2762 | 144 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
2763 | 145 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2764 | 146 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2765 | 147 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2766 | 148 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
2767 | 149 | }, | ||
2768 | 150 | 'userprofiles.userprofile': { | ||
2769 | 151 | 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'}, | ||
2770 | 152 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2771 | 153 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2772 | 154 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2773 | 155 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2774 | 156 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2775 | 157 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2776 | 158 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2777 | 159 | 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2778 | 160 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2779 | 161 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
2780 | 162 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2781 | 163 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2782 | 164 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
2783 | 165 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
2784 | 166 | }, | ||
2785 | 167 | 'venues.venue': { | ||
2786 | 168 | 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'}, | ||
2787 | 169 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2788 | 170 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2789 | 171 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2790 | 172 | 'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': 'True'}), | ||
2791 | 173 | 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}), | ||
2792 | 174 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2793 | 175 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
2794 | 176 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
2795 | 177 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
2796 | 178 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2797 | 179 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2798 | 180 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
2799 | 181 | } | ||
2800 | 182 | } | ||
2801 | 183 | |||
2802 | 184 | complete_apps = ['events'] | ||
2803 | 185 | 0 | ||
2804 | === removed file 'loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py' | |||
2805 | --- loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py 2013-02-16 00:29:22 +0000 | |||
2806 | +++ loco_directory/events/migrations/0010_auto__chg_field_attendee_guests.py 1970-01-01 00:00:00 +0000 | |||
2807 | @@ -1,184 +0,0 @@ | |||
2808 | 1 | # encoding: utf-8 | ||
2809 | 2 | import datetime | ||
2810 | 3 | from south.db import db | ||
2811 | 4 | from south.v2 import SchemaMigration | ||
2812 | 5 | from django.db import models | ||
2813 | 6 | |||
2814 | 7 | class Migration(SchemaMigration): | ||
2815 | 8 | |||
2816 | 9 | def forwards(self, orm): | ||
2817 | 10 | |||
2818 | 11 | # Changing field 'Attendee.guests' | ||
2819 | 12 | db.alter_column('events_attendee', 'guests', self.gf('events.fields.GuestsField')()) | ||
2820 | 13 | |||
2821 | 14 | |||
2822 | 15 | def backwards(self, orm): | ||
2823 | 16 | |||
2824 | 17 | # Changing field 'Attendee.guests' | ||
2825 | 18 | db.alter_column('events_attendee', 'guests', self.gf('django.db.models.fields.PositiveSmallIntegerField')()) | ||
2826 | 19 | |||
2827 | 20 | |||
2828 | 21 | models = { | ||
2829 | 22 | 'auth.group': { | ||
2830 | 23 | 'Meta': {'object_name': 'Group'}, | ||
2831 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2832 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
2833 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
2834 | 27 | }, | ||
2835 | 28 | 'auth.permission': { | ||
2836 | 29 | 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
2837 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2838 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
2839 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2840 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
2841 | 34 | }, | ||
2842 | 35 | 'auth.user': { | ||
2843 | 36 | 'Meta': {'object_name': 'User'}, | ||
2844 | 37 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
2845 | 38 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
2846 | 39 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
2847 | 40 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
2848 | 41 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2849 | 42 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
2850 | 43 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
2851 | 44 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
2852 | 45 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
2853 | 46 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
2854 | 47 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
2855 | 48 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
2856 | 49 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
2857 | 50 | }, | ||
2858 | 51 | 'contenttypes.contenttype': { | ||
2859 | 52 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
2860 | 53 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2861 | 54 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2862 | 55 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
2863 | 56 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
2864 | 57 | }, | ||
2865 | 58 | 'events.attendee': { | ||
2866 | 59 | 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'}, | ||
2867 | 60 | 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2868 | 61 | 'guests': ('events.fields.GuestsField', [], {}), | ||
2869 | 62 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2870 | 63 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
2871 | 64 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
2872 | 65 | }, | ||
2873 | 66 | 'events.baseevent': { | ||
2874 | 67 | 'Meta': {'object_name': 'BaseEvent'}, | ||
2875 | 68 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2876 | 69 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
2877 | 70 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 2, 15, 23, 44, 56, 52296)', 'db_index': 'True'}), | ||
2878 | 71 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
2879 | 72 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2880 | 73 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2881 | 74 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
2882 | 75 | }, | ||
2883 | 76 | 'events.globalevent': { | ||
2884 | 77 | 'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']}, | ||
2885 | 78 | 'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2886 | 79 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
2887 | 80 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2888 | 81 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2889 | 82 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
2890 | 83 | }, | ||
2891 | 84 | 'events.teamevent': { | ||
2892 | 85 | 'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']}, | ||
2893 | 86 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
2894 | 87 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2895 | 88 | 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2896 | 89 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
2897 | 90 | 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2898 | 91 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}), | ||
2899 | 92 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
2900 | 93 | }, | ||
2901 | 94 | 'events.teameventcomment': { | ||
2902 | 95 | 'Meta': {'object_name': 'TeamEventComment'}, | ||
2903 | 96 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
2904 | 97 | 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
2905 | 98 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 2, 15, 23, 44, 56, 54290)', 'db_index': 'True'}), | ||
2906 | 99 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2907 | 100 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
2908 | 101 | }, | ||
2909 | 102 | 'teams.continent': { | ||
2910 | 103 | 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'}, | ||
2911 | 104 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2912 | 105 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
2913 | 106 | }, | ||
2914 | 107 | 'teams.country': { | ||
2915 | 108 | 'Meta': {'ordering': "('name',)", 'object_name': 'Country'}, | ||
2916 | 109 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
2917 | 110 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2918 | 111 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
2919 | 112 | }, | ||
2920 | 113 | 'teams.language': { | ||
2921 | 114 | 'Meta': {'ordering': "('name',)", 'object_name': 'Language'}, | ||
2922 | 115 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
2923 | 116 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2924 | 117 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
2925 | 118 | }, | ||
2926 | 119 | 'teams.team': { | ||
2927 | 120 | 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"}, | ||
2928 | 121 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
2929 | 122 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}), | ||
2930 | 123 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
2931 | 124 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
2932 | 125 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2933 | 126 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}), | ||
2934 | 127 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
2935 | 128 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
2936 | 129 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
2937 | 130 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2938 | 131 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2939 | 132 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2940 | 133 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
2941 | 134 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
2942 | 135 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
2943 | 136 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2944 | 137 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2945 | 138 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2946 | 139 | 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}), | ||
2947 | 140 | 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), | ||
2948 | 141 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
2949 | 142 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2950 | 143 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
2951 | 144 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
2952 | 145 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2953 | 146 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2954 | 147 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2955 | 148 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
2956 | 149 | }, | ||
2957 | 150 | 'userprofiles.userprofile': { | ||
2958 | 151 | 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'}, | ||
2959 | 152 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2960 | 153 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
2961 | 154 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2962 | 155 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2963 | 156 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2964 | 157 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2965 | 158 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2966 | 159 | 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2967 | 160 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2968 | 161 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
2969 | 162 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
2970 | 163 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2971 | 164 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
2972 | 165 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
2973 | 166 | }, | ||
2974 | 167 | 'venues.venue': { | ||
2975 | 168 | 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'}, | ||
2976 | 169 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2977 | 170 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
2978 | 171 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
2979 | 172 | 'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': 'True'}), | ||
2980 | 173 | 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}), | ||
2981 | 174 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
2982 | 175 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
2983 | 176 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
2984 | 177 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
2985 | 178 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
2986 | 179 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
2987 | 180 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
2988 | 181 | } | ||
2989 | 182 | } | ||
2990 | 183 | |||
2991 | 184 | complete_apps = ['events'] | ||
2992 | 185 | 0 | ||
2993 | === removed file 'loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py' | |||
2994 | --- loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py 2013-02-16 00:29:22 +0000 | |||
2995 | +++ loco_directory/events/migrations/0011_auto__add_field_teamevent_created_by.py 1970-01-01 00:00:00 +0000 | |||
2996 | @@ -1,185 +0,0 @@ | |||
2997 | 1 | # encoding: utf-8 | ||
2998 | 2 | import datetime | ||
2999 | 3 | from south.db import db | ||
3000 | 4 | from south.v2 import SchemaMigration | ||
3001 | 5 | from django.db import models | ||
3002 | 6 | |||
3003 | 7 | class Migration(SchemaMigration): | ||
3004 | 8 | |||
3005 | 9 | def forwards(self, orm): | ||
3006 | 10 | |||
3007 | 11 | # Adding field 'TeamEvent.created_by' | ||
3008 | 12 | db.add_column('events_teamevent', 'created_by', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True), keep_default=False) | ||
3009 | 13 | |||
3010 | 14 | |||
3011 | 15 | def backwards(self, orm): | ||
3012 | 16 | |||
3013 | 17 | # Deleting field 'TeamEvent.created_by' | ||
3014 | 18 | db.delete_column('events_teamevent', 'created_by_id') | ||
3015 | 19 | |||
3016 | 20 | |||
3017 | 21 | models = { | ||
3018 | 22 | 'auth.group': { | ||
3019 | 23 | 'Meta': {'object_name': 'Group'}, | ||
3020 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3021 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
3022 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
3023 | 27 | }, | ||
3024 | 28 | 'auth.permission': { | ||
3025 | 29 | 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, | ||
3026 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
3027 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
3028 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3029 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
3030 | 34 | }, | ||
3031 | 35 | 'auth.user': { | ||
3032 | 36 | 'Meta': {'object_name': 'User'}, | ||
3033 | 37 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
3034 | 38 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
3035 | 39 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
3036 | 40 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
3037 | 41 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3038 | 42 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
3039 | 43 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
3040 | 44 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
3041 | 45 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
3042 | 46 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
3043 | 47 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
3044 | 48 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
3045 | 49 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
3046 | 50 | }, | ||
3047 | 51 | 'contenttypes.contenttype': { | ||
3048 | 52 | 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, | ||
3049 | 53 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
3050 | 54 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3051 | 55 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
3052 | 56 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
3053 | 57 | }, | ||
3054 | 58 | 'events.attendee': { | ||
3055 | 59 | 'Meta': {'unique_together': "(('team_event', 'attendee_profile'),)", 'object_name': 'Attendee'}, | ||
3056 | 60 | 'attendee_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
3057 | 61 | 'guests': ('events.fields.GuestsField', [], {}), | ||
3058 | 62 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3059 | 63 | 'promise': ('django.db.models.fields.CharField', [], {'max_length': '50'}), | ||
3060 | 64 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
3061 | 65 | }, | ||
3062 | 66 | 'events.baseevent': { | ||
3063 | 67 | 'Meta': {'object_name': 'BaseEvent'}, | ||
3064 | 68 | 'announce': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3065 | 69 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
3066 | 70 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 2, 15, 23, 47, 40, 592156)', 'db_index': 'True'}), | ||
3067 | 71 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
3068 | 72 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
3069 | 73 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3070 | 74 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
3071 | 75 | }, | ||
3072 | 76 | 'events.globalevent': { | ||
3073 | 77 | 'Meta': {'object_name': 'GlobalEvent', '_ormbases': ['events.BaseEvent']}, | ||
3074 | 78 | 'activities': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
3075 | 79 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
3076 | 80 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
3077 | 81 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
3078 | 82 | 'pictag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}) | ||
3079 | 83 | }, | ||
3080 | 84 | 'events.teamevent': { | ||
3081 | 85 | 'Meta': {'object_name': 'TeamEvent', '_ormbases': ['events.BaseEvent']}, | ||
3082 | 86 | 'baseevent_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['events.BaseEvent']", 'unique': 'True', 'primary_key': 'True'}), | ||
3083 | 87 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
3084 | 88 | 'contact': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
3085 | 89 | 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), | ||
3086 | 90 | 'global_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.GlobalEvent']", 'null': 'True', 'blank': 'True'}), | ||
3087 | 91 | 'registration': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3088 | 92 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}), | ||
3089 | 93 | 'venue': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['venues.Venue']", 'null': 'True', 'blank': 'True'}) | ||
3090 | 94 | }, | ||
3091 | 95 | 'events.teameventcomment': { | ||
3092 | 96 | 'Meta': {'object_name': 'TeamEventComment'}, | ||
3093 | 97 | 'comment': ('django.db.models.fields.TextField', [], {'db_index': 'True'}), | ||
3094 | 98 | 'commenter_profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True'}), | ||
3095 | 99 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 2, 15, 23, 47, 40, 594563)', 'db_index': 'True'}), | ||
3096 | 100 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3097 | 101 | 'team_event': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['events.TeamEvent']"}) | ||
3098 | 102 | }, | ||
3099 | 103 | 'teams.continent': { | ||
3100 | 104 | 'Meta': {'ordering': "('name',)", 'object_name': 'Continent'}, | ||
3101 | 105 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3102 | 106 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
3103 | 107 | }, | ||
3104 | 108 | 'teams.country': { | ||
3105 | 109 | 'Meta': {'ordering': "('name',)", 'object_name': 'Country'}, | ||
3106 | 110 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
3107 | 111 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3108 | 112 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
3109 | 113 | }, | ||
3110 | 114 | 'teams.language': { | ||
3111 | 115 | 'Meta': {'ordering': "('name',)", 'object_name': 'Language'}, | ||
3112 | 116 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
3113 | 117 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3114 | 118 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
3115 | 119 | }, | ||
3116 | 120 | 'teams.team': { | ||
3117 | 121 | 'Meta': {'ordering': "('approved', 'name')", 'object_name': 'Team', 'db_table': "'teams'"}, | ||
3118 | 122 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
3119 | 123 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'admins'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}), | ||
3120 | 124 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), | ||
3121 | 125 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
3122 | 126 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
3123 | 127 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'contacts'", 'symmetrical': 'False', 'to': "orm['userprofiles.UserProfile']"}), | ||
3124 | 128 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
3125 | 129 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
3126 | 130 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
3127 | 131 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
3128 | 132 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3129 | 133 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3130 | 134 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
3131 | 135 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
3132 | 136 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
3133 | 137 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
3134 | 138 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3135 | 139 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3136 | 140 | 'name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '80'}), | ||
3137 | 141 | 'override_name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True', 'blank': 'True'}), | ||
3138 | 142 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
3139 | 143 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
3140 | 144 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
3141 | 145 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), | ||
3142 | 146 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
3143 | 147 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
3144 | 148 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3145 | 149 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
3146 | 150 | }, | ||
3147 | 151 | 'userprofiles.userprofile': { | ||
3148 | 152 | 'Meta': {'ordering': "('user__username',)", 'object_name': 'UserProfile'}, | ||
3149 | 153 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3150 | 154 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3151 | 155 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3152 | 156 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3153 | 157 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3154 | 158 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3155 | 159 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3156 | 160 | 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
3157 | 161 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3158 | 162 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
3159 | 163 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3160 | 164 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
3161 | 165 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
3162 | 166 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
3163 | 167 | }, | ||
3164 | 168 | 'venues.venue': { | ||
3165 | 169 | 'Meta': {'unique_together': "(('name', 'country', 'city'), ('longitude', 'latitude'))", 'object_name': 'Venue'}, | ||
3166 | 170 | 'address': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
3167 | 171 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
3168 | 172 | 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
3169 | 173 | 'continent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Continent']", 'null': 'True'}), | ||
3170 | 174 | 'country': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['teams.Country']", 'null': 'True'}), | ||
3171 | 175 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3172 | 176 | 'latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
3173 | 177 | 'longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), | ||
3174 | 178 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}), | ||
3175 | 179 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
3176 | 180 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
3177 | 181 | 'venue_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
3178 | 182 | } | ||
3179 | 183 | } | ||
3180 | 184 | |||
3181 | 185 | complete_apps = ['events'] | ||
3182 | 186 | 0 | ||
3183 | === modified file 'loco_directory/events/models.py' | |||
3184 | --- loco_directory/events/models.py 2014-04-07 12:45:02 +0000 | |||
3185 | +++ loco_directory/events/models.py 2016-08-16 07:31:30 +0000 | |||
3186 | @@ -24,7 +24,6 @@ | |||
3187 | 24 | import pytz | 24 | import pytz |
3188 | 25 | import datetime | 25 | import datetime |
3189 | 26 | 26 | ||
3190 | 27 | |||
3191 | 28 | class BaseEvent(models.Model): | 27 | class BaseEvent(models.Model): |
3192 | 29 | """ | 28 | """ |
3193 | 30 | a simple basic event | 29 | a simple basic event |
3194 | @@ -33,7 +32,7 @@ | |||
3195 | 33 | date_begin = models.DateTimeField(help_text=_('Local date and time that the event starts'), verbose_name=_('Local Start Time'), db_index=True) | 32 | date_begin = models.DateTimeField(help_text=_('Local date and time that the event starts'), verbose_name=_('Local Start Time'), db_index=True) |
3196 | 34 | date_end = models.DateTimeField(help_text=_('Local date and time that the event ends'), verbose_name=_('Local End Time'), db_index=True) | 33 | date_end = models.DateTimeField(help_text=_('Local date and time that the event ends'), verbose_name=_('Local End Time'), db_index=True) |
3197 | 35 | description = models.TextField(help_text=_('Description of the Event'), blank=True, null=True) | 34 | description = models.TextField(help_text=_('Description of the Event'), blank=True, null=True) |
3199 | 36 | announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for the announcement'), max_length=200, verify_exists=False, blank=True, null=True) | 35 | announce = models.URLField(verbose_name=_('Announcement'), help_text=_('URL for the announcement'), max_length=200, blank=True, null=True) |
3200 | 37 | date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now, db_index=True) | 36 | date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now, db_index=True) |
3201 | 38 | 37 | ||
3202 | 39 | def __unicode__(self): | 38 | def __unicode__(self): |
3203 | @@ -45,12 +44,20 @@ | |||
3204 | 45 | """ | 44 | """ |
3205 | 46 | event = cal.add('vevent') | 45 | event = cal.add('vevent') |
3206 | 47 | event.add('uid').value = str(self.id) | 46 | event.add('uid').value = str(self.id) |
3207 | 48 | event.add('dtstart').value = pytz.utc.localize(self.date_begin) | ||
3208 | 49 | event.add('dtend').value = pytz.utc.localize(self.date_end) | ||
3209 | 50 | event.add('categories').value = ['Ubuntu Loco Team Event'] | 47 | event.add('categories').value = ['Ubuntu Loco Team Event'] |
3210 | 51 | event.add('summary').value = self.name or '' | 48 | event.add('summary').value = self.name or '' |
3211 | 52 | event.add('description').value = self.description or '' | 49 | event.add('description').value = self.description or '' |
3212 | 53 | 50 | ||
3213 | 51 | if self.date_begin.tzinfo is None: | ||
3214 | 52 | event.add('dtstart').value = pytz.utc.localize(self.date_begin) | ||
3215 | 53 | else: | ||
3216 | 54 | event.add('dtstart').value = self.date_begin | ||
3217 | 55 | |||
3218 | 56 | if self.date_end.tzinfo is None: | ||
3219 | 57 | event.add('dtend').value = pytz.utc.localize(self.date_end) | ||
3220 | 58 | else: | ||
3221 | 59 | event.add('dtend').value = self.date_end | ||
3222 | 60 | |||
3223 | 54 | def is_past(self): | 61 | def is_past(self): |
3224 | 55 | return self.date_end > datetime.datetime.today() | 62 | return self.date_end > datetime.datetime.today() |
3225 | 56 | 63 | ||
3226 | @@ -94,7 +101,7 @@ | |||
3227 | 94 | global_event = models.ForeignKey(GlobalEvent, help_text=_('this team event is part of the selected global event'), verbose_name=_('Related Global Event'), blank=True, null=True) | 101 | global_event = models.ForeignKey(GlobalEvent, help_text=_('this team event is part of the selected global event'), verbose_name=_('Related Global Event'), blank=True, null=True) |
3228 | 95 | venue = models.ForeignKey(Venue, help_text=_('Venue for the Event'), verbose_name=_('Event Venue'), blank=True, null=True) | 102 | venue = models.ForeignKey(Venue, help_text=_('Venue for the Event'), verbose_name=_('Event Venue'), blank=True, null=True) |
3229 | 96 | channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True) | 103 | channel = models.CharField(help_text=_('Channel for the Event hosted on the freenode IRC network. Ex. #ubuntu-us-fl'), max_length=25, verbose_name=_('Event Channel'), blank=True, null=True) |
3231 | 97 | registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, verify_exists=False, blank=True, null=True) | 104 | registration = models.URLField(verbose_name=_('Registration URL'), help_text=_('URL to register attendance (leave blank to use the built-in registration system)'), max_length=200, blank=True, null=True) |
3232 | 98 | 105 | ||
3233 | 99 | objects = TeamEventManager() | 106 | objects = TeamEventManager() |
3234 | 100 | 107 | ||
3235 | @@ -111,8 +118,6 @@ | |||
3236 | 111 | """ | 118 | """ |
3237 | 112 | event = cal.add('vevent') | 119 | event = cal.add('vevent') |
3238 | 113 | event.add('uid').value = str(self.id) | 120 | event.add('uid').value = str(self.id) |
3239 | 114 | event.add('dtstart').value = pytz.utc.localize(self.date_begin) | ||
3240 | 115 | event.add('dtend').value = pytz.utc.localize(self.date_end) | ||
3241 | 116 | event.add('categories').value = ['Ubuntu Loco Team Event'] | 121 | event.add('categories').value = ['Ubuntu Loco Team Event'] |
3242 | 117 | event.add('summary').value = u"%s" % self.name or '' | 122 | event.add('summary').value = u"%s" % self.name or '' |
3243 | 118 | event.add('description').value = u"%s" % self.description or '' | 123 | event.add('description').value = u"%s" % self.description or '' |
3244 | @@ -122,6 +127,9 @@ | |||
3245 | 122 | #if self.venue: | 127 | #if self.venue: |
3246 | 123 | # event.add('geo').value = u"%s;%s" % (self.venue.latitude, self.venue.longitude) | 128 | # event.add('geo').value = u"%s;%s" % (self.venue.latitude, self.venue.longitude) |
3247 | 124 | 129 | ||
3248 | 130 | event.add('dtstart').value = self.tolocaltime(self.date_begin) | ||
3249 | 131 | event.add('dtend').value = self.tolocaltime(self.date_end) | ||
3250 | 132 | |||
3251 | 125 | def get_tz(self): | 133 | def get_tz(self): |
3252 | 126 | timezone = 'UTC' | 134 | timezone = 'UTC' |
3253 | 127 | if self.venue: | 135 | if self.venue: |
3254 | @@ -177,7 +185,6 @@ | |||
3255 | 177 | return total_attending_guests + total_attending_registered | 185 | return total_attending_guests + total_attending_registered |
3256 | 178 | 186 | ||
3257 | 179 | def total_maybe_attending(self): | 187 | def total_maybe_attending(self): |
3258 | 180 | |||
3259 | 181 | total_maybe_attending_guests = queryset_sum('guests', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="maybe")) | 188 | total_maybe_attending_guests = queryset_sum('guests', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="maybe")) |
3260 | 182 | total_maybe_attending_registered = queryset_count('attendee_profile', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="maybe")) | 189 | total_maybe_attending_registered = queryset_count('attendee_profile', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="maybe")) |
3261 | 183 | return total_maybe_attending_guests + total_maybe_attending_registered | 190 | return total_maybe_attending_guests + total_maybe_attending_registered |
3262 | 184 | 191 | ||
3263 | === modified file 'loco_directory/events/urls.py' | |||
3264 | --- loco_directory/events/urls.py 2013-03-11 21:49:37 +0000 | |||
3265 | +++ loco_directory/events/urls.py 2016-08-16 07:31:30 +0000 | |||
3266 | @@ -1,5 +1,5 @@ | |||
3267 | 1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
3269 | 2 | from django.conf.urls.defaults import * | 2 | from django.conf.urls import * |
3270 | 3 | 3 | ||
3271 | 4 | urlpatterns = patterns('', | 4 | urlpatterns = patterns('', |
3272 | 5 | #all events | 5 | #all events |
3273 | 6 | 6 | ||
3274 | === modified file 'loco_directory/events/views.py' | |||
3275 | --- loco_directory/events/views.py 2013-05-11 14:07:21 +0000 | |||
3276 | +++ loco_directory/events/views.py 2016-08-16 07:31:30 +0000 | |||
3277 | @@ -2,10 +2,10 @@ | |||
3278 | 2 | from django.template import RequestContext | 2 | from django.template import RequestContext |
3279 | 3 | from django.http import HttpResponse, HttpResponseRedirect, Http404 | 3 | from django.http import HttpResponse, HttpResponseRedirect, Http404 |
3280 | 4 | from django.shortcuts import (render_to_response, redirect, get_object_or_404, get_list_or_404) | 4 | from django.shortcuts import (render_to_response, redirect, get_object_or_404, get_list_or_404) |
3281 | 5 | from django.contrib.auth.decorators import login_required | ||
3282 | 6 | from django.utils import simplejson | ||
3283 | 7 | from django.utils.translation import ugettext as _ | 5 | from django.utils.translation import ugettext as _ |
3284 | 8 | from django.db.models import Count | 6 | from django.db.models import Count |
3285 | 7 | from django.contrib.auth.decorators import login_required | ||
3286 | 8 | from django.contrib import messages | ||
3287 | 9 | 9 | ||
3288 | 10 | from .models import (TeamEvent, GlobalEvent, Attendee, TeamEventComment) | 10 | from .models import (TeamEvent, GlobalEvent, Attendee, TeamEventComment) |
3289 | 11 | from teams.models import Team | 11 | from teams.models import Team |
3290 | @@ -18,6 +18,8 @@ | |||
3291 | 18 | 18 | ||
3292 | 19 | import datetime | 19 | import datetime |
3293 | 20 | import vobject | 20 | import vobject |
3294 | 21 | import json | ||
3295 | 22 | import pytz | ||
3296 | 21 | 23 | ||
3297 | 22 | 24 | ||
3298 | 23 | def event_list(request): | 25 | def event_list(request): |
3299 | @@ -39,7 +41,7 @@ | |||
3300 | 39 | def event_list_ical(events, name): | 41 | def event_list_ical(events, name): |
3301 | 40 | """Return any list events as an ical""" | 42 | """Return any list events as an ical""" |
3302 | 41 | filename = "%s.ics" % name.replace(' ', '-').lower() | 43 | filename = "%s.ics" % name.replace(' ', '-').lower() |
3304 | 42 | response = HttpResponse(mimetype='text/calendar') | 44 | response = HttpResponse(content_type='text/calendar') |
3305 | 43 | response['Content-Disposition'] = 'attachment; filename=%s' % filename.encode('ascii', 'replace') | 45 | response['Content-Disposition'] = 'attachment; filename=%s' % filename.encode('ascii', 'replace') |
3306 | 44 | calendar = vobject.iCalendar() | 46 | calendar = vobject.iCalendar() |
3307 | 45 | calendar.add('prodid').value = '-//loco.ubuntu.com//EN' | 47 | calendar.add('prodid').value = '-//loco.ubuntu.com//EN' |
3308 | @@ -143,9 +145,9 @@ | |||
3309 | 143 | if form.is_valid(): | 145 | if form.is_valid(): |
3310 | 144 | team_event_comment = form.save(commit=False) | 146 | team_event_comment = form.save(commit=False) |
3311 | 145 | team_event_comment.team_event = team_event | 147 | team_event_comment.team_event = team_event |
3313 | 146 | team_event_comment.commenter_profile = request.user.get_profile() | 148 | team_event_comment.commenter_profile = request.user.profile |
3314 | 147 | team_event_comment.save() | 149 | team_event_comment.save() |
3316 | 148 | request.user.message_set.create(message=_('Your comment has been saved.')) | 150 | messages.success(request,_('Your comment has been saved.')) |
3317 | 149 | return redirect(team_event) | 151 | return redirect(team_event) |
3318 | 150 | else: | 152 | else: |
3319 | 151 | form = TeamEventCommentForm() | 153 | form = TeamEventCommentForm() |
3320 | @@ -180,13 +182,13 @@ | |||
3321 | 180 | if is_on_lc or is_contact: | 182 | if is_on_lc or is_contact: |
3322 | 181 | if request.method == 'POST': | 183 | if request.method == 'POST': |
3323 | 182 | team_event_object.delete() | 184 | team_event_object.delete() |
3325 | 183 | request.user.message_set.create(message=_('Team Event removed.')) | 185 | messages.success(request,_('Team Event removed.')) |
3326 | 184 | return redirect('event-list') | 186 | return redirect('event-list') |
3327 | 185 | else: | 187 | else: |
3328 | 186 | context = {'team_event_object': team_event_object} | 188 | context = {'team_event_object': team_event_object} |
3329 | 187 | return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request)) | 189 | return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request)) |
3330 | 188 | else: | 190 | else: |
3332 | 189 | request.user.message_set.create(message='%s %s' % (_('You can not remove this team event.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.'))) | 191 | messages.error(request,message='%s %s' % (_('You can not remove this team event.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.'))) |
3333 | 190 | return redirect(team_event_object) | 192 | return redirect(team_event_object) |
3334 | 191 | 193 | ||
3335 | 192 | 194 | ||
3336 | @@ -194,7 +196,7 @@ | |||
3337 | 194 | def team_event_select(request): | 196 | def team_event_select(request): |
3338 | 195 | teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()]) | 197 | teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()]) |
3339 | 196 | if len(teams) == 0: | 198 | if len(teams) == 0: |
3341 | 197 | request.user.message_set.create(message='%s %s' % (_('You can not add a new team event.'), _('You are not a member of any LoCo Teams.'))) | 199 | messages.error(request,'%s %s' % (_('You can not add a new team event.'), _('You are not a member of any LoCo Teams.'))) |
3342 | 198 | return redirect('event-list') | 200 | return redirect('event-list') |
3343 | 199 | elif len(teams) == 1: | 201 | elif len(teams) == 1: |
3344 | 200 | from django.core import urlresolvers | 202 | from django.core import urlresolvers |
3345 | @@ -245,7 +247,7 @@ | |||
3346 | 245 | context, RequestContext(request)) | 247 | context, RequestContext(request)) |
3347 | 246 | else: | 248 | else: |
3348 | 247 | # XXX: Once we move to a new ACL system, this needs fixing. | 249 | # XXX: Once we move to a new ACL system, this needs fixing. |
3350 | 248 | request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.'))) | 250 | messages.error(request,'%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.'))) |
3351 | 249 | return redirect(team_object) | 251 | return redirect(team_object) |
3352 | 250 | 252 | ||
3353 | 251 | 253 | ||
3354 | @@ -284,7 +286,7 @@ | |||
3355 | 284 | context, RequestContext(request)) | 286 | context, RequestContext(request)) |
3356 | 285 | else: | 287 | else: |
3357 | 286 | # XXX: Once we move to a new ACL system, this needs fixing. | 288 | # XXX: Once we move to a new ACL system, this needs fixing. |
3359 | 287 | request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.'))) | 289 | messages.error(request,'%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.'))) |
3360 | 288 | return redirect(team_object) | 290 | return redirect(team_object) |
3361 | 289 | 291 | ||
3362 | 290 | 292 | ||
3363 | @@ -309,7 +311,7 @@ | |||
3364 | 309 | form = TeamEventForm(data=request.POST, instance=team_event, teams=teams) | 311 | form = TeamEventForm(data=request.POST, instance=team_event, teams=teams) |
3365 | 310 | if form.is_valid(): | 312 | if form.is_valid(): |
3366 | 311 | form.save() | 313 | form.save() |
3368 | 312 | request.user.message_set.create(message=_('Team Event updated.')) | 314 | messages.success(request,_('Team Event updated.')) |
3369 | 313 | return redirect(team_event) | 315 | return redirect(team_event) |
3370 | 314 | else: | 316 | else: |
3371 | 315 | form = TeamEventForm(instance=team_event, teams=teams) | 317 | form = TeamEventForm(instance=team_event, teams=teams) |
3372 | @@ -322,7 +324,7 @@ | |||
3373 | 322 | context, RequestContext(request) | 324 | context, RequestContext(request) |
3374 | 323 | ) | 325 | ) |
3375 | 324 | else: | 326 | else: |
3377 | 325 | request.user.message_set.create(message='%s %s' % (_('You can not update this team event.'), _('You are not a member of the team or on the LoCo Council.'))) | 327 | messages.error(request,'%s %s' % (_('You can not update this team event.'), _('You are not a member of the team or on the LoCo Council.'))) |
3378 | 326 | return redirect(team_event) | 328 | return redirect(team_event) |
3379 | 327 | 329 | ||
3380 | 328 | 330 | ||
3381 | @@ -333,21 +335,21 @@ | |||
3382 | 333 | """ | 335 | """ |
3383 | 334 | team_event_object = get_object_or_404(TeamEvent, pk=team_event_id) | 336 | team_event_object = get_object_or_404(TeamEvent, pk=team_event_id) |
3384 | 335 | if team_event_object.is_attending(request.user): | 337 | if team_event_object.is_attending(request.user): |
3386 | 336 | attendee_object = team_event_object.attendee_set.get(attendee_profile=request.user.get_profile()) | 338 | attendee_object = team_event_object.attendee_set.get(attendee_profile=request.user.profile) |
3387 | 337 | else: | 339 | else: |
3389 | 338 | attendee_object = Attendee(team_event=team_event_object, attendee_profile=request.user.get_profile()) | 340 | attendee_object = Attendee(team_event=team_event_object, attendee_profile=request.user.profile) |
3390 | 339 | 341 | ||
3391 | 340 | if request.method == 'POST': | 342 | if request.method == 'POST': |
3392 | 341 | form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST) | 343 | form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST) |
3393 | 342 | if form.is_valid(): | 344 | if form.is_valid(): |
3394 | 343 | form.save() | 345 | form.save() |
3396 | 344 | request.user.message_set.create(message=_('Your registration has been saved.')) | 346 | messages.success(request,_('Your registration has been saved.')) |
3397 | 345 | return redirect(team_event_object) | 347 | return redirect(team_event_object) |
3398 | 346 | else: | 348 | else: |
3399 | 347 | form = AttendeeRegistrationForm(instance=attendee_object, initial={'guests': 0}) | 349 | form = AttendeeRegistrationForm(instance=attendee_object, initial={'guests': 0}) |
3400 | 348 | 350 | ||
3401 | 349 | is_past_event = False | 351 | is_past_event = False |
3403 | 350 | if team_event_object.date_end < datetime.datetime.now(): | 352 | if team_event_object.date_end < pytz.utc.localize(datetime.datetime.now()): |
3404 | 351 | is_past_event = True | 353 | is_past_event = True |
3405 | 352 | 354 | ||
3406 | 353 | context = { | 355 | context = { |
3407 | @@ -371,9 +373,9 @@ | |||
3408 | 371 | if form.is_valid(): | 373 | if form.is_valid(): |
3409 | 372 | team_event_comment = form.save(commit=False) | 374 | team_event_comment = form.save(commit=False) |
3410 | 373 | team_event_comment.team_event = team_event_object | 375 | team_event_comment.team_event = team_event_object |
3412 | 374 | team_event_comment.commenter_profile = request.user.get_profile() | 376 | team_event_comment.commenter_profile = request.user.profile |
3413 | 375 | team_event_comment.save() | 377 | team_event_comment.save() |
3415 | 376 | request.user.message_set.create(message=_('Comment saved.')) | 378 | messages.success(request,_('Comment saved.')) |
3416 | 377 | return redirect(team_event_object) | 379 | return redirect(team_event_object) |
3417 | 378 | else: | 380 | else: |
3418 | 379 | form = TeamEventCommentForm() | 381 | form = TeamEventCommentForm() |
3419 | @@ -431,13 +433,13 @@ | |||
3420 | 431 | if is_on_lc: | 433 | if is_on_lc: |
3421 | 432 | if request.method == 'POST': | 434 | if request.method == 'POST': |
3422 | 433 | global_event_object.delete() | 435 | global_event_object.delete() |
3424 | 434 | request.user.message_set.create(message=_('Global Event removed.')) | 436 | messages.success(request,_('Global Event removed.')) |
3425 | 435 | return redirect('event-list') | 437 | return redirect('event-list') |
3426 | 436 | else: | 438 | else: |
3427 | 437 | context = {'global_event_object': global_event_object} | 439 | context = {'global_event_object': global_event_object} |
3428 | 438 | return render_to_response('events/global_event_delete_confirm.html', context, RequestContext(request)) | 440 | return render_to_response('events/global_event_delete_confirm.html', context, RequestContext(request)) |
3429 | 439 | else: | 441 | else: |
3431 | 440 | request.user.message_set.create(message='%s %s' % (_('You can not remove this global event.'), _('You are not on the LoCo Council.'))) | 442 | messages.error(request,'%s %s' % (_('You can not remove this global event.'), _('You are not on the LoCo Council.'))) |
3432 | 441 | return redirect(global_event_object) | 443 | return redirect(global_event_object) |
3433 | 442 | 444 | ||
3434 | 443 | 445 | ||
3435 | @@ -452,7 +454,7 @@ | |||
3436 | 452 | form = GlobalEventForm(data=request.POST) | 454 | form = GlobalEventForm(data=request.POST) |
3437 | 453 | if form.is_valid(): | 455 | if form.is_valid(): |
3438 | 454 | form.save() | 456 | form.save() |
3440 | 455 | request.user.message_set.create(message=_('New Global Event created.')) | 457 | messages.success(request,_('New Global Event created.')) |
3441 | 456 | return redirect('event-list') | 458 | return redirect('event-list') |
3442 | 457 | else: | 459 | else: |
3443 | 458 | form = GlobalEventForm() | 460 | form = GlobalEventForm() |
3444 | @@ -463,7 +465,7 @@ | |||
3445 | 463 | return render_to_response('events/global_event_new.html', | 465 | return render_to_response('events/global_event_new.html', |
3446 | 464 | context, RequestContext(request)) | 466 | context, RequestContext(request)) |
3447 | 465 | else: | 467 | else: |
3449 | 466 | request.user.message_set.create(message='%s %s' % (_('You can not add a new global event.'), _('You are not on the LoCo Council.'))) | 468 | messages.error(request,'%s %s' % (_('You can not add a new global event.'), _('You are not on the LoCo Council.'))) |
3450 | 467 | return redirect('event-list') | 469 | return redirect('event-list') |
3451 | 468 | 470 | ||
3452 | 469 | 471 | ||
3453 | @@ -480,7 +482,7 @@ | |||
3454 | 480 | form = GlobalEventForm(data=request.POST, instance=global_event_object) | 482 | form = GlobalEventForm(data=request.POST, instance=global_event_object) |
3455 | 481 | if form.is_valid(): | 483 | if form.is_valid(): |
3456 | 482 | form.save() | 484 | form.save() |
3458 | 483 | request.user.message_set.create(message=_('Global Event updated.')) | 485 | messages.success(request,_('Global Event updated.')) |
3459 | 484 | return redirect(global_event_object) | 486 | return redirect(global_event_object) |
3460 | 485 | else: | 487 | else: |
3461 | 486 | form = GlobalEventForm(instance=global_event_object) | 488 | form = GlobalEventForm(instance=global_event_object) |
3462 | @@ -491,7 +493,7 @@ | |||
3463 | 491 | return render_to_response('events/global_event_update.html', | 493 | return render_to_response('events/global_event_update.html', |
3464 | 492 | context, RequestContext(request)) | 494 | context, RequestContext(request)) |
3465 | 493 | else: | 495 | else: |
3467 | 494 | request.user.message_set.create(message='%s %s' % (_('You can not update this global event.'), _('You are not on the LoCo Council.'))) | 496 | messages.error(request,'%s %s' % (_('You can not update this global event.'), _('You are not on the LoCo Council.'))) |
3468 | 495 | return redirect(global_event_object) | 497 | return redirect(global_event_object) |
3469 | 496 | 498 | ||
3470 | 497 | 499 | ||
3471 | @@ -515,7 +517,7 @@ | |||
3472 | 515 | location['lat'] = event.venue.latitude | 517 | location['lat'] = event.venue.latitude |
3473 | 516 | locations.append(location) | 518 | locations.append(location) |
3474 | 517 | 519 | ||
3476 | 518 | json = simplejson.dumps(locations) | 520 | json = json.dumps(locations) |
3477 | 519 | 521 | ||
3478 | 520 | return HttpResponse(json) | 522 | return HttpResponse(json) |
3479 | 521 | 523 | ||
3480 | @@ -539,7 +541,7 @@ | |||
3481 | 539 | location['lat'] = event.venue.latitude | 541 | location['lat'] = event.venue.latitude |
3482 | 540 | locations.append(location) | 542 | locations.append(location) |
3483 | 541 | 543 | ||
3485 | 542 | json = simplejson.dumps(locations) | 544 | json = json.dumps(locations) |
3486 | 543 | 545 | ||
3487 | 544 | return HttpResponse(json) | 546 | return HttpResponse(json) |
3488 | 545 | 547 | ||
3489 | @@ -581,7 +583,7 @@ | |||
3490 | 581 | response_dict.update({'success': False, 'response': _('Missing arguments.')}) | 583 | response_dict.update({'success': False, 'response': _('Missing arguments.')}) |
3491 | 582 | else: | 584 | else: |
3492 | 583 | response_dict.update({'success': False, 'response': _('You can\'t edit this comment using this method.')}) | 585 | response_dict.update({'success': False, 'response': _('You can\'t edit this comment using this method.')}) |
3494 | 584 | return HttpResponse(simplejson.dumps(response_dict), mimetype='application/json') | 586 | return HttpResponse(json.dumps(response_dict), content_type='application/json') |
3495 | 585 | 587 | ||
3496 | 586 | 588 | ||
3497 | 587 | @login_required | 589 | @login_required |
3498 | @@ -593,7 +595,7 @@ | |||
3499 | 593 | comment = get_object_or_404(TeamEventComment, pk=pk) | 595 | comment = get_object_or_404(TeamEventComment, pk=pk) |
3500 | 594 | if comment.commenter_profile.user == request.user: | 596 | if comment.commenter_profile.user == request.user: |
3501 | 595 | comment.delete() | 597 | comment.delete() |
3503 | 596 | request.user.message_set.create(message=_('Your comment has been removed.')) | 598 | messages.success(request,_('Your comment has been removed.')) |
3504 | 597 | if next: | 599 | if next: |
3505 | 598 | redirect_to = next | 600 | redirect_to = next |
3506 | 599 | else: | 601 | else: |
3507 | 600 | 602 | ||
3508 | === modified file 'loco_directory/manage.py' | |||
3509 | --- loco_directory/manage.py 2011-06-29 18:35:40 +0000 | |||
3510 | +++ loco_directory/manage.py 2016-08-16 07:31:30 +0000 | |||
3511 | @@ -1,11 +1,9 @@ | |||
3512 | 1 | #!/usr/bin/env python | 1 | #!/usr/bin/env python |
3520 | 2 | from django.core.management import execute_manager | 2 | import os, sys |
3514 | 3 | try: | ||
3515 | 4 | import settings # Assumed to be in the same directory. | ||
3516 | 5 | except ImportError: | ||
3517 | 6 | import sys | ||
3518 | 7 | sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) | ||
3519 | 8 | sys.exit(1) | ||
3521 | 9 | 3 | ||
3522 | 10 | if __name__ == "__main__": | 4 | if __name__ == "__main__": |
3524 | 11 | execute_manager(settings) | 5 | os.environ.setdefault("DJANGO_SETTINGS_MODULE", "app.settings") |
3525 | 6 | |||
3526 | 7 | from django.core.management import execute_from_command_line | ||
3527 | 8 | |||
3528 | 9 | execute_from_command_line(sys.argv) | ||
3529 | 12 | 10 | ||
3530 | === modified file 'loco_directory/meetings/feeds.py' | |||
3531 | --- loco_directory/meetings/feeds.py 2013-03-31 01:10:52 +0000 | |||
3532 | +++ loco_directory/meetings/feeds.py 2016-08-16 07:31:30 +0000 | |||
3533 | @@ -1,6 +1,6 @@ | |||
3534 | 1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
3535 | 2 | from django.core.urlresolvers import reverse | 2 | from django.core.urlresolvers import reverse |
3537 | 3 | from django.contrib.syndication.feeds import Feed, FeedDoesNotExist | 3 | from django.contrib.syndication.views import Feed, FeedDoesNotExist |
3538 | 4 | from django.utils import translation | 4 | from django.utils import translation |
3539 | 5 | from django.template import loader, Context | 5 | from django.template import loader, Context |
3540 | 6 | 6 | ||
3541 | @@ -12,7 +12,9 @@ | |||
3542 | 12 | 12 | ||
3543 | 13 | 13 | ||
3544 | 14 | class TeamMeetingFeed(Feed): | 14 | class TeamMeetingFeed(Feed): |
3546 | 15 | def get_object(self, bits): | 15 | |
3547 | 16 | def get_object(self, request, bits): | ||
3548 | 17 | bits = bits.split('/') | ||
3549 | 16 | if len(bits) >= 1: | 18 | if len(bits) >= 1: |
3550 | 17 | try: | 19 | try: |
3551 | 18 | lang = bits[1] | 20 | lang = bits[1] |
3552 | 19 | 21 | ||
3553 | === modified file 'loco_directory/meetings/forms.py' | |||
3554 | --- loco_directory/meetings/forms.py 2013-04-14 23:34:16 +0000 | |||
3555 | +++ loco_directory/meetings/forms.py 2016-08-16 07:31:30 +0000 | |||
3556 | @@ -27,9 +27,13 @@ | |||
3557 | 27 | """ | 27 | """ |
3558 | 28 | a form to create/update a BaseMeeting | 28 | a form to create/update a BaseMeeting |
3559 | 29 | """ | 29 | """ |
3560 | 30 | |||
3561 | 31 | date_begin = forms.SplitDateTimeField(widget=DateTimeWidget) | ||
3562 | 32 | date_end = forms.SplitDateTimeField(widget=DateTimeWidget) | ||
3563 | 33 | |||
3564 | 30 | class Meta: | 34 | class Meta: |
3565 | 31 | model = BaseMeeting | 35 | model = BaseMeeting |
3567 | 32 | exclude = ('date_created') | 36 | exclude = ('date_created',) |
3568 | 33 | 37 | ||
3569 | 34 | class Media: | 38 | class Media: |
3570 | 35 | css = {'all': ( | 39 | css = {'all': ( |
3571 | @@ -40,10 +44,10 @@ | |||
3572 | 40 | settings.MEDIA_URL + 'js/events-ui.js', | 44 | settings.MEDIA_URL + 'js/events-ui.js', |
3573 | 41 | ) | 45 | ) |
3574 | 42 | 46 | ||
3579 | 43 | def __init__(self, *args, **kargs): | 47 | # def __init__(self, *args, **kargs): |
3580 | 44 | super(BaseMeetingForm, self).__init__(*args, **kargs) | 48 | # super(BaseMeetingForm, self).__init__(*args, **kargs) |
3581 | 45 | self.fields['date_begin'].widget = DateTimeWidget() | 49 | # self.fields['date_begin'].widget = DateTimeWidget() |
3582 | 46 | self.fields['date_end'].widget = DateTimeWidget() | 50 | # self.fields['date_end'].widget = DateTimeWidget() |
3583 | 47 | 51 | ||
3584 | 48 | def clean(self): | 52 | def clean(self): |
3585 | 49 | begin = self.cleaned_data.get('date_begin') | 53 | begin = self.cleaned_data.get('date_begin') |
3586 | @@ -69,7 +73,7 @@ | |||
3587 | 69 | 'chair', | 73 | 'chair', |
3588 | 70 | 'logs' | 74 | 'logs' |
3589 | 71 | ) | 75 | ) |
3591 | 72 | exclude = ('teams', 'date_created') | 76 | exclude = ('teams', 'date_created',) |
3592 | 73 | 77 | ||
3593 | 74 | def __init__(self, teams=None, *args, **kargs): | 78 | def __init__(self, teams=None, *args, **kargs): |
3594 | 75 | super(TeamMeetingForm, self).__init__(*args, **kargs) | 79 | super(TeamMeetingForm, self).__init__(*args, **kargs) |
3595 | @@ -121,7 +125,7 @@ | |||
3596 | 121 | 125 | ||
3597 | 122 | class Meta: | 126 | class Meta: |
3598 | 123 | model = AgendaItem | 127 | model = AgendaItem |
3600 | 124 | exclude = ('meeting', 'created_date') | 128 | exclude = ('meeting', 'created_date',) |
3601 | 125 | 129 | ||
3602 | 126 | def __init__(self, *args, **kargs): | 130 | def __init__(self, *args, **kargs): |
3603 | 127 | super(AgendaItemForm, self).__init__(*args, **kargs) | 131 | super(AgendaItemForm, self).__init__(*args, **kargs) |
3604 | 128 | 132 | ||
3605 | === removed file 'loco_directory/meetings/migrations/0001_add_meetings.py' | |||
3606 | --- loco_directory/meetings/migrations/0001_add_meetings.py 2010-12-02 13:47:55 +0000 | |||
3607 | +++ loco_directory/meetings/migrations/0001_add_meetings.py 1970-01-01 00:00:00 +0000 | |||
3608 | @@ -1,153 +0,0 @@ | |||
3609 | 1 | |||
3610 | 2 | from south.db import db | ||
3611 | 3 | from django.db import models | ||
3612 | 4 | from meetings.models import * | ||
3613 | 5 | |||
3614 | 6 | class Migration: | ||
3615 | 7 | |||
3616 | 8 | def forwards(self, orm): | ||
3617 | 9 | |||
3618 | 10 | # Adding model 'BaseMeeting' | ||
3619 | 11 | db.create_table('meetings_basemeeting', ( | ||
3620 | 12 | ('id', orm['meetings.BaseMeeting:id']), | ||
3621 | 13 | ('name', orm['meetings.BaseMeeting:name']), | ||
3622 | 14 | ('date_begin', orm['meetings.BaseMeeting:date_begin']), | ||
3623 | 15 | ('date_end', orm['meetings.BaseMeeting:date_end']), | ||
3624 | 16 | ('date_created', orm['meetings.BaseMeeting:date_created']), | ||
3625 | 17 | )) | ||
3626 | 18 | db.send_create_signal('meetings', ['BaseMeeting']) | ||
3627 | 19 | |||
3628 | 20 | # Adding model 'TeamMeeting' | ||
3629 | 21 | db.create_table('meetings_teammeeting', ( | ||
3630 | 22 | ('basemeeting_ptr', orm['meetings.TeamMeeting:basemeeting_ptr']), | ||
3631 | 23 | )) | ||
3632 | 24 | db.send_create_signal('meetings', ['TeamMeeting']) | ||
3633 | 25 | |||
3634 | 26 | # Adding ManyToManyField 'TeamMeeting.teams' | ||
3635 | 27 | db.create_table('meetings_teammeeting_teams', ( | ||
3636 | 28 | ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), | ||
3637 | 29 | ('teammeeting', models.ForeignKey(orm.TeamMeeting, null=False)), | ||
3638 | 30 | ('team', models.ForeignKey(orm['teams.Team'], null=False)) | ||
3639 | 31 | )) | ||
3640 | 32 | |||
3641 | 33 | |||
3642 | 34 | |||
3643 | 35 | def backwards(self, orm): | ||
3644 | 36 | |||
3645 | 37 | # Deleting model 'BaseMeeting' | ||
3646 | 38 | db.delete_table('meetings_basemeeting') | ||
3647 | 39 | |||
3648 | 40 | # Deleting model 'TeamMeeting' | ||
3649 | 41 | db.delete_table('meetings_teammeeting') | ||
3650 | 42 | |||
3651 | 43 | # Dropping ManyToManyField 'TeamMeeting.teams' | ||
3652 | 44 | db.delete_table('meetings_teammeeting_teams') | ||
3653 | 45 | |||
3654 | 46 | |||
3655 | 47 | |||
3656 | 48 | models = { | ||
3657 | 49 | 'auth.group': { | ||
3658 | 50 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3659 | 51 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
3660 | 52 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
3661 | 53 | }, | ||
3662 | 54 | 'auth.permission': { | ||
3663 | 55 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
3664 | 56 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
3665 | 57 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
3666 | 58 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3667 | 59 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
3668 | 60 | }, | ||
3669 | 61 | 'auth.user': { | ||
3670 | 62 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
3671 | 63 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
3672 | 64 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
3673 | 65 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
3674 | 66 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3675 | 67 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
3676 | 68 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
3677 | 69 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
3678 | 70 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
3679 | 71 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
3680 | 72 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
3681 | 73 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
3682 | 74 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
3683 | 75 | }, | ||
3684 | 76 | 'contenttypes.contenttype': { | ||
3685 | 77 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
3686 | 78 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
3687 | 79 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3688 | 80 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
3689 | 81 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
3690 | 82 | }, | ||
3691 | 83 | 'meetings.basemeeting': { | ||
3692 | 84 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
3693 | 85 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 12, 2, 13, 45, 29, 466637)', 'db_index': 'True'}), | ||
3694 | 86 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
3695 | 87 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3696 | 88 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
3697 | 89 | }, | ||
3698 | 90 | 'meetings.teammeeting': { | ||
3699 | 91 | 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}), | ||
3700 | 92 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}) | ||
3701 | 93 | }, | ||
3702 | 94 | 'teams.continent': { | ||
3703 | 95 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3704 | 96 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
3705 | 97 | }, | ||
3706 | 98 | 'teams.country': { | ||
3707 | 99 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
3708 | 100 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3709 | 101 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
3710 | 102 | }, | ||
3711 | 103 | 'teams.language': { | ||
3712 | 104 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
3713 | 105 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3714 | 106 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
3715 | 107 | }, | ||
3716 | 108 | 'teams.team': { | ||
3717 | 109 | 'Meta': {'db_table': "'teams'"}, | ||
3718 | 110 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
3719 | 111 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
3720 | 112 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
3721 | 113 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
3722 | 114 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
3723 | 115 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
3724 | 116 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
3725 | 117 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
3726 | 118 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
3727 | 119 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
3728 | 120 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3729 | 121 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3730 | 122 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
3731 | 123 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
3732 | 124 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
3733 | 125 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3734 | 126 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3735 | 127 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
3736 | 128 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
3737 | 129 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
3738 | 130 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
3739 | 131 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
3740 | 132 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
3741 | 133 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3742 | 134 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
3743 | 135 | }, | ||
3744 | 136 | 'userprofiles.userprofile': { | ||
3745 | 137 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3746 | 138 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3747 | 139 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3748 | 140 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3749 | 141 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3750 | 142 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3751 | 143 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3752 | 144 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3753 | 145 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
3754 | 146 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3755 | 147 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
3756 | 148 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
3757 | 149 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
3758 | 150 | } | ||
3759 | 151 | } | ||
3760 | 152 | |||
3761 | 153 | complete_apps = ['meetings'] | ||
3762 | 154 | 0 | ||
3763 | === added file 'loco_directory/meetings/migrations/0001_initial.py' | |||
3764 | --- loco_directory/meetings/migrations/0001_initial.py 1970-01-01 00:00:00 +0000 | |||
3765 | +++ loco_directory/meetings/migrations/0001_initial.py 2016-08-16 07:31:30 +0000 | |||
3766 | @@ -0,0 +1,40 @@ | |||
3767 | 1 | # -*- coding: utf-8 -*- | ||
3768 | 2 | from __future__ import unicode_literals | ||
3769 | 3 | |||
3770 | 4 | from django.db import models, migrations | ||
3771 | 5 | import datetime | ||
3772 | 6 | |||
3773 | 7 | |||
3774 | 8 | class Migration(migrations.Migration): | ||
3775 | 9 | |||
3776 | 10 | dependencies = [ | ||
3777 | 11 | ('teams', '0009_auto_20160815_2339'), | ||
3778 | 12 | ] | ||
3779 | 13 | |||
3780 | 14 | operations = [ | ||
3781 | 15 | migrations.CreateModel( | ||
3782 | 16 | name='BaseMeeting', | ||
3783 | 17 | fields=[ | ||
3784 | 18 | ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||
3785 | 19 | ('name', models.CharField(max_length=150, verbose_name='Meeting Name')), | ||
3786 | 20 | ('date_begin', models.DateTimeField(help_text='start date and local time of the meeting in UTC', verbose_name='Begins', db_index=True)), | ||
3787 | 21 | ('date_end', models.DateTimeField(help_text='end date and local time of the meeting in UTC', verbose_name='Ends', db_index=True)), | ||
3788 | 22 | ('channel', models.CharField(help_text='Channel that the meeting will be held in. Include #', max_length=150, null=True, verbose_name='Meeting Channel')), | ||
3789 | 23 | ('logs', models.URLField(help_text='After the meeting, add a link to the meeting log', null=True, verbose_name='Meeting Log', blank=True)), | ||
3790 | 24 | ('date_created', models.DateTimeField(default=datetime.datetime(2016, 8, 15, 23, 40, 30, 987478), help_text='the date and time when the event was created', db_index=True)), | ||
3791 | 25 | ], | ||
3792 | 26 | options={ | ||
3793 | 27 | }, | ||
3794 | 28 | bases=(models.Model,), | ||
3795 | 29 | ), | ||
3796 | 30 | migrations.CreateModel( | ||
3797 | 31 | name='TeamMeeting', | ||
3798 | 32 | fields=[ | ||
3799 | 33 | ('basemeeting_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='meetings.BaseMeeting')), | ||
3800 | 34 | ('teams', models.ManyToManyField(help_text='teams of this meeting.', to='teams.Team', verbose_name='Teams Participating', db_index=True)), | ||
3801 | 35 | ], | ||
3802 | 36 | options={ | ||
3803 | 37 | }, | ||
3804 | 38 | bases=('meetings.basemeeting',), | ||
3805 | 39 | ), | ||
3806 | 40 | ] | ||
3807 | 0 | 41 | ||
3808 | === added file 'loco_directory/meetings/migrations/0002_auto_20160815_2342.py' | |||
3809 | --- loco_directory/meetings/migrations/0002_auto_20160815_2342.py 1970-01-01 00:00:00 +0000 | |||
3810 | +++ loco_directory/meetings/migrations/0002_auto_20160815_2342.py 2016-08-16 07:31:30 +0000 | |||
3811 | @@ -0,0 +1,45 @@ | |||
3812 | 1 | # -*- coding: utf-8 -*- | ||
3813 | 2 | from __future__ import unicode_literals | ||
3814 | 3 | |||
3815 | 4 | from django.db import models, migrations | ||
3816 | 5 | import datetime | ||
3817 | 6 | |||
3818 | 7 | |||
3819 | 8 | class Migration(migrations.Migration): | ||
3820 | 9 | |||
3821 | 10 | dependencies = [ | ||
3822 | 11 | ('userprofiles', '0002_auto_20160815_2339'), | ||
3823 | 12 | ('meetings', '0001_initial'), | ||
3824 | 13 | ] | ||
3825 | 14 | |||
3826 | 15 | operations = [ | ||
3827 | 16 | migrations.CreateModel( | ||
3828 | 17 | name='AgendaItem', | ||
3829 | 18 | fields=[ | ||
3830 | 19 | ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | ||
3831 | 20 | ('order', models.PositiveIntegerField(help_text='index number of where this item falls in the agenda', verbose_name='Order')), | ||
3832 | 21 | ('created_date', models.DateTimeField(help_text='timestamp of when this item was created', verbose_name='Created Date', auto_now_add=True)), | ||
3833 | 22 | ('title', models.CharField(help_text='descriptive name for this item', max_length=150, verbose_name='Title')), | ||
3834 | 23 | ('description', models.TextField(help_text='detailed description of this item', null=True, verbose_name='Description', blank=True)), | ||
3835 | 24 | ('log', models.URLField(help_text="URL to this item's discussion", null=True, verbose_name='Log URL', blank=True)), | ||
3836 | 25 | ('meeting', models.ForeignKey(related_name=b'agenda', verbose_name='Meeting', to='meetings.BaseMeeting', help_text='meeting during which this agenda item is to be discussed')), | ||
3837 | 26 | ('owner', models.ForeignKey(verbose_name='Owner', to='userprofiles.UserProfile', help_text='person proposing or responsible for this item')), | ||
3838 | 27 | ('parent', models.ForeignKey(related_name=b'children', blank=True, to='meetings.AgendaItem', help_text='agenda item that contains this item', null=True, verbose_name='Parent Agenda Item')), | ||
3839 | 28 | ], | ||
3840 | 29 | options={ | ||
3841 | 30 | 'ordering': ('parent__id', 'order'), | ||
3842 | 31 | }, | ||
3843 | 32 | bases=(models.Model,), | ||
3844 | 33 | ), | ||
3845 | 34 | migrations.AddField( | ||
3846 | 35 | model_name='basemeeting', | ||
3847 | 36 | name='chair', | ||
3848 | 37 | field=models.ForeignKey(blank=True, to='userprofiles.UserProfile', null=True), | ||
3849 | 38 | preserve_default=True, | ||
3850 | 39 | ), | ||
3851 | 40 | migrations.AlterField( | ||
3852 | 41 | model_name='basemeeting', | ||
3853 | 42 | name='date_created', | ||
3854 | 43 | field=models.DateTimeField(default=datetime.datetime.now, help_text='the date and time when the event was created', db_index=True), | ||
3855 | 44 | ), | ||
3856 | 45 | ] | ||
3857 | 0 | 46 | ||
3858 | === removed file 'loco_directory/meetings/migrations/0002_channel_logs.py' | |||
3859 | --- loco_directory/meetings/migrations/0002_channel_logs.py 2010-12-06 16:22:09 +0000 | |||
3860 | +++ loco_directory/meetings/migrations/0002_channel_logs.py 1970-01-01 00:00:00 +0000 | |||
3861 | @@ -1,135 +0,0 @@ | |||
3862 | 1 | |||
3863 | 2 | from south.db import db | ||
3864 | 3 | from django.db import models | ||
3865 | 4 | from meetings.models import * | ||
3866 | 5 | |||
3867 | 6 | class Migration: | ||
3868 | 7 | |||
3869 | 8 | def forwards(self, orm): | ||
3870 | 9 | |||
3871 | 10 | # Adding field 'BaseMeeting.logs' | ||
3872 | 11 | db.add_column('meetings_basemeeting', 'logs', orm['meetings.basemeeting:logs']) | ||
3873 | 12 | |||
3874 | 13 | # Adding field 'BaseMeeting.channel' | ||
3875 | 14 | db.add_column('meetings_basemeeting', 'channel', orm['meetings.basemeeting:channel']) | ||
3876 | 15 | |||
3877 | 16 | |||
3878 | 17 | |||
3879 | 18 | def backwards(self, orm): | ||
3880 | 19 | |||
3881 | 20 | # Deleting field 'BaseMeeting.logs' | ||
3882 | 21 | db.delete_column('meetings_basemeeting', 'logs') | ||
3883 | 22 | |||
3884 | 23 | # Deleting field 'BaseMeeting.channel' | ||
3885 | 24 | db.delete_column('meetings_basemeeting', 'channel') | ||
3886 | 25 | |||
3887 | 26 | |||
3888 | 27 | |||
3889 | 28 | models = { | ||
3890 | 29 | 'auth.group': { | ||
3891 | 30 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3892 | 31 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
3893 | 32 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
3894 | 33 | }, | ||
3895 | 34 | 'auth.permission': { | ||
3896 | 35 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
3897 | 36 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
3898 | 37 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
3899 | 38 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3900 | 39 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
3901 | 40 | }, | ||
3902 | 41 | 'auth.user': { | ||
3903 | 42 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
3904 | 43 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
3905 | 44 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
3906 | 45 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
3907 | 46 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3908 | 47 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
3909 | 48 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
3910 | 49 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
3911 | 50 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
3912 | 51 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
3913 | 52 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
3914 | 53 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
3915 | 54 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
3916 | 55 | }, | ||
3917 | 56 | 'contenttypes.contenttype': { | ||
3918 | 57 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
3919 | 58 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
3920 | 59 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3921 | 60 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
3922 | 61 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
3923 | 62 | }, | ||
3924 | 63 | 'meetings.basemeeting': { | ||
3925 | 64 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}), | ||
3926 | 65 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
3927 | 66 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 12, 6, 15, 58, 32, 671272)', 'db_index': 'True'}), | ||
3928 | 67 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
3929 | 68 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3930 | 69 | 'logs': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3931 | 70 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
3932 | 71 | }, | ||
3933 | 72 | 'meetings.teammeeting': { | ||
3934 | 73 | 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}), | ||
3935 | 74 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}) | ||
3936 | 75 | }, | ||
3937 | 76 | 'teams.continent': { | ||
3938 | 77 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3939 | 78 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
3940 | 79 | }, | ||
3941 | 80 | 'teams.country': { | ||
3942 | 81 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
3943 | 82 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3944 | 83 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
3945 | 84 | }, | ||
3946 | 85 | 'teams.language': { | ||
3947 | 86 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
3948 | 87 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3949 | 88 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
3950 | 89 | }, | ||
3951 | 90 | 'teams.team': { | ||
3952 | 91 | 'Meta': {'db_table': "'teams'"}, | ||
3953 | 92 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
3954 | 93 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
3955 | 94 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
3956 | 95 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
3957 | 96 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
3958 | 97 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
3959 | 98 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
3960 | 99 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
3961 | 100 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
3962 | 101 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
3963 | 102 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3964 | 103 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3965 | 104 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
3966 | 105 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
3967 | 106 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
3968 | 107 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3969 | 108 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3970 | 109 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
3971 | 110 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
3972 | 111 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
3973 | 112 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
3974 | 113 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
3975 | 114 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
3976 | 115 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3977 | 116 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
3978 | 117 | }, | ||
3979 | 118 | 'userprofiles.userprofile': { | ||
3980 | 119 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3981 | 120 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
3982 | 121 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3983 | 122 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3984 | 123 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
3985 | 124 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3986 | 125 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3987 | 126 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3988 | 127 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
3989 | 128 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
3990 | 129 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
3991 | 130 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
3992 | 131 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
3993 | 132 | } | ||
3994 | 133 | } | ||
3995 | 134 | |||
3996 | 135 | complete_apps = ['meetings'] | ||
3997 | 136 | 0 | ||
3998 | === removed file 'loco_directory/meetings/migrations/0003_add_chair.py' | |||
3999 | --- loco_directory/meetings/migrations/0003_add_chair.py 2010-12-07 21:33:54 +0000 | |||
4000 | +++ loco_directory/meetings/migrations/0003_add_chair.py 1970-01-01 00:00:00 +0000 | |||
4001 | @@ -1,130 +0,0 @@ | |||
4002 | 1 | |||
4003 | 2 | from south.db import db | ||
4004 | 3 | from django.db import models | ||
4005 | 4 | from meetings.models import * | ||
4006 | 5 | |||
4007 | 6 | class Migration: | ||
4008 | 7 | |||
4009 | 8 | def forwards(self, orm): | ||
4010 | 9 | |||
4011 | 10 | # Adding field 'BaseMeeting.chair' | ||
4012 | 11 | db.add_column('meetings_basemeeting', 'chair', orm['meetings.basemeeting:chair']) | ||
4013 | 12 | |||
4014 | 13 | |||
4015 | 14 | |||
4016 | 15 | def backwards(self, orm): | ||
4017 | 16 | |||
4018 | 17 | # Deleting field 'BaseMeeting.chair' | ||
4019 | 18 | db.delete_column('meetings_basemeeting', 'chair_id') | ||
4020 | 19 | |||
4021 | 20 | |||
4022 | 21 | |||
4023 | 22 | models = { | ||
4024 | 23 | 'auth.group': { | ||
4025 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4026 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
4027 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
4028 | 27 | }, | ||
4029 | 28 | 'auth.permission': { | ||
4030 | 29 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
4031 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4032 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
4033 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4034 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
4035 | 34 | }, | ||
4036 | 35 | 'auth.user': { | ||
4037 | 36 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
4038 | 37 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
4039 | 38 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
4040 | 39 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
4041 | 40 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4042 | 41 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4043 | 42 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4044 | 43 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4045 | 44 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
4046 | 45 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
4047 | 46 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
4048 | 47 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
4049 | 48 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
4050 | 49 | }, | ||
4051 | 50 | 'contenttypes.contenttype': { | ||
4052 | 51 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
4053 | 52 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4054 | 53 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4055 | 54 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4056 | 55 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
4057 | 56 | }, | ||
4058 | 57 | 'meetings.basemeeting': { | ||
4059 | 58 | 'chair': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'}), | ||
4060 | 59 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}), | ||
4061 | 60 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
4062 | 61 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 12, 7, 20, 0, 18, 626730)', 'db_index': 'True'}), | ||
4063 | 62 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
4064 | 63 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4065 | 64 | 'logs': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4066 | 65 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
4067 | 66 | }, | ||
4068 | 67 | 'meetings.teammeeting': { | ||
4069 | 68 | 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}), | ||
4070 | 69 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}) | ||
4071 | 70 | }, | ||
4072 | 71 | 'teams.continent': { | ||
4073 | 72 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4074 | 73 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
4075 | 74 | }, | ||
4076 | 75 | 'teams.country': { | ||
4077 | 76 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
4078 | 77 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4079 | 78 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
4080 | 79 | }, | ||
4081 | 80 | 'teams.language': { | ||
4082 | 81 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
4083 | 82 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4084 | 83 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
4085 | 84 | }, | ||
4086 | 85 | 'teams.team': { | ||
4087 | 86 | 'Meta': {'db_table': "'teams'"}, | ||
4088 | 87 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4089 | 88 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
4090 | 89 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4091 | 90 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
4092 | 91 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
4093 | 92 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
4094 | 93 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
4095 | 94 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
4096 | 95 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
4097 | 96 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4098 | 97 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4099 | 98 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4100 | 99 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
4101 | 100 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
4102 | 101 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
4103 | 102 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4104 | 103 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4105 | 104 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
4106 | 105 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
4107 | 106 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4108 | 107 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4109 | 108 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4110 | 109 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
4111 | 110 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4112 | 111 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
4113 | 112 | }, | ||
4114 | 113 | 'userprofiles.userprofile': { | ||
4115 | 114 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4116 | 115 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4117 | 116 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4118 | 117 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4119 | 118 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4120 | 119 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4121 | 120 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4122 | 121 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4123 | 122 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
4124 | 123 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4125 | 124 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
4126 | 125 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
4127 | 126 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
4128 | 127 | } | ||
4129 | 128 | } | ||
4130 | 129 | |||
4131 | 130 | complete_apps = ['meetings'] | ||
4132 | 131 | 0 | ||
4133 | === added file 'loco_directory/meetings/migrations/0003_auto_20160815_2344.py' | |||
4134 | --- loco_directory/meetings/migrations/0003_auto_20160815_2344.py 1970-01-01 00:00:00 +0000 | |||
4135 | +++ loco_directory/meetings/migrations/0003_auto_20160815_2344.py 2016-08-16 07:31:30 +0000 | |||
4136 | @@ -0,0 +1,19 @@ | |||
4137 | 1 | # -*- coding: utf-8 -*- | ||
4138 | 2 | from __future__ import unicode_literals | ||
4139 | 3 | |||
4140 | 4 | from django.db import models, migrations | ||
4141 | 5 | |||
4142 | 6 | |||
4143 | 7 | class Migration(migrations.Migration): | ||
4144 | 8 | |||
4145 | 9 | dependencies = [ | ||
4146 | 10 | ('meetings', '0002_auto_20160815_2342'), | ||
4147 | 11 | ] | ||
4148 | 12 | |||
4149 | 13 | operations = [ | ||
4150 | 14 | migrations.AlterField( | ||
4151 | 15 | model_name='basemeeting', | ||
4152 | 16 | name='chair', | ||
4153 | 17 | field=models.ForeignKey(verbose_name='Meeting Chair', blank=True, to='userprofiles.UserProfile', null=True), | ||
4154 | 18 | ), | ||
4155 | 19 | ] | ||
4156 | 0 | 20 | ||
4157 | === removed file 'loco_directory/meetings/migrations/0004_add_agenda.py' | |||
4158 | --- loco_directory/meetings/migrations/0004_add_agenda.py 2010-12-07 21:33:54 +0000 | |||
4159 | +++ loco_directory/meetings/migrations/0004_add_agenda.py 1970-01-01 00:00:00 +0000 | |||
4160 | @@ -1,152 +0,0 @@ | |||
4161 | 1 | |||
4162 | 2 | from south.db import db | ||
4163 | 3 | from django.db import models | ||
4164 | 4 | from meetings.models import * | ||
4165 | 5 | |||
4166 | 6 | class Migration: | ||
4167 | 7 | |||
4168 | 8 | def forwards(self, orm): | ||
4169 | 9 | |||
4170 | 10 | # Adding model 'AgendaItem' | ||
4171 | 11 | db.create_table('meetings_agendaitem', ( | ||
4172 | 12 | ('id', orm['meetings.agendaitem:id']), | ||
4173 | 13 | ('meeting', orm['meetings.agendaitem:meeting']), | ||
4174 | 14 | ('parent', orm['meetings.agendaitem:parent']), | ||
4175 | 15 | ('order', orm['meetings.agendaitem:order']), | ||
4176 | 16 | ('owner', orm['meetings.agendaitem:owner']), | ||
4177 | 17 | ('created_date', orm['meetings.agendaitem:created_date']), | ||
4178 | 18 | ('title', orm['meetings.agendaitem:title']), | ||
4179 | 19 | ('description', orm['meetings.agendaitem:description']), | ||
4180 | 20 | ('log', orm['meetings.agendaitem:log']), | ||
4181 | 21 | )) | ||
4182 | 22 | db.send_create_signal('meetings', ['AgendaItem']) | ||
4183 | 23 | |||
4184 | 24 | |||
4185 | 25 | |||
4186 | 26 | def backwards(self, orm): | ||
4187 | 27 | |||
4188 | 28 | # Deleting model 'AgendaItem' | ||
4189 | 29 | db.delete_table('meetings_agendaitem') | ||
4190 | 30 | |||
4191 | 31 | |||
4192 | 32 | |||
4193 | 33 | models = { | ||
4194 | 34 | 'auth.group': { | ||
4195 | 35 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4196 | 36 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
4197 | 37 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
4198 | 38 | }, | ||
4199 | 39 | 'auth.permission': { | ||
4200 | 40 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
4201 | 41 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4202 | 42 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
4203 | 43 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4204 | 44 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
4205 | 45 | }, | ||
4206 | 46 | 'auth.user': { | ||
4207 | 47 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
4208 | 48 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
4209 | 49 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
4210 | 50 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
4211 | 51 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4212 | 52 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4213 | 53 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4214 | 54 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4215 | 55 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
4216 | 56 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
4217 | 57 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
4218 | 58 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
4219 | 59 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
4220 | 60 | }, | ||
4221 | 61 | 'contenttypes.contenttype': { | ||
4222 | 62 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
4223 | 63 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4224 | 64 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4225 | 65 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4226 | 66 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
4227 | 67 | }, | ||
4228 | 68 | 'meetings.agendaitem': { | ||
4229 | 69 | 'created_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
4230 | 70 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
4231 | 71 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4232 | 72 | 'log': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4233 | 73 | 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['meetings.BaseMeeting']"}), | ||
4234 | 74 | 'order': ('django.db.models.fields.PositiveIntegerField', [], {}), | ||
4235 | 75 | 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
4236 | 76 | 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['meetings.AgendaItem']"}), | ||
4237 | 77 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
4238 | 78 | }, | ||
4239 | 79 | 'meetings.basemeeting': { | ||
4240 | 80 | 'chair': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'}), | ||
4241 | 81 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}), | ||
4242 | 82 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
4243 | 83 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 12, 7, 20, 37, 42, 549244)', 'db_index': 'True'}), | ||
4244 | 84 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
4245 | 85 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4246 | 86 | 'logs': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4247 | 87 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
4248 | 88 | }, | ||
4249 | 89 | 'meetings.teammeeting': { | ||
4250 | 90 | 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}), | ||
4251 | 91 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}) | ||
4252 | 92 | }, | ||
4253 | 93 | 'teams.continent': { | ||
4254 | 94 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4255 | 95 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
4256 | 96 | }, | ||
4257 | 97 | 'teams.country': { | ||
4258 | 98 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
4259 | 99 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4260 | 100 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
4261 | 101 | }, | ||
4262 | 102 | 'teams.language': { | ||
4263 | 103 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
4264 | 104 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4265 | 105 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
4266 | 106 | }, | ||
4267 | 107 | 'teams.team': { | ||
4268 | 108 | 'Meta': {'db_table': "'teams'"}, | ||
4269 | 109 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4270 | 110 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
4271 | 111 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4272 | 112 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
4273 | 113 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
4274 | 114 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
4275 | 115 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
4276 | 116 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
4277 | 117 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
4278 | 118 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4279 | 119 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4280 | 120 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4281 | 121 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
4282 | 122 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
4283 | 123 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
4284 | 124 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4285 | 125 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4286 | 126 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
4287 | 127 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
4288 | 128 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4289 | 129 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4290 | 130 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4291 | 131 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
4292 | 132 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4293 | 133 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
4294 | 134 | }, | ||
4295 | 135 | 'userprofiles.userprofile': { | ||
4296 | 136 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4297 | 137 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4298 | 138 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4299 | 139 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4300 | 140 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4301 | 141 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4302 | 142 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4303 | 143 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4304 | 144 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
4305 | 145 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4306 | 146 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
4307 | 147 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
4308 | 148 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
4309 | 149 | } | ||
4310 | 150 | } | ||
4311 | 151 | |||
4312 | 152 | complete_apps = ['meetings'] | ||
4313 | 153 | 0 | ||
4314 | === added file 'loco_directory/meetings/migrations/0004_basemeeting_minutes.py' | |||
4315 | --- loco_directory/meetings/migrations/0004_basemeeting_minutes.py 1970-01-01 00:00:00 +0000 | |||
4316 | +++ loco_directory/meetings/migrations/0004_basemeeting_minutes.py 2016-08-16 07:31:30 +0000 | |||
4317 | @@ -0,0 +1,20 @@ | |||
4318 | 1 | # -*- coding: utf-8 -*- | ||
4319 | 2 | from __future__ import unicode_literals | ||
4320 | 3 | |||
4321 | 4 | from django.db import models, migrations | ||
4322 | 5 | |||
4323 | 6 | |||
4324 | 7 | class Migration(migrations.Migration): | ||
4325 | 8 | |||
4326 | 9 | dependencies = [ | ||
4327 | 10 | ('meetings', '0003_auto_20160815_2344'), | ||
4328 | 11 | ] | ||
4329 | 12 | |||
4330 | 13 | operations = [ | ||
4331 | 14 | migrations.AddField( | ||
4332 | 15 | model_name='basemeeting', | ||
4333 | 16 | name='minutes', | ||
4334 | 17 | field=models.URLField(help_text='After the meeting, add a link to the meeting minutes', null=True, verbose_name='Meeting Minutes', blank=True), | ||
4335 | 18 | preserve_default=True, | ||
4336 | 19 | ), | ||
4337 | 20 | ] | ||
4338 | 0 | 21 | ||
4339 | === removed file 'loco_directory/meetings/migrations/0005_add_meeting_minutes.py' | |||
4340 | --- loco_directory/meetings/migrations/0005_add_meeting_minutes.py 2010-12-25 17:08:56 +0000 | |||
4341 | +++ loco_directory/meetings/migrations/0005_add_meeting_minutes.py 1970-01-01 00:00:00 +0000 | |||
4342 | @@ -1,142 +0,0 @@ | |||
4343 | 1 | |||
4344 | 2 | from south.db import db | ||
4345 | 3 | from django.db import models | ||
4346 | 4 | from meetings.models import * | ||
4347 | 5 | |||
4348 | 6 | class Migration: | ||
4349 | 7 | |||
4350 | 8 | def forwards(self, orm): | ||
4351 | 9 | |||
4352 | 10 | # Adding field 'BaseMeeting.minutes' | ||
4353 | 11 | db.add_column('meetings_basemeeting', 'minutes', orm['meetings.basemeeting:minutes']) | ||
4354 | 12 | |||
4355 | 13 | |||
4356 | 14 | |||
4357 | 15 | def backwards(self, orm): | ||
4358 | 16 | |||
4359 | 17 | # Deleting field 'BaseMeeting.minutes' | ||
4360 | 18 | db.delete_column('meetings_basemeeting', 'minutes') | ||
4361 | 19 | |||
4362 | 20 | |||
4363 | 21 | |||
4364 | 22 | models = { | ||
4365 | 23 | 'auth.group': { | ||
4366 | 24 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4367 | 25 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
4368 | 26 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
4369 | 27 | }, | ||
4370 | 28 | 'auth.permission': { | ||
4371 | 29 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
4372 | 30 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4373 | 31 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
4374 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4375 | 33 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
4376 | 34 | }, | ||
4377 | 35 | 'auth.user': { | ||
4378 | 36 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
4379 | 37 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
4380 | 38 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
4381 | 39 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
4382 | 40 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4383 | 41 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4384 | 42 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4385 | 43 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4386 | 44 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
4387 | 45 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
4388 | 46 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
4389 | 47 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
4390 | 48 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
4391 | 49 | }, | ||
4392 | 50 | 'contenttypes.contenttype': { | ||
4393 | 51 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
4394 | 52 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4395 | 53 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4396 | 54 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4397 | 55 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
4398 | 56 | }, | ||
4399 | 57 | 'meetings.agendaitem': { | ||
4400 | 58 | 'created_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
4401 | 59 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
4402 | 60 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4403 | 61 | 'log': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4404 | 62 | 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'agenda'", 'to': "orm['meetings.BaseMeeting']"}), | ||
4405 | 63 | 'order': ('django.db.models.fields.PositiveIntegerField', [], {}), | ||
4406 | 64 | 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
4407 | 65 | 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['meetings.AgendaItem']"}), | ||
4408 | 66 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
4409 | 67 | }, | ||
4410 | 68 | 'meetings.basemeeting': { | ||
4411 | 69 | 'chair': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'}), | ||
4412 | 70 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}), | ||
4413 | 71 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
4414 | 72 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2010, 12, 25, 17, 7, 54, 656457)', 'db_index': 'True'}), | ||
4415 | 73 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
4416 | 74 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4417 | 75 | 'logs': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4418 | 76 | 'minutes': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4419 | 77 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
4420 | 78 | }, | ||
4421 | 79 | 'meetings.teammeeting': { | ||
4422 | 80 | 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}), | ||
4423 | 81 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}) | ||
4424 | 82 | }, | ||
4425 | 83 | 'teams.continent': { | ||
4426 | 84 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4427 | 85 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
4428 | 86 | }, | ||
4429 | 87 | 'teams.country': { | ||
4430 | 88 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
4431 | 89 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4432 | 90 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
4433 | 91 | }, | ||
4434 | 92 | 'teams.language': { | ||
4435 | 93 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
4436 | 94 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4437 | 95 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
4438 | 96 | }, | ||
4439 | 97 | 'teams.team': { | ||
4440 | 98 | 'Meta': {'db_table': "'teams'"}, | ||
4441 | 99 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4442 | 100 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
4443 | 101 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4444 | 102 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
4445 | 103 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
4446 | 104 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
4447 | 105 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
4448 | 106 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
4449 | 107 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
4450 | 108 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4451 | 109 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4452 | 110 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4453 | 111 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
4454 | 112 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
4455 | 113 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
4456 | 114 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4457 | 115 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4458 | 116 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
4459 | 117 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
4460 | 118 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4461 | 119 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4462 | 120 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4463 | 121 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
4464 | 122 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4465 | 123 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
4466 | 124 | }, | ||
4467 | 125 | 'userprofiles.userprofile': { | ||
4468 | 126 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4469 | 127 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4470 | 128 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4471 | 129 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4472 | 130 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4473 | 131 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4474 | 132 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4475 | 133 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4476 | 134 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
4477 | 135 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4478 | 136 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
4479 | 137 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
4480 | 138 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
4481 | 139 | } | ||
4482 | 140 | } | ||
4483 | 141 | |||
4484 | 142 | complete_apps = ['meetings'] | ||
4485 | 143 | 0 | ||
4486 | === added file 'loco_directory/meetings/migrations/0005_auto_20160815_2352.py' | |||
4487 | --- loco_directory/meetings/migrations/0005_auto_20160815_2352.py 1970-01-01 00:00:00 +0000 | |||
4488 | +++ loco_directory/meetings/migrations/0005_auto_20160815_2352.py 2016-08-16 07:31:30 +0000 | |||
4489 | @@ -0,0 +1,33 @@ | |||
4490 | 1 | # -*- coding: utf-8 -*- | ||
4491 | 2 | from __future__ import unicode_literals | ||
4492 | 3 | |||
4493 | 4 | from django.db import models, migrations | ||
4494 | 5 | |||
4495 | 6 | |||
4496 | 7 | class Migration(migrations.Migration): | ||
4497 | 8 | |||
4498 | 9 | dependencies = [ | ||
4499 | 10 | ('meetings', '0004_basemeeting_minutes'), | ||
4500 | 11 | ] | ||
4501 | 12 | |||
4502 | 13 | operations = [ | ||
4503 | 14 | migrations.AlterModelOptions( | ||
4504 | 15 | name='agendaitem', | ||
4505 | 16 | options={'ordering': ('parent__id', 'order', 'created_date')}, | ||
4506 | 17 | ), | ||
4507 | 18 | migrations.AlterField( | ||
4508 | 19 | model_name='agendaitem', | ||
4509 | 20 | name='order', | ||
4510 | 21 | field=models.PositiveIntegerField(default=1, help_text='index number of where this item falls in the agenda', verbose_name='Order'), | ||
4511 | 22 | ), | ||
4512 | 23 | migrations.AlterField( | ||
4513 | 24 | model_name='basemeeting', | ||
4514 | 25 | name='date_begin', | ||
4515 | 26 | field=models.DateTimeField(help_text='start date and time of the meeting in UTC', verbose_name='Begins', db_index=True), | ||
4516 | 27 | ), | ||
4517 | 28 | migrations.AlterField( | ||
4518 | 29 | model_name='basemeeting', | ||
4519 | 30 | name='date_end', | ||
4520 | 31 | field=models.DateTimeField(help_text='end date and time of the meeting in UTC', verbose_name='Ends', db_index=True), | ||
4521 | 32 | ), | ||
4522 | 33 | ] | ||
4523 | 0 | 34 | ||
4524 | === removed file 'loco_directory/meetings/migrations/0006_add_timezone.py' | |||
4525 | --- loco_directory/meetings/migrations/0006_add_timezone.py 2011-06-17 17:10:41 +0000 | |||
4526 | +++ loco_directory/meetings/migrations/0006_add_timezone.py 1970-01-01 00:00:00 +0000 | |||
4527 | @@ -1,154 +0,0 @@ | |||
4528 | 1 | |||
4529 | 2 | from south.db import db | ||
4530 | 3 | from django.db import models | ||
4531 | 4 | from meetings.models import * | ||
4532 | 5 | |||
4533 | 6 | class Migration: | ||
4534 | 7 | |||
4535 | 8 | def forwards(self, orm): | ||
4536 | 9 | |||
4537 | 10 | # Adding field 'TeamMeeting.meeting_tz' | ||
4538 | 11 | db.add_column('meetings_teammeeting', 'meeting_tz', orm['meetings.teammeeting:meeting_tz']) | ||
4539 | 12 | |||
4540 | 13 | # Changing field 'BaseMeeting.date_created' | ||
4541 | 14 | # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2011, 6, 17, 15, 22, 56, 255453), db_index=True)) | ||
4542 | 15 | db.alter_column('meetings_basemeeting', 'date_created', orm['meetings.basemeeting:date_created']) | ||
4543 | 16 | |||
4544 | 17 | |||
4545 | 18 | |||
4546 | 19 | def backwards(self, orm): | ||
4547 | 20 | |||
4548 | 21 | # Deleting field 'TeamMeeting.meeting_tz' | ||
4549 | 22 | db.delete_column('meetings_teammeeting', 'meeting_tz') | ||
4550 | 23 | |||
4551 | 24 | # Changing field 'BaseMeeting.date_created' | ||
4552 | 25 | # (to signature: django.db.models.fields.DateTimeField(default=datetime.datetime(2010, 12, 25, 17, 7, 54, 656457), db_index=True)) | ||
4553 | 26 | db.alter_column('meetings_basemeeting', 'date_created', orm['meetings.basemeeting:date_created']) | ||
4554 | 27 | |||
4555 | 28 | |||
4556 | 29 | |||
4557 | 30 | models = { | ||
4558 | 31 | 'auth.group': { | ||
4559 | 32 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4560 | 33 | 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), | ||
4561 | 34 | 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) | ||
4562 | 35 | }, | ||
4563 | 36 | 'auth.permission': { | ||
4564 | 37 | 'Meta': {'unique_together': "(('content_type', 'codename'),)"}, | ||
4565 | 38 | 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4566 | 39 | 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), | ||
4567 | 40 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4568 | 41 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) | ||
4569 | 42 | }, | ||
4570 | 43 | 'auth.user': { | ||
4571 | 44 | 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
4572 | 45 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), | ||
4573 | 46 | 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
4574 | 47 | 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), | ||
4575 | 48 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4576 | 49 | 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4577 | 50 | 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4578 | 51 | 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4579 | 52 | 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), | ||
4580 | 53 | 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), | ||
4581 | 54 | 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), | ||
4582 | 55 | 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), | ||
4583 | 56 | 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) | ||
4584 | 57 | }, | ||
4585 | 58 | 'contenttypes.contenttype': { | ||
4586 | 59 | 'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"}, | ||
4587 | 60 | 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4588 | 61 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4589 | 62 | 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), | ||
4590 | 63 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) | ||
4591 | 64 | }, | ||
4592 | 65 | 'meetings.agendaitem': { | ||
4593 | 66 | 'created_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), | ||
4594 | 67 | 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), | ||
4595 | 68 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4596 | 69 | 'log': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4597 | 70 | 'meeting': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'agenda'", 'to': "orm['meetings.BaseMeeting']"}), | ||
4598 | 71 | 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), | ||
4599 | 72 | 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']"}), | ||
4600 | 73 | 'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['meetings.AgendaItem']"}), | ||
4601 | 74 | 'title': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
4602 | 75 | }, | ||
4603 | 76 | 'meetings.basemeeting': { | ||
4604 | 77 | 'chair': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['userprofiles.UserProfile']", 'null': 'True', 'blank': 'True'}), | ||
4605 | 78 | 'channel': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}), | ||
4606 | 79 | 'date_begin': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
4607 | 80 | 'date_created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2011, 6, 17, 15, 22, 56, 255453)', 'db_index': 'True'}), | ||
4608 | 81 | 'date_end': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), | ||
4609 | 82 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4610 | 83 | 'logs': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4611 | 84 | 'minutes': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4612 | 85 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}) | ||
4613 | 86 | }, | ||
4614 | 87 | 'meetings.teammeeting': { | ||
4615 | 88 | 'basemeeting_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['meetings.BaseMeeting']", 'unique': 'True', 'primary_key': 'True'}), | ||
4616 | 89 | 'meeting_tz': ('django.db.models.fields.CharField', [], {'default': "'team'", 'max_length': '32'}), | ||
4617 | 90 | 'teams': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Team']", 'db_index': 'True', 'symmetrical': 'False'}) | ||
4618 | 91 | }, | ||
4619 | 92 | 'teams.continent': { | ||
4620 | 93 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4621 | 94 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '50'}) | ||
4622 | 95 | }, | ||
4623 | 96 | 'teams.country': { | ||
4624 | 97 | 'continents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Continent']", 'symmetrical': 'False'}), | ||
4625 | 98 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4626 | 99 | 'name': ('django.db.models.fields.TextField', [], {'max_length': '100'}) | ||
4627 | 100 | }, | ||
4628 | 101 | 'teams.language': { | ||
4629 | 102 | 'code': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True'}), | ||
4630 | 103 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4631 | 104 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True'}) | ||
4632 | 105 | }, | ||
4633 | 106 | 'teams.team': { | ||
4634 | 107 | 'Meta': {'db_table': "'teams'"}, | ||
4635 | 108 | 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4636 | 109 | 'admin_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
4637 | 110 | 'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}), | ||
4638 | 111 | 'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
4639 | 112 | 'city': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
4640 | 113 | 'contact_profiles': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['userprofiles.UserProfile']", 'symmetrical': 'False'}), | ||
4641 | 114 | 'countries': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Country']", 'symmetrical': 'False'}), | ||
4642 | 115 | 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), | ||
4643 | 116 | 'expires_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), | ||
4644 | 117 | 'flickr_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4645 | 118 | 'forum_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4646 | 119 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4647 | 120 | 'irc_chan': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), | ||
4648 | 121 | 'languages': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['teams.Language']", 'symmetrical': 'False'}), | ||
4649 | 122 | 'lp_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True'}), | ||
4650 | 123 | 'microbloghashtag': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
4651 | 124 | 'ml_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4652 | 125 | 'mugshot_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4653 | 126 | 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'null': 'True'}), | ||
4654 | 127 | 'owner_profile': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owner'", 'null': 'True', 'to': "orm['userprofiles.UserProfile']"}), | ||
4655 | 128 | 'picasa_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4656 | 129 | 'pixie_id': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), | ||
4657 | 130 | 'provides_support': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'blank': 'True'}), | ||
4658 | 131 | 'spr': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), | ||
4659 | 132 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
4660 | 133 | 'web_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4661 | 134 | 'wiki_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) | ||
4662 | 135 | }, | ||
4663 | 136 | 'userprofiles.userprofile': { | ||
4664 | 137 | 'aim': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4665 | 138 | 'blog': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), | ||
4666 | 139 | 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4667 | 140 | 'flickr': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4668 | 141 | 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), | ||
4669 | 142 | 'identica': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4670 | 143 | 'irc': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4671 | 144 | 'mugshot': ('django.db.models.fields.URLField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}), | ||
4672 | 145 | 'picasa': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4673 | 146 | 'realname': ('django.db.models.fields.CharField', [], {'max_length': '150', 'blank': 'True'}), | ||
4674 | 147 | 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}), | ||
4675 | 148 | 'tz': ('django.db.models.fields.CharField', [], {'default': "'UTC'", 'max_length': '32'}), | ||
4676 | 149 | 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}), | ||
4677 | 150 | 'xmpp': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}) | ||
4678 | 151 | } | ||
4679 | 152 | } | ||
4680 | 153 | |||
4681 | 154 | complete_apps = ['meetings'] | ||
4682 | 155 | 0 | ||
4683 | === added file 'loco_directory/meetings/migrations/0006_teammeeting_meeting_tz.py' | |||
4684 | --- loco_directory/meetings/migrations/0006_teammeeting_meeting_tz.py 1970-01-01 00:00:00 +0000 | |||
4685 | +++ loco_directory/meetings/migrations/0006_teammeeting_meeting_tz.py 2016-08-16 07:31:30 +0000 | |||
4686 | @@ -0,0 +1,20 @@ | |||
4687 | 1 | # -*- coding: utf-8 -*- | ||
4688 | 2 | from __future__ import unicode_literals | ||
4689 | 3 | |||
4690 | 4 | from django.db import models, migrations | ||
4691 | 5 | |||
4692 | 6 | |||
4693 | 7 | class Migration(migrations.Migration): | ||
4694 | 8 | |||
4695 | 9 | dependencies = [ | ||
4696 | 10 | ('meetings', '0005_auto_20160815_2352'), | ||
4697 | 11 | ] | ||
4698 | 12 | |||
4699 | 13 | operations = [ | ||
4700 | 14 | migrations.AddField( | ||
4701 | 15 | model_name='teammeeting', | ||
4702 | 16 | name='meeting_tz', | ||
4703 | 17 | field=models.CharField(default=b'', max_length=32, verbose_name='Timezone', choices=[(b'team', b'Team Default'), (b'Africa/Abidjan', b'Africa/Abidjan'), (b'Africa/Accra', b'Africa/Accra'), (b'Africa/Addis_Ababa', b'Africa/Addis_Ababa'), (b'Africa/Algiers', b'Africa/Algiers'), (b'Africa/Asmara', b'Africa/Asmara'), (b'Africa/Asmera', b'Africa/Asmera'), (b'Africa/Bamako', b'Africa/Bamako'), (b'Africa/Bangui', b'Africa/Bangui'), (b'Africa/Banjul', b'Africa/Banjul'), (b'Africa/Bissau', b'Africa/Bissau'), (b'Africa/Blantyre', b'Africa/Blantyre'), (b'Africa/Brazzaville', b'Africa/Brazzaville'), (b'Africa/Bujumbura', b'Africa/Bujumbura'), (b'Africa/Cairo', b'Africa/Cairo'), (b'Africa/Casablanca', b'Africa/Casablanca'), (b'Africa/Ceuta', b'Africa/Ceuta'), (b'Africa/Conakry', b'Africa/Conakry'), (b'Africa/Dakar', b'Africa/Dakar'), (b'Africa/Dar_es_Salaam', b'Africa/Dar_es_Salaam'), (b'Africa/Djibouti', b'Africa/Djibouti'), (b'Africa/Douala', b'Africa/Douala'), (b'Africa/El_Aaiun', b'Africa/El_Aaiun'), (b'Africa/Freetown', b'Africa/Freetown'), (b'Africa/Gaborone', b'Africa/Gaborone'), (b'Africa/Harare', b'Africa/Harare'), (b'Africa/Johannesburg', b'Africa/Johannesburg'), (b'Africa/Juba', b'Africa/Juba'), (b'Africa/Kampala', b'Africa/Kampala'), (b'Africa/Khartoum', b'Africa/Khartoum'), (b'Africa/Kigali', b'Africa/Kigali'), (b'Africa/Kinshasa', b'Africa/Kinshasa'), (b'Africa/Lagos', b'Africa/Lagos'), (b'Africa/Libreville', b'Africa/Libreville'), (b'Africa/Lome', b'Africa/Lome'), (b'Africa/Luanda', b'Africa/Luanda'), (b'Africa/Lubumbashi', b'Africa/Lubumbashi'), (b'Africa/Lusaka', b'Africa/Lusaka'), (b'Africa/Malabo', b'Africa/Malabo'), (b'Africa/Maputo', b'Africa/Maputo'), (b'Africa/Maseru', b'Africa/Maseru'), (b'Africa/Mbabane', b'Africa/Mbabane'), (b'Africa/Mogadishu', b'Africa/Mogadishu'), (b'Africa/Monrovia', b'Africa/Monrovia'), (b'Africa/Nairobi', b'Africa/Nairobi'), (b'Africa/Ndjamena', b'Africa/Ndjamena'), (b'Africa/Niamey', b'Africa/Niamey'), (b'Africa/Nouakchott', b'Africa/Nouakchott'), (b'Africa/Ouagadougou', b'Africa/Ouagadougou'), (b'Africa/Porto-Novo', b'Africa/Porto-Novo'), (b'Africa/Sao_Tome', b'Africa/Sao_Tome'), (b'Africa/Timbuktu', b'Africa/Timbuktu'), (b'Africa/Tripoli', b'Africa/Tripoli'), (b'Africa/Tunis', b'Africa/Tunis'), (b'Africa/Windhoek', b'Africa/Windhoek'), (b'America/Adak', b'America/Adak'), (b'America/Anchorage', b'America/Anchorage'), (b'America/Anguilla', b'America/Anguilla'), (b'America/Antigua', b'America/Antigua'), (b'America/Araguaina', b'America/Araguaina'), (b'America/Argentina/Buenos_Aires', b'America/Argentina/Buenos_Aires'), (b'America/Argentina/Catamarca', b'America/Argentina/Catamarca'), (b'America/Argentina/ComodRivadavia', b'America/Argentina/ComodRivadavia'), (b'America/Argentina/Cordoba', b'America/Argentina/Cordoba'), (b'America/Argentina/Jujuy', b'America/Argentina/Jujuy'), (b'America/Argentina/La_Rioja', b'America/Argentina/La_Rioja'), (b'America/Argentina/Mendoza', b'America/Argentina/Mendoza'), (b'America/Argentina/Rio_Gallegos', b'America/Argentina/Rio_Gallegos'), (b'America/Argentina/Salta', b'America/Argentina/Salta'), (b'America/Argentina/San_Juan', b'America/Argentina/San_Juan'), (b'America/Argentina/San_Luis', b'America/Argentina/San_Luis'), (b'America/Argentina/Tucuman', b'America/Argentina/Tucuman'), (b'America/Argentina/Ushuaia', b'America/Argentina/Ushuaia'), (b'America/Aruba', b'America/Aruba'), (b'America/Asuncion', b'America/Asuncion'), (b'America/Atikokan', b'America/Atikokan'), (b'America/Atka', b'America/Atka'), (b'America/Bahia', b'America/Bahia'), (b'America/Bahia_Banderas', b'America/Bahia_Banderas'), (b'America/Barbados', b'America/Barbados'), (b'America/Belem', b'America/Belem'), (b'America/Belize', b'America/Belize'), (b'America/Blanc-Sablon', b'America/Blanc-Sablon'), (b'America/Boa_Vista', b'America/Boa_Vista'), (b'America/Bogota', b'America/Bogota'), (b'America/Boise', b'America/Boise'), (b'America/Buenos_Aires', b'America/Buenos_Aires'), (b'America/Cambridge_Bay', b'America/Cambridge_Bay'), (b'America/Campo_Grande', b'America/Campo_Grande'), (b'America/Cancun', b'America/Cancun'), (b'America/Caracas', b'America/Caracas'), (b'America/Catamarca', b'America/Catamarca'), (b'America/Cayenne', b'America/Cayenne'), (b'America/Cayman', b'America/Cayman'), (b'America/Chicago', b'America/Chicago'), (b'America/Chihuahua', b'America/Chihuahua'), (b'America/Coral_Harbour', b'America/Coral_Harbour'), (b'America/Cordoba', b'America/Cordoba'), (b'America/Costa_Rica', b'America/Costa_Rica'), (b'America/Creston', b'America/Creston'), (b'America/Cuiaba', b'America/Cuiaba'), (b'America/Curacao', b'America/Curacao'), (b'America/Danmarkshavn', b'America/Danmarkshavn'), (b'America/Dawson', b'America/Dawson'), (b'America/Dawson_Creek', b'America/Dawson_Creek'), (b'America/Denver', b'America/Denver'), (b'America/Detroit', b'America/Detroit'), (b'America/Dominica', b'America/Dominica'), (b'America/Edmonton', b'America/Edmonton'), (b'America/Eirunepe', b'America/Eirunepe'), (b'America/El_Salvador', b'America/El_Salvador'), (b'America/Ensenada', b'America/Ensenada'), (b'America/Fort_Nelson', b'America/Fort_Nelson'), (b'America/Fort_Wayne', b'America/Fort_Wayne'), (b'America/Fortaleza', b'America/Fortaleza'), (b'America/Glace_Bay', b'America/Glace_Bay'), (b'America/Godthab', b'America/Godthab'), (b'America/Goose_Bay', b'America/Goose_Bay'), (b'America/Grand_Turk', b'America/Grand_Turk'), (b'America/Grenada', b'America/Grenada'), (b'America/Guadeloupe', b'America/Guadeloupe'), (b'America/Guatemala', b'America/Guatemala'), (b'America/Guayaquil', b'America/Guayaquil'), (b'America/Guyana', b'America/Guyana'), (b'America/Halifax', b'America/Halifax'), (b'America/Havana', b'America/Havana'), (b'America/Hermosillo', b'America/Hermosillo'), (b'America/Indiana/Indianapolis', b'America/Indiana/Indianapolis'), (b'America/Indiana/Knox', b'America/Indiana/Knox'), (b'America/Indiana/Marengo', b'America/Indiana/Marengo'), (b'America/Indiana/Petersburg', b'America/Indiana/Petersburg'), (b'America/Indiana/Tell_City', b'America/Indiana/Tell_City'), (b'America/Indiana/Vevay', b'America/Indiana/Vevay'), (b'America/Indiana/Vincennes', b'America/Indiana/Vincennes'), (b'America/Indiana/Winamac', b'America/Indiana/Winamac'), (b'America/Indianapolis', b'America/Indianapolis'), (b'America/Inuvik', b'America/Inuvik'), (b'America/Iqaluit', b'America/Iqaluit'), (b'America/Jamaica', b'America/Jamaica'), (b'America/Jujuy', b'America/Jujuy'), (b'America/Juneau', b'America/Juneau'), (b'America/Kentucky/Louisville', b'America/Kentucky/Louisville'), (b'America/Kentucky/Monticello', b'America/Kentucky/Monticello'), (b'America/Knox_IN', b'America/Knox_IN'), (b'America/Kralendijk', b'America/Kralendijk'), (b'America/La_Paz', b'America/La_Paz'), (b'America/Lima', b'America/Lima'), (b'America/Los_Angeles', b'America/Los_Angeles'), (b'America/Louisville', b'America/Louisville'), (b'America/Lower_Princes', b'America/Lower_Princes'), (b'America/Maceio', b'America/Maceio'), (b'America/Managua', b'America/Managua'), (b'America/Manaus', b'America/Manaus'), (b'America/Marigot', b'America/Marigot'), (b'America/Martinique', b'America/Martinique'), (b'America/Matamoros', b'America/Matamoros'), (b'America/Mazatlan', b'America/Mazatlan'), (b'America/Mendoza', b'America/Mendoza'), (b'America/Menominee', b'America/Menominee'), (b'America/Merida', b'America/Merida'), (b'America/Metlakatla', b'America/Metlakatla'), (b'America/Mexico_City', b'America/Mexico_City'), (b'America/Miquelon', b'America/Miquelon'), (b'America/Moncton', b'America/Moncton'), (b'America/Monterrey', b'America/Monterrey'), (b'America/Montevideo', b'America/Montevideo'), (b'America/Montreal', b'America/Montreal'), (b'America/Montserrat', b'America/Montserrat'), (b'America/Nassau', b'America/Nassau'), (b'America/New_York', b'America/New_York'), (b'America/Nipigon', b'America/Nipigon'), (b'America/Nome', b'America/Nome'), (b'America/Noronha', b'America/Noronha'), (b'America/North_Dakota/Beulah', b'America/North_Dakota/Beulah'), (b'America/North_Dakota/Center', b'America/North_Dakota/Center'), (b'America/North_Dakota/New_Salem', b'America/North_Dakota/New_Salem'), (b'America/Ojinaga', b'America/Ojinaga'), (b'America/Panama', b'America/Panama'), (b'America/Pangnirtung', b'America/Pangnirtung'), (b'America/Paramaribo', b'America/Paramaribo'), (b'America/Phoenix', b'America/Phoenix'), (b'America/Port-au-Prince', b'America/Port-au-Prince'), (b'America/Port_of_Spain', b'America/Port_of_Spain'), (b'America/Porto_Acre', b'America/Porto_Acre'), (b'America/Porto_Velho', b'America/Porto_Velho'), (b'America/Puerto_Rico', b'America/Puerto_Rico'), (b'America/Rainy_River', b'America/Rainy_River'), (b'America/Rankin_Inlet', b'America/Rankin_Inlet'), (b'America/Recife', b'America/Recife'), (b'America/Regina', b'America/Regina'), (b'America/Resolute', b'America/Resolute'), (b'America/Rio_Branco', b'America/Rio_Branco'), (b'America/Rosario', b'America/Rosario'), (b'America/Santa_Isabel', b'America/Santa_Isabel'), (b'America/Santarem', b'America/Santarem'), (b'America/Santiago', b'America/Santiago'), (b'America/Santo_Domingo', b'America/Santo_Domingo'), (b'America/Sao_Paulo', b'America/Sao_Paulo'), (b'America/Scoresbysund', b'America/Scoresbysund'), (b'America/Shiprock', b'America/Shiprock'), (b'America/Sitka', b'America/Sitka'), (b'America/St_Barthelemy', b'America/St_Barthelemy'), (b'America/St_Johns', b'America/St_Johns'), (b'America/St_Kitts', b'America/St_Kitts'), (b'America/St_Lucia', b'America/St_Lucia'), (b'America/St_Thomas', b'America/St_Thomas'), (b'America/St_Vincent', b'America/St_Vincent'), (b'America/Swift_Current', b'America/Swift_Current'), (b'America/Tegucigalpa', b'America/Tegucigalpa'), (b'America/Thule', b'America/Thule'), (b'America/Thunder_Bay', b'America/Thunder_Bay'), (b'America/Tijuana', b'America/Tijuana'), (b'America/Toronto', b'America/Toronto'), (b'America/Tortola', b'America/Tortola'), (b'America/Vancouver', b'America/Vancouver'), (b'America/Virgin', b'America/Virgin'), (b'America/Whitehorse', b'America/Whitehorse'), (b'America/Winnipeg', b'America/Winnipeg'), (b'America/Yakutat', b'America/Yakutat'), (b'America/Yellowknife', b'America/Yellowknife'), (b'Antarctica/Casey', b'Antarctica/Casey'), (b'Antarctica/Davis', b'Antarctica/Davis'), (b'Antarctica/DumontDUrville', b'Antarctica/DumontDUrville'), (b'Antarctica/Macquarie', b'Antarctica/Macquarie'), (b'Antarctica/Mawson', b'Antarctica/Mawson'), (b'Antarctica/McMurdo', b'Antarctica/McMurdo'), (b'Antarctica/Palmer', b'Antarctica/Palmer'), (b'Antarctica/Rothera', b'Antarctica/Rothera'), (b'Antarctica/South_Pole', b'Antarctica/South_Pole'), (b'Antarctica/Syowa', b'Antarctica/Syowa'), (b'Antarctica/Troll', b'Antarctica/Troll'), (b'Antarctica/Vostok', b'Antarctica/Vostok'), (b'Arctic/Longyearbyen', b'Arctic/Longyearbyen'), (b'Asia/Aden', b'Asia/Aden'), (b'Asia/Almaty', b'Asia/Almaty'), (b'Asia/Amman', b'Asia/Amman'), (b'Asia/Anadyr', b'Asia/Anadyr'), (b'Asia/Aqtau', b'Asia/Aqtau'), (b'Asia/Aqtobe', b'Asia/Aqtobe'), (b'Asia/Ashgabat', b'Asia/Ashgabat'), (b'Asia/Ashkhabad', b'Asia/Ashkhabad'), (b'Asia/Baghdad', b'Asia/Baghdad'), (b'Asia/Bahrain', b'Asia/Bahrain'), (b'Asia/Baku', b'Asia/Baku'), (b'Asia/Bangkok', b'Asia/Bangkok'), (b'Asia/Barnaul', b'Asia/Barnaul'), (b'Asia/Beirut', b'Asia/Beirut'), (b'Asia/Bishkek', b'Asia/Bishkek'), (b'Asia/Brunei', b'Asia/Brunei'), (b'Asia/Calcutta', b'Asia/Calcutta'), (b'Asia/Chita', b'Asia/Chita'), (b'Asia/Choibalsan', b'Asia/Choibalsan'), (b'Asia/Chongqing', b'Asia/Chongqing'), (b'Asia/Chungking', b'Asia/Chungking'), (b'Asia/Colombo', b'Asia/Colombo'), (b'Asia/Dacca', b'Asia/Dacca'), (b'Asia/Damascus', b'Asia/Damascus'), (b'Asia/Dhaka', b'Asia/Dhaka'), (b'Asia/Dili', b'Asia/Dili'), (b'Asia/Dubai', b'Asia/Dubai'), (b'Asia/Dushanbe', b'Asia/Dushanbe'), (b'Asia/Gaza', b'Asia/Gaza'), (b'Asia/Harbin', b'Asia/Harbin'), (b'Asia/Hebron', b'Asia/Hebron'), (b'Asia/Ho_Chi_Minh', b'Asia/Ho_Chi_Minh'), (b'Asia/Hong_Kong', b'Asia/Hong_Kong'), (b'Asia/Hovd', b'Asia/Hovd'), (b'Asia/Irkutsk', b'Asia/Irkutsk'), (b'Asia/Istanbul', b'Asia/Istanbul'), (b'Asia/Jakarta', b'Asia/Jakarta'), (b'Asia/Jayapura', b'Asia/Jayapura'), (b'Asia/Jerusalem', b'Asia/Jerusalem'), (b'Asia/Kabul', b'Asia/Kabul'), (b'Asia/Kamchatka', b'Asia/Kamchatka'), (b'Asia/Karachi', b'Asia/Karachi'), (b'Asia/Kashgar', b'Asia/Kashgar'), (b'Asia/Kathmandu', b'Asia/Kathmandu'), (b'Asia/Katmandu', b'Asia/Katmandu'), (b'Asia/Khandyga', b'Asia/Khandyga'), (b'Asia/Kolkata', b'Asia/Kolkata'), (b'Asia/Krasnoyarsk', b'Asia/Krasnoyarsk'), (b'Asia/Kuala_Lumpur', b'Asia/Kuala_Lumpur'), (b'Asia/Kuching', b'Asia/Kuching'), (b'Asia/Kuwait', b'Asia/Kuwait'), (b'Asia/Macao', b'Asia/Macao'), (b'Asia/Macau', b'Asia/Macau'), (b'Asia/Magadan', b'Asia/Magadan'), (b'Asia/Makassar', b'Asia/Makassar'), (b'Asia/Manila', b'Asia/Manila'), (b'Asia/Muscat', b'Asia/Muscat'), (b'Asia/Nicosia', b'Asia/Nicosia'), (b'Asia/Novokuznetsk', b'Asia/Novokuznetsk'), (b'Asia/Novosibirsk', b'Asia/Novosibirsk'), (b'Asia/Omsk', b'Asia/Omsk'), (b'Asia/Oral', b'Asia/Oral'), (b'Asia/Phnom_Penh', b'Asia/Phnom_Penh'), (b'Asia/Pontianak', b'Asia/Pontianak'), (b'Asia/Pyongyang', b'Asia/Pyongyang'), (b'Asia/Qatar', b'Asia/Qatar'), (b'Asia/Qyzylorda', b'Asia/Qyzylorda'), (b'Asia/Rangoon', b'Asia/Rangoon'), (b'Asia/Riyadh', b'Asia/Riyadh'), (b'Asia/Saigon', b'Asia/Saigon'), (b'Asia/Sakhalin', b'Asia/Sakhalin'), (b'Asia/Samarkand', b'Asia/Samarkand'), (b'Asia/Seoul', b'Asia/Seoul'), (b'Asia/Shanghai', b'Asia/Shanghai'), (b'Asia/Singapore', b'Asia/Singapore'), (b'Asia/Srednekolymsk', b'Asia/Srednekolymsk'), (b'Asia/Taipei', b'Asia/Taipei'), (b'Asia/Tashkent', b'Asia/Tashkent'), (b'Asia/Tbilisi', b'Asia/Tbilisi'), (b'Asia/Tehran', b'Asia/Tehran'), (b'Asia/Tel_Aviv', b'Asia/Tel_Aviv'), (b'Asia/Thimbu', b'Asia/Thimbu'), (b'Asia/Thimphu', b'Asia/Thimphu'), (b'Asia/Tokyo', b'Asia/Tokyo'), (b'Asia/Tomsk', b'Asia/Tomsk'), (b'Asia/Ujung_Pandang', b'Asia/Ujung_Pandang'), (b'Asia/Ulaanbaatar', b'Asia/Ulaanbaatar'), (b'Asia/Ulan_Bator', b'Asia/Ulan_Bator'), (b'Asia/Urumqi', b'Asia/Urumqi'), (b'Asia/Ust-Nera', b'Asia/Ust-Nera'), (b'Asia/Vientiane', b'Asia/Vientiane'), (b'Asia/Vladivostok', b'Asia/Vladivostok'), (b'Asia/Yakutsk', b'Asia/Yakutsk'), (b'Asia/Yekaterinburg', b'Asia/Yekaterinburg'), (b'Asia/Yerevan', b'Asia/Yerevan'), (b'Atlantic/Azores', b'Atlantic/Azores'), (b'Atlantic/Bermuda', b'Atlantic/Bermuda'), (b'Atlantic/Canary', b'Atlantic/Canary'), (b'Atlantic/Cape_Verde', b'Atlantic/Cape_Verde'), (b'Atlantic/Faeroe', b'Atlantic/Faeroe'), (b'Atlantic/Faroe', b'Atlantic/Faroe'), (b'Atlantic/Jan_Mayen', b'Atlantic/Jan_Mayen'), (b'Atlantic/Madeira', b'Atlantic/Madeira'), (b'Atlantic/Reykjavik', b'Atlantic/Reykjavik'), (b'Atlantic/South_Georgia', b'Atlantic/South_Georgia'), (b'Atlantic/St_Helena', b'Atlantic/St_Helena'), (b'Atlantic/Stanley', b'Atlantic/Stanley'), (b'Australia/ACT', b'Australia/ACT'), (b'Australia/Adelaide', b'Australia/Adelaide'), (b'Australia/Brisbane', b'Australia/Brisbane'), (b'Australia/Broken_Hill', b'Australia/Broken_Hill'), (b'Australia/Canberra', b'Australia/Canberra'), (b'Australia/Currie', b'Australia/Currie'), (b'Australia/Darwin', b'Australia/Darwin'), (b'Australia/Eucla', b'Australia/Eucla'), (b'Australia/Hobart', b'Australia/Hobart'), (b'Australia/LHI', b'Australia/LHI'), (b'Australia/Lindeman', b'Australia/Lindeman'), (b'Australia/Lord_Howe', b'Australia/Lord_Howe'), (b'Australia/Melbourne', b'Australia/Melbourne'), (b'Australia/NSW', b'Australia/NSW'), (b'Australia/North', b'Australia/North'), (b'Australia/Perth', b'Australia/Perth'), (b'Australia/Queensland', b'Australia/Queensland'), (b'Australia/South', b'Australia/South'), (b'Australia/Sydney', b'Australia/Sydney'), (b'Australia/Tasmania', b'Australia/Tasmania'), (b'Australia/Victoria', b'Australia/Victoria'), (b'Australia/West', b'Australia/West'), (b'Australia/Yancowinna', b'Australia/Yancowinna'), (b'Brazil/Acre', b'Brazil/Acre'), (b'Brazil/DeNoronha', b'Brazil/DeNoronha'), (b'Brazil/East', b'Brazil/East'), (b'Brazil/West', b'Brazil/West'), (b'CET', b'CET'), (b'CST6CDT', b'CST6CDT'), (b'Canada/Atlantic', b'Canada/Atlantic'), (b'Canada/Central', b'Canada/Central'), (b'Canada/East-Saskatchewan', b'Canada/East-Saskatchewan'), (b'Canada/Eastern', b'Canada/Eastern'), (b'Canada/Mountain', b'Canada/Mountain'), (b'Canada/Newfoundland', b'Canada/Newfoundland'), (b'Canada/Pacific', b'Canada/Pacific'), (b'Canada/Saskatchewan', b'Canada/Saskatchewan'), (b'Canada/Yukon', b'Canada/Yukon'), (b'Chile/Continental', b'Chile/Continental'), (b'Chile/EasterIsland', b'Chile/EasterIsland'), (b'Cuba', b'Cuba'), (b'EET', b'EET'), (b'EST', b'EST'), (b'EST5EDT', b'EST5EDT'), (b'Egypt', b'Egypt'), (b'Eire', b'Eire'), (b'Etc/GMT', b'Etc/GMT'), (b'Etc/GMT+0', b'Etc/GMT+0'), (b'Etc/GMT+1', b'Etc/GMT+1'), (b'Etc/GMT+10', b'Etc/GMT+10'), (b'Etc/GMT+11', b'Etc/GMT+11'), (b'Etc/GMT+12', b'Etc/GMT+12'), (b'Etc/GMT+2', b'Etc/GMT+2'), (b'Etc/GMT+3', b'Etc/GMT+3'), (b'Etc/GMT+4', b'Etc/GMT+4'), (b'Etc/GMT+5', b'Etc/GMT+5'), (b'Etc/GMT+6', b'Etc/GMT+6'), (b'Etc/GMT+7', b'Etc/GMT+7'), (b'Etc/GMT+8', b'Etc/GMT+8'), (b'Etc/GMT+9', b'Etc/GMT+9'), (b'Etc/GMT-0', b'Etc/GMT-0'), (b'Etc/GMT-1', b'Etc/GMT-1'), (b'Etc/GMT-10', b'Etc/GMT-10'), (b'Etc/GMT-11', b'Etc/GMT-11'), (b'Etc/GMT-12', b'Etc/GMT-12'), (b'Etc/GMT-13', b'Etc/GMT-13'), (b'Etc/GMT-14', b'Etc/GMT-14'), (b'Etc/GMT-2', b'Etc/GMT-2'), (b'Etc/GMT-3', b'Etc/GMT-3'), (b'Etc/GMT-4', b'Etc/GMT-4'), (b'Etc/GMT-5', b'Etc/GMT-5'), (b'Etc/GMT-6', b'Etc/GMT-6'), (b'Etc/GMT-7', b'Etc/GMT-7'), (b'Etc/GMT-8', b'Etc/GMT-8'), (b'Etc/GMT-9', b'Etc/GMT-9'), (b'Etc/GMT0', b'Etc/GMT0'), (b'Etc/Greenwich', b'Etc/Greenwich'), (b'Etc/UCT', b'Etc/UCT'), (b'Etc/UTC', b'Etc/UTC'), (b'Etc/Universal', b'Etc/Universal'), (b'Etc/Zulu', b'Etc/Zulu'), (b'Europe/Amsterdam', b'Europe/Amsterdam'), (b'Europe/Andorra', b'Europe/Andorra'), (b'Europe/Astrakhan', b'Europe/Astrakhan'), (b'Europe/Athens', b'Europe/Athens'), (b'Europe/Belfast', b'Europe/Belfast'), (b'Europe/Belgrade', b'Europe/Belgrade'), (b'Europe/Berlin', b'Europe/Berlin'), (b'Europe/Bratislava', b'Europe/Bratislava'), (b'Europe/Brussels', b'Europe/Brussels'), (b'Europe/Bucharest', b'Europe/Bucharest'), (b'Europe/Budapest', b'Europe/Budapest'), (b'Europe/Busingen', b'Europe/Busingen'), (b'Europe/Chisinau', b'Europe/Chisinau'), (b'Europe/Copenhagen', b'Europe/Copenhagen'), (b'Europe/Dublin', b'Europe/Dublin'), (b'Europe/Gibraltar', b'Europe/Gibraltar'), (b'Europe/Guernsey', b'Europe/Guernsey'), (b'Europe/Helsinki', b'Europe/Helsinki'), (b'Europe/Isle_of_Man', b'Europe/Isle_of_Man'), (b'Europe/Istanbul', b'Europe/Istanbul'), (b'Europe/Jersey', b'Europe/Jersey'), (b'Europe/Kaliningrad', b'Europe/Kaliningrad'), (b'Europe/Kiev', b'Europe/Kiev'), (b'Europe/Kirov', b'Europe/Kirov'), (b'Europe/Lisbon', b'Europe/Lisbon'), (b'Europe/Ljubljana', b'Europe/Ljubljana'), (b'Europe/London', b'Europe/London'), (b'Europe/Luxembourg', b'Europe/Luxembourg'), (b'Europe/Madrid', b'Europe/Madrid'), (b'Europe/Malta', b'Europe/Malta'), (b'Europe/Mariehamn', b'Europe/Mariehamn'), (b'Europe/Minsk', b'Europe/Minsk'), (b'Europe/Monaco', b'Europe/Monaco'), (b'Europe/Moscow', b'Europe/Moscow'), (b'Europe/Nicosia', b'Europe/Nicosia'), (b'Europe/Oslo', b'Europe/Oslo'), (b'Europe/Paris', b'Europe/Paris'), (b'Europe/Podgorica', b'Europe/Podgorica'), (b'Europe/Prague', b'Europe/Prague'), (b'Europe/Riga', b'Europe/Riga'), (b'Europe/Rome', b'Europe/Rome'), (b'Europe/Samara', b'Europe/Samara'), (b'Europe/San_Marino', b'Europe/San_Marino'), (b'Europe/Sarajevo', b'Europe/Sarajevo'), (b'Europe/Simferopol', b'Europe/Simferopol'), (b'Europe/Skopje', b'Europe/Skopje'), (b'Europe/Sofia', b'Europe/Sofia'), (b'Europe/Stockholm', b'Europe/Stockholm'), (b'Europe/Tallinn', b'Europe/Tallinn'), (b'Europe/Tirane', b'Europe/Tirane'), (b'Europe/Tiraspol', b'Europe/Tiraspol'), (b'Europe/Ulyanovsk', b'Europe/Ulyanovsk'), (b'Europe/Uzhgorod', b'Europe/Uzhgorod'), (b'Europe/Vaduz', b'Europe/Vaduz'), (b'Europe/Vatican', b'Europe/Vatican'), (b'Europe/Vienna', b'Europe/Vienna'), (b'Europe/Vilnius', b'Europe/Vilnius'), (b'Europe/Volgograd', b'Europe/Volgograd'), (b'Europe/Warsaw', b'Europe/Warsaw'), (b'Europe/Zagreb', b'Europe/Zagreb'), (b'Europe/Zaporozhye', b'Europe/Zaporozhye'), (b'Europe/Zurich', b'Europe/Zurich'), (b'GB', b'GB'), (b'GB-Eire', b'GB-Eire'), (b'GMT', b'GMT'), (b'GMT+0', b'GMT+0'), (b'GMT-0', b'GMT-0'), (b'GMT0', b'GMT0'), (b'Greenwich', b'Greenwich'), (b'HST', b'HST'), (b'Hongkong', b'Hongkong'), (b'Iceland', b'Iceland'), (b'Indian/Antananarivo', b'Indian/Antananarivo'), (b'Indian/Chagos', b'Indian/Chagos'), (b'Indian/Christmas', b'Indian/Christmas'), (b'Indian/Cocos', b'Indian/Cocos'), (b'Indian/Comoro', b'Indian/Comoro'), (b'Indian/Kerguelen', b'Indian/Kerguelen'), (b'Indian/Mahe', b'Indian/Mahe'), (b'Indian/Maldives', b'Indian/Maldives'), (b'Indian/Mauritius', b'Indian/Mauritius'), (b'Indian/Mayotte', b'Indian/Mayotte'), (b'Indian/Reunion', b'Indian/Reunion'), (b'Iran', b'Iran'), (b'Israel', b'Israel'), (b'Jamaica', b'Jamaica'), (b'Japan', b'Japan'), (b'Kwajalein', b'Kwajalein'), (b'Libya', b'Libya'), (b'MET', b'MET'), (b'MST', b'MST'), (b'MST7MDT', b'MST7MDT'), (b'Mexico/BajaNorte', b'Mexico/BajaNorte'), (b'Mexico/BajaSur', b'Mexico/BajaSur'), (b'Mexico/General', b'Mexico/General'), (b'NZ', b'NZ'), (b'NZ-CHAT', b'NZ-CHAT'), (b'Navajo', b'Navajo'), (b'PRC', b'PRC'), (b'PST8PDT', b'PST8PDT'), (b'Pacific/Apia', b'Pacific/Apia'), (b'Pacific/Auckland', b'Pacific/Auckland'), (b'Pacific/Bougainville', b'Pacific/Bougainville'), (b'Pacific/Chatham', b'Pacific/Chatham'), (b'Pacific/Chuuk', b'Pacific/Chuuk'), (b'Pacific/Easter', b'Pacific/Easter'), (b'Pacific/Efate', b'Pacific/Efate'), (b'Pacific/Enderbury', b'Pacific/Enderbury'), (b'Pacific/Fakaofo', b'Pacific/Fakaofo'), (b'Pacific/Fiji', b'Pacific/Fiji'), (b'Pacific/Funafuti', b'Pacific/Funafuti'), (b'Pacific/Galapagos', b'Pacific/Galapagos'), (b'Pacific/Gambier', b'Pacific/Gambier'), (b'Pacific/Guadalcanal', b'Pacific/Guadalcanal'), (b'Pacific/Guam', b'Pacific/Guam'), (b'Pacific/Honolulu', b'Pacific/Honolulu'), (b'Pacific/Johnston', b'Pacific/Johnston'), (b'Pacific/Kiritimati', b'Pacific/Kiritimati'), (b'Pacific/Kosrae', b'Pacific/Kosrae'), (b'Pacific/Kwajalein', b'Pacific/Kwajalein'), (b'Pacific/Majuro', b'Pacific/Majuro'), (b'Pacific/Marquesas', b'Pacific/Marquesas'), (b'Pacific/Midway', b'Pacific/Midway'), (b'Pacific/Nauru', b'Pacific/Nauru'), (b'Pacific/Niue', b'Pacific/Niue'), (b'Pacific/Norfolk', b'Pacific/Norfolk'), (b'Pacific/Noumea', b'Pacific/Noumea'), (b'Pacific/Pago_Pago', b'Pacific/Pago_Pago'), (b'Pacific/Palau', b'Pacific/Palau'), (b'Pacific/Pitcairn', b'Pacific/Pitcairn'), (b'Pacific/Pohnpei', b'Pacific/Pohnpei'), (b'Pacific/Ponape', b'Pacific/Ponape'), (b'Pacific/Port_Moresby', b'Pacific/Port_Moresby'), (b'Pacific/Rarotonga', b'Pacific/Rarotonga'), (b'Pacific/Saipan', b'Pacific/Saipan'), (b'Pacific/Samoa', b'Pacific/Samoa'), (b'Pacific/Tahiti', b'Pacific/Tahiti'), (b'Pacific/Tarawa', b'Pacific/Tarawa'), (b'Pacific/Tongatapu', b'Pacific/Tongatapu'), (b'Pacific/Truk', b'Pacific/Truk'), (b'Pacific/Wake', b'Pacific/Wake'), (b'Pacific/Wallis', b'Pacific/Wallis'), (b'Pacific/Yap', b'Pacific/Yap'), (b'Poland', b'Poland'), (b'Portugal', b'Portugal'), (b'ROC', b'ROC'), (b'ROK', b'ROK'), (b'Singapore', b'Singapore'), (b'Turkey', b'Turkey'), (b'UCT', b'UCT'), (b'US/Alaska', b'US/Alaska'), (b'US/Aleutian', b'US/Aleutian'), (b'US/Arizona', b'US/Arizona'), (b'US/Central', b'US/Central'), (b'US/East-Indiana', b'US/East-Indiana'), (b'US/Eastern', b'US/Eastern'), (b'US/Hawaii', b'US/Hawaii'), (b'US/Indiana-Starke', b'US/Indiana-Starke'), (b'US/Michigan', b'US/Michigan'), (b'US/Mountain', b'US/Mountain'), (b'US/Pacific', b'US/Pacific'), (b'US/Pacific-New', b'US/Pacific-New'), (b'US/Samoa', b'US/Samoa'), (b'UTC', b'UTC'), (b'Universal', b'Universal'), (b'W-SU', b'W-SU'), (b'WET', b'WET'), (b'Zulu', b'Zulu')]), | ||
4704 | 18 | preserve_default=True, | ||
4705 | 19 | ), | ||
4706 | 20 | ] | ||
4707 | 0 | 21 | ||
4708 | === added file 'loco_directory/meetings/migrations/0007_auto_20160815_2359.py' | |||
4709 | --- loco_directory/meetings/migrations/0007_auto_20160815_2359.py 1970-01-01 00:00:00 +0000 | |||
4710 | +++ loco_directory/meetings/migrations/0007_auto_20160815_2359.py 2016-08-16 07:31:30 +0000 | |||
4711 | @@ -0,0 +1,69 @@ | |||
4712 | 1 | # -*- coding: utf-8 -*- | ||
4713 | 2 | from __future__ import unicode_literals | ||
4714 | 3 | |||
4715 | 4 | from django.db import models, migrations | ||
4716 | 5 | |||
4717 | 6 | |||
4718 | 7 | class Migration(migrations.Migration): | ||
4719 | 8 | |||
4720 | 9 | dependencies = [ | ||
4721 | 10 | ('meetings', '0006_teammeeting_meeting_tz'), | ||
4722 | 11 | ] | ||
4723 | 12 | |||
4724 | 13 | operations = [ | ||
4725 | 14 | migrations.AlterField( | ||
4726 | 15 | model_name='agendaitem', | ||
4727 | 16 | name='created_date', | ||
4728 | 17 | field=models.DateTimeField(help_text='timestamp of when this agenda item was created', verbose_name='Created Date', auto_now_add=True), | ||
4729 | 18 | ), | ||
4730 | 19 | migrations.AlterField( | ||
4731 | 20 | model_name='agendaitem', | ||
4732 | 21 | name='description', | ||
4733 | 22 | field=models.TextField(help_text='detailed description of this agenda item', null=True, verbose_name='Description', blank=True), | ||
4734 | 23 | ), | ||
4735 | 24 | migrations.AlterField( | ||
4736 | 25 | model_name='agendaitem', | ||
4737 | 26 | name='log', | ||
4738 | 27 | field=models.URLField(help_text="URL to this agenda item's discussion", null=True, verbose_name='Log URL', blank=True), | ||
4739 | 28 | ), | ||
4740 | 29 | migrations.AlterField( | ||
4741 | 30 | model_name='agendaitem', | ||
4742 | 31 | name='order', | ||
4743 | 32 | field=models.PositiveIntegerField(default=1, help_text='index number of where this agenda item falls in the agenda', verbose_name='Order'), | ||
4744 | 33 | ), | ||
4745 | 34 | migrations.AlterField( | ||
4746 | 35 | model_name='agendaitem', | ||
4747 | 36 | name='owner', | ||
4748 | 37 | field=models.ForeignKey(verbose_name='Owner', to='userprofiles.UserProfile', help_text='person proposing or responsible for this agenda item'), | ||
4749 | 38 | ), | ||
4750 | 39 | migrations.AlterField( | ||
4751 | 40 | model_name='agendaitem', | ||
4752 | 41 | name='parent', | ||
4753 | 42 | field=models.ForeignKey(related_name=b'children', blank=True, to='meetings.AgendaItem', help_text='agenda item that contains this agenda item', null=True, verbose_name='Parent Agenda Item'), | ||
4754 | 43 | ), | ||
4755 | 44 | migrations.AlterField( | ||
4756 | 45 | model_name='agendaitem', | ||
4757 | 46 | name='title', | ||
4758 | 47 | field=models.CharField(help_text='descriptive name for this agenda item', max_length=150, verbose_name='Title'), | ||
4759 | 48 | ), | ||
4760 | 49 | migrations.AlterField( | ||
4761 | 50 | model_name='basemeeting', | ||
4762 | 51 | name='channel', | ||
4763 | 52 | field=models.CharField(help_text='Channel that the meeting will be held in. Ex. #ubuntu-us-fl', max_length=150, null=True, verbose_name='Meeting Channel'), | ||
4764 | 53 | ), | ||
4765 | 54 | migrations.AlterField( | ||
4766 | 55 | model_name='basemeeting', | ||
4767 | 56 | name='date_begin', | ||
4768 | 57 | field=models.DateTimeField(help_text='Local date and time that the meeting starts', verbose_name='Begins', db_index=True), | ||
4769 | 58 | ), | ||
4770 | 59 | migrations.AlterField( | ||
4771 | 60 | model_name='basemeeting', | ||
4772 | 61 | name='date_end', | ||
4773 | 62 | field=models.DateTimeField(help_text='Local date and time that the meeting ends', verbose_name='Ends', db_index=True), | ||
4774 | 63 | ), | ||
4775 | 64 | migrations.AlterField( | ||
4776 | 65 | model_name='teammeeting', | ||
4777 | 66 | name='teams', | ||
4778 | 67 | field=models.ManyToManyField(help_text='team planning this meeting.', to=b'teams.Team', verbose_name='Teams Participating', db_index=True), | ||
4779 | 68 | ), | ||
4780 | 69 | ] | ||
4781 | 0 | 70 | ||
4782 | === modified file 'loco_directory/meetings/models.py' | |||
4783 | --- loco_directory/meetings/models.py 2013-10-25 23:03:37 +0000 | |||
4784 | +++ loco_directory/meetings/models.py 2016-08-16 07:31:30 +0000 | |||
4785 | @@ -17,8 +17,8 @@ | |||
4786 | 17 | date_begin = models.DateTimeField(help_text=_('Local date and time that the meeting starts'), verbose_name=_('Begins'), db_index=True) | 17 | date_begin = models.DateTimeField(help_text=_('Local date and time that the meeting starts'), verbose_name=_('Begins'), db_index=True) |
4787 | 18 | date_end = models.DateTimeField(help_text=_('Local date and time that the meeting ends'), verbose_name=_('Ends'), db_index=True) | 18 | date_end = models.DateTimeField(help_text=_('Local date and time that the meeting ends'), verbose_name=_('Ends'), db_index=True) |
4788 | 19 | channel = models.CharField(max_length=150, verbose_name=_('Meeting Channel'), help_text=_('Channel that the meeting will be held in. Ex. #ubuntu-us-fl'), null=True) | 19 | channel = models.CharField(max_length=150, verbose_name=_('Meeting Channel'), help_text=_('Channel that the meeting will be held in. Ex. #ubuntu-us-fl'), null=True) |
4791 | 20 | logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log (leave blank to use the built-in irclog.ubuntu.com'), max_length=200, verify_exists=False, blank=True, null=True) | 20 | logs = models.URLField(verbose_name=_('Meeting Log'), help_text=_('After the meeting, add a link to the meeting log (leave blank to use the built-in irclog.ubuntu.com'), max_length=200, blank=True, null=True) |
4792 | 21 | minutes = models.URLField(verbose_name=_('Meeting Minutes'), help_text=_('After the meeting, add a link to the meeting minutes'), max_length=200, verify_exists=False, blank=True, null=True) | 21 | minutes = models.URLField(verbose_name=_('Meeting Minutes'), help_text=_('After the meeting, add a link to the meeting minutes'), max_length=200, blank=True, null=True) |
4793 | 22 | date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now, db_index=True) | 22 | date_created = models.DateTimeField(help_text=_('the date and time when the event was created'), default=datetime.datetime.now, db_index=True) |
4794 | 23 | chair = models.ForeignKey(UserProfile, verbose_name=_('Meeting Chair'), blank=True, null=True) | 23 | chair = models.ForeignKey(UserProfile, verbose_name=_('Meeting Chair'), blank=True, null=True) |
4795 | 24 | 24 | ||
4796 | @@ -47,13 +47,21 @@ | |||
4797 | 47 | """ | 47 | """ |
4798 | 48 | event = cal.add('vevent') | 48 | event = cal.add('vevent') |
4799 | 49 | event.add('uid').value = str(self.id) | 49 | event.add('uid').value = str(self.id) |
4800 | 50 | event.add('dtstart').value = pytz.utc.localize(self.date_begin) | ||
4801 | 51 | event.add('dtend').value = pytz.utc.localize(self.date_end) | ||
4802 | 52 | event.add('categories').value = ['Ubuntu Team Meeting'] | 50 | event.add('categories').value = ['Ubuntu Team Meeting'] |
4803 | 53 | event.add('summary').value = self.name or '' | 51 | event.add('summary').value = self.name or '' |
4804 | 54 | 52 | ||
4805 | 53 | if self.date_begin.tzinfo is None: | ||
4806 | 54 | event.add('dtstart').value = pytz.utc.localize(self.date_begin) | ||
4807 | 55 | else: | ||
4808 | 56 | event.add('dtstart').value = self.date_begin | ||
4809 | 57 | |||
4810 | 58 | if self.date_end.tzinfo is None: | ||
4811 | 59 | event.add('dtend').value = pytz.utc.localize(self.date_end) | ||
4812 | 60 | else: | ||
4813 | 61 | event.add('dtend').value = self.date_end | ||
4814 | 62 | |||
4815 | 55 | def is_past(self): | 63 | def is_past(self): |
4817 | 56 | return self.date_end < datetime.datetime.today() | 64 | return self.date_end < self.tolocaltime(datetime.datetime.today()) |
4818 | 57 | 65 | ||
4819 | 58 | 66 | ||
4820 | 59 | class TeamMeetingManager(models.Manager): | 67 | class TeamMeetingManager(models.Manager): |
4821 | @@ -167,7 +175,7 @@ | |||
4822 | 167 | description = models.TextField(verbose_name=_('Description'), help_text=_('detailed description of this agenda item'), blank=True, null=True) | 175 | description = models.TextField(verbose_name=_('Description'), help_text=_('detailed description of this agenda item'), blank=True, null=True) |
4823 | 168 | parent = models.ForeignKey('self', verbose_name=_('Parent Agenda Item'), related_name='children', help_text=_('agenda item that contains this agenda item'), blank=True, null=True) | 176 | parent = models.ForeignKey('self', verbose_name=_('Parent Agenda Item'), related_name='children', help_text=_('agenda item that contains this agenda item'), blank=True, null=True) |
4824 | 169 | order = models.PositiveIntegerField(verbose_name=_('Order'), help_text=_('index number of where this agenda item falls in the agenda'), default=1) | 177 | order = models.PositiveIntegerField(verbose_name=_('Order'), help_text=_('index number of where this agenda item falls in the agenda'), default=1) |
4826 | 170 | log = models.URLField(verbose_name=_('Log URL'), max_length=200, verify_exists=False, help_text=_('URL to this agenda item\'s discussion'), blank=True, null=True) | 178 | log = models.URLField(verbose_name=_('Log URL'), max_length=200, help_text=_('URL to this agenda item\'s discussion'), blank=True, null=True) |
4827 | 171 | 179 | ||
4828 | 172 | objects = AgendaItemManager() | 180 | objects = AgendaItemManager() |
4829 | 173 | 181 | ||
4830 | 174 | 182 | ||
4831 | === modified file 'loco_directory/meetings/urls.py' | |||
4832 | --- loco_directory/meetings/urls.py 2013-04-14 23:00:20 +0000 | |||
4833 | +++ loco_directory/meetings/urls.py 2016-08-16 07:31:30 +0000 | |||
4834 | @@ -1,4 +1,4 @@ | |||
4836 | 1 | from django.conf.urls.defaults import * | 1 | from django.conf.urls import * |
4837 | 2 | 2 | ||
4838 | 3 | urlpatterns = patterns('', | 3 | urlpatterns = patterns('', |
4839 | 4 | #all meetings | 4 | #all meetings |
4840 | 5 | 5 | ||
4841 | === modified file 'loco_directory/meetings/views.py' | |||
4842 | --- loco_directory/meetings/views.py 2013-11-24 13:57:29 +0000 | |||
4843 | +++ loco_directory/meetings/views.py 2016-08-16 07:31:30 +0000 | |||
4844 | @@ -2,6 +2,7 @@ | |||
4845 | 2 | from django.http import HttpResponse, HttpResponseRedirect | 2 | from django.http import HttpResponse, HttpResponseRedirect |
4846 | 3 | from django.shortcuts import render_to_response, redirect, get_object_or_404 | 3 | from django.shortcuts import render_to_response, redirect, get_object_or_404 |
4847 | 4 | from django.contrib.auth.decorators import login_required | 4 | from django.contrib.auth.decorators import login_required |
4848 | 5 | from django.contrib import messages | ||
4849 | 5 | from django.utils.translation import ugettext as _ | 6 | from django.utils.translation import ugettext as _ |
4850 | 6 | from django.core.urlresolvers import reverse | 7 | from django.core.urlresolvers import reverse |
4851 | 7 | 8 | ||
4852 | @@ -35,7 +36,7 @@ | |||
4853 | 35 | def meeting_list_ical(meetings, name): | 36 | def meeting_list_ical(meetings, name): |
4854 | 36 | """Return any list meetings as an ical""" | 37 | """Return any list meetings as an ical""" |
4855 | 37 | filename = "%s.ics" % name.replace(' ', '-').lower() | 38 | filename = "%s.ics" % name.replace(' ', '-').lower() |
4857 | 38 | response = HttpResponse(mimetype='text/calendar') | 39 | response = HttpResponse(content_type='text/calendar') |
4858 | 39 | response['Content-Disposition'] = 'attachment; filename=%s' % filename.encode('ascii', 'replace') | 40 | response['Content-Disposition'] = 'attachment; filename=%s' % filename.encode('ascii', 'replace') |
4859 | 40 | calendar = vobject.iCalendar() | 41 | calendar = vobject.iCalendar() |
4860 | 41 | calendar.add('prodid').value = '-//loco.ubuntu.com//EN' | 42 | calendar.add('prodid').value = '-//loco.ubuntu.com//EN' |
4861 | @@ -148,14 +149,14 @@ | |||
4862 | 148 | if is_on_lc or is_contact: | 149 | if is_on_lc or is_contact: |
4863 | 149 | if request.method == 'POST': | 150 | if request.method == 'POST': |
4864 | 150 | team_meeting_object.delete() | 151 | team_meeting_object.delete() |
4866 | 151 | request.user.message_set.create(message=_('Team Meeting removed.')) | 152 | messages.success(request,_('Team Meeting removed.')) |
4867 | 152 | return redirect('meeting-list') | 153 | return redirect('meeting-list') |
4868 | 153 | else: | 154 | else: |
4869 | 154 | context = {'team_meeting_object': team_meeting_object} | 155 | context = {'team_meeting_object': team_meeting_object} |
4870 | 155 | return render_to_response('meetings/team_meeting_delete_confirm.html', context, RequestContext(request)) | 156 | return render_to_response('meetings/team_meeting_delete_confirm.html', context, RequestContext(request)) |
4871 | 156 | 157 | ||
4872 | 157 | else: | 158 | else: |
4874 | 158 | request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.'))) | 159 | messages.error(request,'%s %s' % (_('You can not remove this team meeting.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.'))) |
4875 | 159 | return redirect(team_meeting_object) | 160 | return redirect(team_meeting_object) |
4876 | 160 | 161 | ||
4877 | 161 | 162 | ||
4878 | @@ -163,7 +164,7 @@ | |||
4879 | 163 | def team_meeting_select(request): | 164 | def team_meeting_select(request): |
4880 | 164 | teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()]) | 165 | teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()]) |
4881 | 165 | if len(teams) == 0: | 166 | if len(teams) == 0: |
4883 | 166 | request.user.message_set.create(message='%s' % (_('You are not a member of any LoCo Teams.'))) | 167 | messages.info('%s' % (_('You are not a member of any LoCo Teams.'))) |
4884 | 167 | return redirect('meeting-list') | 168 | return redirect('meeting-list') |
4885 | 168 | elif len(teams) == 1: | 169 | elif len(teams) == 1: |
4886 | 169 | url = reverse('team-meeting-new', args=[teams[0].lp_name]) | 170 | url = reverse('team-meeting-new', args=[teams[0].lp_name]) |
4887 | @@ -207,7 +208,7 @@ | |||
4888 | 207 | context, RequestContext(request)) | 208 | context, RequestContext(request)) |
4889 | 208 | else: | 209 | else: |
4890 | 209 | # XXX: Once we move to a new ACL system, this needs fixing. | 210 | # XXX: Once we move to a new ACL system, this needs fixing. |
4892 | 210 | request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.'))) | 211 | messages.error(request,'%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.'))) |
4893 | 211 | return redirect(team_object) | 212 | return redirect(team_object) |
4894 | 212 | 213 | ||
4895 | 213 | 214 | ||
4896 | @@ -243,7 +244,7 @@ | |||
4897 | 243 | context, RequestContext(request)) | 244 | context, RequestContext(request)) |
4898 | 244 | else: | 245 | else: |
4899 | 245 | # XXX: Once we move to a new ACL system, this needs fixing. | 246 | # XXX: Once we move to a new ACL system, this needs fixing. |
4901 | 246 | request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.'))) | 247 | messages.success(request,'%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.'))) |
4902 | 247 | return redirect(team_object) | 248 | return redirect(team_object) |
4903 | 248 | 249 | ||
4904 | 249 | 250 | ||
4905 | @@ -267,7 +268,7 @@ | |||
4906 | 267 | form = TeamMeetingForm(data=request.POST, instance=team_meeting_object) | 268 | form = TeamMeetingForm(data=request.POST, instance=team_meeting_object) |
4907 | 268 | if form.is_valid(): | 269 | if form.is_valid(): |
4908 | 269 | form.save() | 270 | form.save() |
4910 | 270 | request.user.message_set.create(message=_('Team meeting updated.')) | 271 | messages.success(request,_('Team meeting updated.')) |
4911 | 271 | return redirect(team_meeting_object) | 272 | return redirect(team_meeting_object) |
4912 | 272 | else: | 273 | else: |
4913 | 273 | form = TeamMeetingForm(instance=team_meeting_object) | 274 | form = TeamMeetingForm(instance=team_meeting_object) |
4914 | @@ -281,7 +282,7 @@ | |||
4915 | 281 | RequestContext(request) | 282 | RequestContext(request) |
4916 | 282 | ) | 283 | ) |
4917 | 283 | else: | 284 | else: |
4919 | 284 | request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting.'), _('You are not a member of the team or on the LoCo Council.'))) | 285 | messages.error(request,'%s %s' % (_('You can not update this team meeting.'), _('You are not a member of the team or on the LoCo Council.'))) |
4920 | 285 | return redirect(team_meeting_object) | 286 | return redirect(team_meeting_object) |
4921 | 286 | 287 | ||
4922 | 287 | 288 | ||
4923 | @@ -318,7 +319,7 @@ | |||
4924 | 318 | form = AgendaItemForm(data=request.POST, instance=agenda_item_object) | 319 | form = AgendaItemForm(data=request.POST, instance=agenda_item_object) |
4925 | 319 | if form.is_valid(): | 320 | if form.is_valid(): |
4926 | 320 | agenda_item_object = form.save() | 321 | agenda_item_object = form.save() |
4928 | 321 | request.user.message_set.create(message=_('Meeting agenda updated.')) | 322 | messages.success(request,_('Meeting agenda updated.')) |
4929 | 322 | return redirect(team_meeting_object) | 323 | return redirect(team_meeting_object) |
4930 | 323 | else: | 324 | else: |
4931 | 324 | form = AgendaItemForm(instance=agenda_item_object) | 325 | form = AgendaItemForm(instance=agenda_item_object) |
4932 | @@ -331,7 +332,7 @@ | |||
4933 | 331 | context, RequestContext(request)) | 332 | context, RequestContext(request)) |
4934 | 332 | else: | 333 | else: |
4935 | 333 | # XXX: Once we move to a new ACL system, this needs fixing. | 334 | # XXX: Once we move to a new ACL system, this needs fixing. |
4937 | 334 | request.user.message_set.create(message='%s %s' % (_('You can not add a new agenda item for this team meeting.'), _('You are not a member of the team or on the LoCo Council.'))) | 335 | messages.error(request,'%s %s' % (_('You can not add a new agenda item for this team meeting.'), _('You are not a member of the team or on the LoCo Council.'))) |
4938 | 335 | return redirect(team_meeting_object) | 336 | return redirect(team_meeting_object) |
4939 | 336 | 337 | ||
4940 | 337 | 338 | ||
4941 | @@ -356,7 +357,7 @@ | |||
4942 | 356 | form = AgendaItemForm(data=request.POST, instance=agenda_item_object) | 357 | form = AgendaItemForm(data=request.POST, instance=agenda_item_object) |
4943 | 357 | if form.is_valid(): | 358 | if form.is_valid(): |
4944 | 358 | form.save() | 359 | form.save() |
4946 | 359 | request.user.message_set.create(message=_('Meeting agenda updated.')) | 360 | messages.success(request,_('Meeting agenda updated.')) |
4947 | 360 | return redirect(team_meeting_object) | 361 | return redirect(team_meeting_object) |
4948 | 361 | else: | 362 | else: |
4949 | 362 | form = AgendaItemForm(instance=agenda_item_object) | 363 | form = AgendaItemForm(instance=agenda_item_object) |
4950 | @@ -369,7 +370,7 @@ | |||
4951 | 369 | return render_to_response('meetings/agenda_item_update.html', | 370 | return render_to_response('meetings/agenda_item_update.html', |
4952 | 370 | context, RequestContext(request)) | 371 | context, RequestContext(request)) |
4953 | 371 | else: | 372 | else: |
4955 | 372 | request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting agenda.'), _('You are not a member of the team or on the LoCo Council.'))) | 373 | messages.error(request,'%s %s' % (_('You can not update this team meeting agenda.'), _('You are not a member of the team or on the LoCo Council.'))) |
4956 | 373 | return redirect(team_meeting_object) | 374 | return redirect(team_meeting_object) |
4957 | 374 | 375 | ||
4958 | 375 | 376 | ||
4959 | @@ -392,7 +393,7 @@ | |||
4960 | 392 | if is_on_lc or is_member: | 393 | if is_on_lc or is_member: |
4961 | 393 | if request.method == 'POST': | 394 | if request.method == 'POST': |
4962 | 394 | agenda_item_object.delete() | 395 | agenda_item_object.delete() |
4964 | 395 | request.user.message_set.create(message=_('Agenda Item removed.')) | 396 | messages.success(request,_('Agenda Item removed.')) |
4965 | 396 | return redirect(team_meeting_object) | 397 | return redirect(team_meeting_object) |
4966 | 397 | else: | 398 | else: |
4967 | 398 | context = { | 399 | context = { |
4968 | @@ -401,5 +402,5 @@ | |||
4969 | 401 | return render_to_response('meetings/agenda_item_delete_confirm.html', context, RequestContext(request)) | 402 | return render_to_response('meetings/agenda_item_delete_confirm.html', context, RequestContext(request)) |
4970 | 402 | 403 | ||
4971 | 403 | else: | 404 | else: |
4973 | 404 | request.user.message_set.create(message='%s %s' % (_('You can not remove this agenda item.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.'))) | 405 | messages.error(request,'%s %s' % (_('You can not remove this agenda item.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.'))) |
4974 | 405 | return redirect(team_meeting_object) | 406 | return redirect(team_meeting_object) |
4975 | 406 | 407 | ||
4976 | === modified file 'loco_directory/services/__init__.py' | |||
4977 | --- loco_directory/services/__init__.py 2011-01-24 03:04:29 +0000 | |||
4978 | +++ loco_directory/services/__init__.py 2016-08-16 07:31:30 +0000 | |||
4979 | @@ -6,7 +6,7 @@ | |||
4980 | 6 | from django.db.models import Model | 6 | from django.db.models import Model |
4981 | 7 | from django.http import HttpResponse | 7 | from django.http import HttpResponse |
4982 | 8 | from django.forms.fields import EMPTY_VALUES | 8 | from django.forms.fields import EMPTY_VALUES |
4984 | 9 | from django.utils import simplejson | 9 | import json |
4985 | 10 | import re | 10 | import re |
4986 | 11 | import decimal | 11 | import decimal |
4987 | 12 | 12 | ||
4988 | @@ -32,7 +32,7 @@ | |||
4989 | 32 | 32 | ||
4990 | 33 | # Otherwise process the entity request | 33 | # Otherwise process the entity request |
4991 | 34 | if request.method == "GET": | 34 | if request.method == "GET": |
4993 | 35 | return HttpResponse(encode(entity, include, exclude), mimetype=get_mimetype()) | 35 | return HttpResponse(encode(entity, include, exclude), content_type=get_mimetype()) |
4994 | 36 | 36 | ||
4995 | 37 | elif request.method == "PUT": | 37 | elif request.method == "PUT": |
4996 | 38 | return HttpResponse(encode_error("Write operations are not supported")) | 38 | return HttpResponse(encode_error("Write operations are not supported")) |
4997 | @@ -47,7 +47,7 @@ | |||
4998 | 47 | results = do_search(model, request.GET, include, exclude) | 47 | results = do_search(model, request.GET, include, exclude) |
4999 | 48 | 48 | ||
5000 | 49 | collection = list(results) | 49 | collection = list(results) |
The diff has been truncated for viewing.