Merge lp:~ronnie.vd.c/loco-team-portal/736208-url-name into lp:loco-team-portal
- 736208-url-name
- Merge into 0.2
Proposed by
Ronnie
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Chris Johnston | ||||
Approved revision: | 424 | ||||
Merged at revision: | 422 | ||||
Proposed branch: | lp:~ronnie.vd.c/loco-team-portal/736208-url-name | ||||
Merge into: | lp:loco-team-portal | ||||
Diff against target: |
554 lines (+102/-74) 21 files modified
loco_directory/events/models.py (+8/-1) loco_directory/events/urls.py (+21/-15) loco_directory/events/views.py (+9/-9) loco_directory/meetings/models.py (+8/-1) loco_directory/meetings/urls.py (+14/-10) loco_directory/meetings/views.py (+7/-7) loco_directory/templates/events/team_event_detail.html (+5/-5) loco_directory/templates/events/team_event_detail_attendees.inc.html (+3/-3) loco_directory/templates/events/team_event_detail_comments.inc.html (+1/-1) loco_directory/templates/events/team_event_li.inc.html (+1/-1) loco_directory/templates/events/team_events_rss.xml (+2/-2) loco_directory/templates/meetings/agenda_item_delete_confirm.html (+1/-1) loco_directory/templates/meetings/agenda_item_new.html (+1/-1) loco_directory/templates/meetings/agenda_item_update.html (+1/-1) loco_directory/templates/meetings/team_meeting_detail.html (+4/-4) loco_directory/templates/meetings/team_meeting_li.inc.html (+1/-1) loco_directory/templates/meetings/team_meetings_rss.xml (+2/-2) loco_directory/templates/venues/venue_detail.html (+1/-1) loco_directory/venues/models.py (+1/-1) loco_directory/venues/urls.py (+7/-3) loco_directory/venues/views.py (+4/-4) |
||||
To merge this branch: | bzr merge lp:~ronnie.vd.c/loco-team-portal/736208-url-name | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Johnston | Approve | ||
Review via email: mp+53683@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) wrote : | # |
For adding a meeting I get:
Exception Type: NoReverseMatch at /meetings/
Exception Value: Reverse for 'team-meeting-
Revision history for this message
Chris Johnston (cjohnston) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'loco_directory/events/models.py' | |||
2 | --- loco_directory/events/models.py 2011-03-02 23:05:59 +0000 | |||
3 | +++ loco_directory/events/models.py 2011-03-18 13:41:34 +0000 | |||
4 | @@ -148,9 +148,16 @@ | |||
5 | 148 | self.date_end = local_end | 148 | self.date_end = local_end |
6 | 149 | local_date_end = property(get_local_end, set_local_end) | 149 | local_date_end = property(get_local_end, set_local_end) |
7 | 150 | 150 | ||
8 | 151 | def first_team(self): | ||
9 | 152 | try: | ||
10 | 153 | return self.teams.all()[0] | ||
11 | 154 | except: | ||
12 | 155 | print 'Event %s has no team' % self.id | ||
13 | 156 | return {'lp_name':'no-team'} | ||
14 | 157 | |||
15 | 151 | @models.permalink | 158 | @models.permalink |
16 | 152 | def get_absolute_url(self): | 159 | def get_absolute_url(self): |
18 | 153 | return ('team-event-detail', [str(self.id)]) | 160 | return ('team-event-detail', [getattr(self.first_team(), 'lp_name', 'no-team'), str(self.id)]) |
19 | 154 | 161 | ||
20 | 155 | def is_attending(self, user): | 162 | def is_attending(self, user): |
21 | 156 | if user.is_authenticated(): | 163 | if user.is_authenticated(): |
22 | 157 | 164 | ||
23 | === modified file 'loco_directory/events/urls.py' | |||
24 | --- loco_directory/events/urls.py 2011-02-17 20:05:03 +0000 | |||
25 | +++ loco_directory/events/urls.py 2011-03-18 13:41:34 +0000 | |||
26 | @@ -4,20 +4,7 @@ | |||
27 | 4 | #all events | 4 | #all events |
28 | 5 | url(r'^$', 'events.views.event_list', name='event-list'), | 5 | url(r'^$', 'events.views.event_list', name='event-list'), |
29 | 6 | url(r'^history/$', 'events.views.event_history_list', name='event-history-list'), | 6 | url(r'^history/$', 'events.views.event_history_list', name='event-history-list'), |
44 | 7 | #team events | 7 | |
31 | 8 | url(r'^team/locations/$', 'events.views.team_event_locations', name='team-event-locations'), | ||
32 | 9 | url(r'^team/ical/$', 'events.views.teams_event_list_ical', name='teams-event-list-ical'), | ||
33 | 10 | url(r'^team/(?P<team_event_id>\d+)/detail/ical/$', 'events.views.event_ical', name='event-ical'), | ||
34 | 11 | url(r'^team/(?P<team_event_id>\d+)/register/$', 'events.views.team_event_register', name='team-event-register'), | ||
35 | 12 | url(r'^team/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail'), | ||
36 | 13 | url(r'^team/(?P<team_event_id>\d+)/delete/$', 'events.views.team_event_delete', name='team-event-delete'), | ||
37 | 14 | url(r'^team/(?P<team_event_id>\d+)/update/$', 'events.views.team_event_update', name='team-event-update'), | ||
38 | 15 | url(r'^team/(?P<team_event_id>\d+)/comment/$', 'events.views.team_event_comment_new', name='team-event-comment-new'), | ||
39 | 16 | url(r'^team/(?P<team_event_id>\d+)/copy/$', 'events.views.team_event_copy', name='team-event-copy'), | ||
40 | 17 | url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'events.views.team_event_new', name='team-event-new'), | ||
41 | 18 | url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'events.views.team_events_rss', name='team-events-rss'), | ||
42 | 19 | url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'events.views.team_event_list_ical', name='team-event-list-ical'), | ||
43 | 20 | url(r'^team/add/$', 'events.views.team_event_select', name='team-event-select'), | ||
45 | 21 | #global events | 8 | #global events |
46 | 22 | url(r'^global/ical/$', 'events.views.global_event_list_ical', name='global-event-list-ical'), | 9 | url(r'^global/ical/$', 'events.views.global_event_list_ical', name='global-event-list-ical'), |
47 | 23 | url(r'^global/(?P<global_event_id>\d+)/detail/$', 'events.views.global_event_detail', name='global-event-detail'), | 10 | url(r'^global/(?P<global_event_id>\d+)/detail/$', 'events.views.global_event_detail', name='global-event-detail'), |
48 | @@ -25,5 +12,24 @@ | |||
49 | 25 | url(r'^global/(?P<global_event_id>\d+)/update/$', 'events.views.global_event_update', name='global-event-update'), | 12 | url(r'^global/(?P<global_event_id>\d+)/update/$', 'events.views.global_event_update', name='global-event-update'), |
50 | 26 | url(r'^global/(?P<global_event_id>\d+)/locations/$', 'events.views.global_event_locations', name='global-event-locations'), | 13 | url(r'^global/(?P<global_event_id>\d+)/locations/$', 'events.views.global_event_locations', name='global-event-locations'), |
51 | 27 | url(r'^global/add/$', 'events.views.global_event_new', name='global-event-new'), | 14 | url(r'^global/add/$', 'events.views.global_event_new', name='global-event-new'), |
53 | 28 | 15 | ||
54 | 16 | #team events | ||
55 | 17 | url(r'^locations/$', 'events.views.team_event_locations', name='team-event-locations'), | ||
56 | 18 | url(r'^ical/$', 'events.views.teams_event_list_ical', name='teams-event-list-ical'), | ||
57 | 19 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/ical/$', 'events.views.event_ical', name='event-ical'), | ||
58 | 20 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/register/$', 'events.views.team_event_register', name='team-event-register'), | ||
59 | 21 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail'), | ||
60 | 22 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/delete/$', 'events.views.team_event_delete', name='team-event-delete'), | ||
61 | 23 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/update/$', 'events.views.team_event_update', name='team-event-update'), | ||
62 | 24 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/comment/$', 'events.views.team_event_comment_new', name='team-event-comment-new'), | ||
63 | 25 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/copy/$', 'events.views.team_event_copy', name='team-event-copy'), | ||
64 | 26 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'events.views.team_event_new', name='team-event-new'), | ||
65 | 27 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'events.views.team_events_rss', name='team-events-rss'), | ||
66 | 28 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'events.views.team_event_list_ical', name='team-event-list-ical'), | ||
67 | 29 | url(r'^add/$', 'events.views.team_event_select', name='team-event-select'), | ||
68 | 30 | |||
69 | 31 | # Old url notations | ||
70 | 32 | url(r'^team/locations/$', 'events.views.team_event_locations'), | ||
71 | 33 | url(r'^team/ical/$', 'events.views.teams_event_list_ical'), | ||
72 | 34 | url(r'^team/add/$', 'events.views.team_event_select'), | ||
73 | 29 | ) | 35 | ) |
74 | 30 | 36 | ||
75 | === modified file 'loco_directory/events/views.py' | |||
76 | --- loco_directory/events/views.py 2011-03-06 22:13:43 +0000 | |||
77 | +++ loco_directory/events/views.py 2011-03-18 13:41:34 +0000 | |||
78 | @@ -57,7 +57,7 @@ | |||
79 | 57 | 57 | ||
80 | 58 | return response | 58 | return response |
81 | 59 | 59 | ||
83 | 60 | def event_ical(request, team_event_id): | 60 | def event_ical(request, team_slug, team_event_id): |
84 | 61 | """ | 61 | """ |
85 | 62 | Return a ical list with a single events in ical format. | 62 | Return a ical list with a single events in ical format. |
86 | 63 | """ | 63 | """ |
87 | @@ -102,7 +102,7 @@ | |||
88 | 102 | # Team Events | 102 | # Team Events |
89 | 103 | ################################################################# | 103 | ################################################################# |
90 | 104 | 104 | ||
92 | 105 | def team_event_detail(request, team_event_id): | 105 | def team_event_detail(request, team_slug, team_event_id): |
93 | 106 | """ | 106 | """ |
94 | 107 | detailed view for a team event | 107 | detailed view for a team event |
95 | 108 | """ | 108 | """ |
96 | @@ -120,7 +120,7 @@ | |||
97 | 120 | context, RequestContext(request)) | 120 | context, RequestContext(request)) |
98 | 121 | 121 | ||
99 | 122 | @login_required | 122 | @login_required |
101 | 123 | def team_event_delete(request, team_event_id): | 123 | def team_event_delete(request, team_slug, team_event_id): |
102 | 124 | """ | 124 | """ |
103 | 125 | delete a event | 125 | delete a event |
104 | 126 | """ | 126 | """ |
105 | @@ -204,7 +204,7 @@ | |||
106 | 204 | team_event = form.save() | 204 | team_event = form.save() |
107 | 205 | team_event.teams.add(team_object) | 205 | team_event.teams.add(team_object) |
108 | 206 | team_event_id = team_event.id | 206 | team_event_id = team_event.id |
110 | 207 | return HttpResponseRedirect(reverse('team-event-detail', kwargs={'team_event_id': team_event_id})) | 207 | return HttpResponseRedirect(team_event.get_absolute_url()) |
111 | 208 | else: | 208 | else: |
112 | 209 | form = TeamEventForm(initial={'global_event':request.GET.get('global_event_id', None)}, teams=[team_object]) | 209 | form = TeamEventForm(initial={'global_event':request.GET.get('global_event_id', None)}, teams=[team_object]) |
113 | 210 | if request.GET.has_key('global_event_id'): | 210 | if request.GET.has_key('global_event_id'): |
114 | @@ -223,7 +223,7 @@ | |||
115 | 223 | return redirect( team_object ) | 223 | return redirect( team_object ) |
116 | 224 | 224 | ||
117 | 225 | @login_required | 225 | @login_required |
119 | 226 | def team_event_copy(request, team_event_id): | 226 | def team_event_copy(request, team_slug, team_event_id): |
120 | 227 | """ | 227 | """ |
121 | 228 | new team event | 228 | new team event |
122 | 229 | """ | 229 | """ |
123 | @@ -242,7 +242,7 @@ | |||
124 | 242 | team_event = form.save() | 242 | team_event = form.save() |
125 | 243 | team_event.teams.add(team_object) | 243 | team_event.teams.add(team_object) |
126 | 244 | team_event_id = team_event.id | 244 | team_event_id = team_event.id |
128 | 245 | return HttpResponseRedirect(reverse('team-event-detail', kwargs={'team_event_id': team_event_id})) | 245 | return HttpResponseRedirect(team_event.get_absolute_url()) |
129 | 246 | else: | 246 | else: |
130 | 247 | form = TeamEventForm(instance=team_event, teams=team_event.teams.all()) | 247 | form = TeamEventForm(instance=team_event, teams=team_event.teams.all()) |
131 | 248 | 248 | ||
132 | @@ -258,7 +258,7 @@ | |||
133 | 258 | return redirect( team_object ) | 258 | return redirect( team_object ) |
134 | 259 | 259 | ||
135 | 260 | @login_required | 260 | @login_required |
137 | 261 | def team_event_update(request, team_event_id): | 261 | def team_event_update(request, team_slug, team_event_id): |
138 | 262 | """ | 262 | """ |
139 | 263 | update team event | 263 | update team event |
140 | 264 | """ | 264 | """ |
141 | @@ -292,7 +292,7 @@ | |||
142 | 292 | return redirect( team_event_object ) | 292 | return redirect( team_event_object ) |
143 | 293 | 293 | ||
144 | 294 | @login_required | 294 | @login_required |
146 | 295 | def team_event_register(request, team_event_id): | 295 | def team_event_register(request, team_slug, team_event_id): |
147 | 296 | """ | 296 | """ |
148 | 297 | register as attendee for a team event | 297 | register as attendee for a team event |
149 | 298 | """ | 298 | """ |
150 | @@ -326,7 +326,7 @@ | |||
151 | 326 | context, RequestContext(request)) | 326 | context, RequestContext(request)) |
152 | 327 | 327 | ||
153 | 328 | @login_required | 328 | @login_required |
155 | 329 | def team_event_comment_new(request, team_event_id): | 329 | def team_event_comment_new(request, team_slug, team_event_id): |
156 | 330 | """ | 330 | """ |
157 | 331 | create a comment for a team event | 331 | create a comment for a team event |
158 | 332 | """ | 332 | """ |
159 | 333 | 333 | ||
160 | === modified file 'loco_directory/meetings/models.py' | |||
161 | --- loco_directory/meetings/models.py 2011-03-02 23:05:59 +0000 | |||
162 | +++ loco_directory/meetings/models.py 2011-03-18 13:41:34 +0000 | |||
163 | @@ -56,10 +56,17 @@ | |||
164 | 56 | 56 | ||
165 | 57 | def __unicode__(self): | 57 | def __unicode__(self): |
166 | 58 | return "%s %s" % (self.name, self.date_begin or "") | 58 | return "%s %s" % (self.name, self.date_begin or "") |
167 | 59 | |||
168 | 60 | def first_team(self): | ||
169 | 61 | try: | ||
170 | 62 | return self.teams.all()[0] | ||
171 | 63 | except: | ||
172 | 64 | print 'Meeting %s has no team' % self.id | ||
173 | 65 | return {'lp_name':'no-team'} | ||
174 | 59 | 66 | ||
175 | 60 | @models.permalink | 67 | @models.permalink |
176 | 61 | def get_absolute_url(self): | 68 | def get_absolute_url(self): |
178 | 62 | return ('team-meeting-detail', [str(self.id)]) | 69 | return ('team-meeting-detail', [getattr(self.first_team(), 'lp_name', 'no-team'), str(self.id)]) |
179 | 63 | 70 | ||
180 | 64 | #add manager | 71 | #add manager |
181 | 65 | objects = TeamMeetingManager() | 72 | objects = TeamMeetingManager() |
182 | 66 | 73 | ||
183 | === modified file 'loco_directory/meetings/urls.py' | |||
184 | --- loco_directory/meetings/urls.py 2011-01-23 02:17:54 +0000 | |||
185 | +++ loco_directory/meetings/urls.py 2011-03-18 13:41:34 +0000 | |||
186 | @@ -5,18 +5,22 @@ | |||
187 | 5 | url(r'^$', 'meetings.views.meeting_list', name='meeting-list'), | 5 | url(r'^$', 'meetings.views.meeting_list', name='meeting-list'), |
188 | 6 | url(r'^history/$', 'meetings.views.meeting_history_list', name='meeting-history-list'), | 6 | url(r'^history/$', 'meetings.views.meeting_history_list', name='meeting-history-list'), |
189 | 7 | #team meetings | 7 | #team meetings |
200 | 8 | url(r'^team/ical/$', 'meetings.views.teams_meeting_list_ical', name='teams-meeting-list-ical'), | 8 | url(r'^ical/$', 'meetings.views.teams_meeting_list_ical', name='teams-meeting-list-ical'), |
201 | 9 | url(r'^team/(?P<team_meeting_id>\d+)/detail/ical/$', 'meetings.views.meeting_ical', name='meeting-ical'), | 9 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_meeting_id>\d+)/detail/ical/$', 'meetings.views.meeting_ical', name='meeting-ical'), |
202 | 10 | url(r'^team/(?P<team_meeting_id>\d+)/detail/$', 'meetings.views.team_meeting_detail', name='team-meeting-detail'), | 10 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_meeting_id>\d+)/detail/$', 'meetings.views.team_meeting_detail', name='team-meeting-detail'), |
203 | 11 | url(r'^team/(?P<team_meeting_id>\d+)/delete/$', 'meetings.views.team_meeting_delete', name='team-meeting-delete'), | 11 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_meeting_id>\d+)/delete/$', 'meetings.views.team_meeting_delete', name='team-meeting-delete'), |
204 | 12 | url(r'^team/(?P<team_meeting_id>\d+)/update/$', 'meetings.views.team_meeting_update', name='team-meeting-update'), | 12 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_meeting_id>\d+)/update/$', 'meetings.views.team_meeting_update', name='team-meeting-update'), |
205 | 13 | url(r'^team/(?P<team_meeting_id>\d+)/copy/$', 'meetings.views.team_meeting_copy', name='team-meeting-copy'), | 13 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_meeting_id>\d+)/copy/$', 'meetings.views.team_meeting_copy', name='team-meeting-copy'), |
206 | 14 | url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'meetings.views.team_meeting_new', name='team-meeting-new'), | 14 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'meetings.views.team_meeting_new', name='team-meeting-new'), |
207 | 15 | url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'meetings.views.team_meetings_rss', name='team-meetings-rss'), | 15 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'meetings.views.team_meetings_rss', name='team-meetings-rss'), |
208 | 16 | url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'meetings.views.team_meeting_list_ical', name='team-meeting-list-ical'), | 16 | url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'meetings.views.team_meeting_list_ical', name='team-meeting-list-ical'), |
209 | 17 | url(r'^team/add/$', 'meetings.views.team_meeting_select', name='team-meeting-select'), | 17 | url(r'^add/$', 'meetings.views.team_meeting_select', name='team-meeting-select'), |
210 | 18 | 18 | ||
211 | 19 | url(r'^team/(?P<team_meeting_id>\d+)/agenda/(?P<agenda_item_id>\d+)/delete/$', 'meetings.views.agenda_item_delete', name='agenda-item-delete'), | 19 | url(r'^team/(?P<team_meeting_id>\d+)/agenda/(?P<agenda_item_id>\d+)/delete/$', 'meetings.views.agenda_item_delete', name='agenda-item-delete'), |
212 | 20 | url(r'^team/(?P<team_meeting_id>\d+)/agenda/(?P<agenda_item_id>\d+)/update/$', 'meetings.views.agenda_item_update', name='agenda-item-update'), | 20 | url(r'^team/(?P<team_meeting_id>\d+)/agenda/(?P<agenda_item_id>\d+)/update/$', 'meetings.views.agenda_item_update', name='agenda-item-update'), |
213 | 21 | url(r'^team/(?P<team_meeting_id>\d+)/agenda/add/$', 'meetings.views.agenda_item_new', name='agenda-item-new'), | 21 | url(r'^team/(?P<team_meeting_id>\d+)/agenda/add/$', 'meetings.views.agenda_item_new', name='agenda-item-new'), |
214 | 22 | |||
215 | 23 | #Old url notations | ||
216 | 24 | url(r'^team/ical/$', 'meetings.views.teams_meeting_list_ical'), | ||
217 | 25 | url(r'^team/add/$', 'meetings.views.team_meeting_select'), | ||
218 | 22 | ) | 26 | ) |
219 | 23 | 27 | ||
220 | === modified file 'loco_directory/meetings/views.py' | |||
221 | --- loco_directory/meetings/views.py 2011-02-23 01:05:59 +0000 | |||
222 | +++ loco_directory/meetings/views.py 2011-03-18 13:41:34 +0000 | |||
223 | @@ -52,7 +52,7 @@ | |||
224 | 52 | return response | 52 | return response |
225 | 53 | 53 | ||
226 | 54 | 54 | ||
228 | 55 | def meeting_ical(request, team_meeting_id): | 55 | def meeting_ical(request, team_slug, team_meeting_id): |
229 | 56 | """ | 56 | """ |
230 | 57 | Return a ical list with a single meetings in ical format. | 57 | Return a ical list with a single meetings in ical format. |
231 | 58 | """ | 58 | """ |
232 | @@ -89,7 +89,7 @@ | |||
233 | 89 | # Team Meetings | 89 | # Team Meetings |
234 | 90 | ################################################################# | 90 | ################################################################# |
235 | 91 | 91 | ||
237 | 92 | def team_meeting_detail(request, team_meeting_id): | 92 | def team_meeting_detail(request, team_slug, team_meeting_id): |
238 | 93 | team_meeting_object = get_object_or_404(TeamMeeting, pk=team_meeting_id) | 93 | team_meeting_object = get_object_or_404(TeamMeeting, pk=team_meeting_id) |
239 | 94 | is_member = False | 94 | is_member = False |
240 | 95 | for team_object in team_meeting_object.teams.all(): | 95 | for team_object in team_meeting_object.teams.all(): |
241 | @@ -103,7 +103,7 @@ | |||
242 | 103 | context, RequestContext(request)) | 103 | context, RequestContext(request)) |
243 | 104 | 104 | ||
244 | 105 | @login_required | 105 | @login_required |
246 | 106 | def team_meeting_delete(request, team_meeting_id): | 106 | def team_meeting_delete(request, team_slug, team_meeting_id): |
247 | 107 | """ | 107 | """ |
248 | 108 | delete a meeting | 108 | delete a meeting |
249 | 109 | """ | 109 | """ |
250 | @@ -185,7 +185,7 @@ | |||
251 | 185 | team_meeting = form.save() | 185 | team_meeting = form.save() |
252 | 186 | team_meeting.teams.add(team_object) | 186 | team_meeting.teams.add(team_object) |
253 | 187 | team_meeting_id = team_meeting.id | 187 | team_meeting_id = team_meeting.id |
255 | 188 | return HttpResponseRedirect(reverse('team-meeting-detail', kwargs={'team_meeting_id': team_meeting_id})) | 188 | return HttpResponseRedirect(team_meeting_object.get_absolute_url()) |
256 | 189 | else: | 189 | else: |
257 | 190 | form = TeamMeetingForm(teams=[team_object], instance=team_meeting_object) | 190 | form = TeamMeetingForm(teams=[team_object], instance=team_meeting_object) |
258 | 191 | 191 | ||
259 | @@ -201,7 +201,7 @@ | |||
260 | 201 | return redirect( team_object ) | 201 | return redirect( team_object ) |
261 | 202 | 202 | ||
262 | 203 | @login_required | 203 | @login_required |
264 | 204 | def team_meeting_copy(request, team_meeting_id): | 204 | def team_meeting_copy(request, team_slug, team_meeting_id): |
265 | 205 | """ | 205 | """ |
266 | 206 | copy team meeting | 206 | copy team meeting |
267 | 207 | """ | 207 | """ |
268 | @@ -220,7 +220,7 @@ | |||
269 | 220 | team_meeting = form.save() | 220 | team_meeting = form.save() |
270 | 221 | team_meeting.teams.add(team_object) | 221 | team_meeting.teams.add(team_object) |
271 | 222 | team_meeting_id = team_meeting.id | 222 | team_meeting_id = team_meeting.id |
273 | 223 | return HttpResponseRedirect(reverse('team-meeting-detail', kwargs={'team_meeting_id': team_meeting_id})) | 223 | return HttpResponseRedirect(team_meeting.get_absolute_url()) |
274 | 224 | else: | 224 | else: |
275 | 225 | form = TeamMeetingForm(instance=team_meeting, teams=team_meeting.teams.all()) | 225 | form = TeamMeetingForm(instance=team_meeting, teams=team_meeting.teams.all()) |
276 | 226 | 226 | ||
277 | @@ -236,7 +236,7 @@ | |||
278 | 236 | return redirect( team_object ) | 236 | return redirect( team_object ) |
279 | 237 | 237 | ||
280 | 238 | @login_required | 238 | @login_required |
282 | 239 | def team_meeting_update(request, team_meeting_id): | 239 | def team_meeting_update(request, team_slug, team_meeting_id): |
283 | 240 | """ | 240 | """ |
284 | 241 | update team meeting | 241 | update team meeting |
285 | 242 | """ | 242 | """ |
286 | 243 | 243 | ||
287 | === modified file 'loco_directory/templates/events/team_event_detail.html' | |||
288 | --- loco_directory/templates/events/team_event_detail.html 2010-11-20 17:25:50 +0000 | |||
289 | +++ loco_directory/templates/events/team_event_detail.html 2011-03-18 13:41:34 +0000 | |||
290 | @@ -5,15 +5,15 @@ | |||
291 | 5 | 5 | ||
292 | 6 | {% block sub_nav_links %} | 6 | {% block sub_nav_links %} |
293 | 7 | <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a> | 7 | <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a> |
295 | 8 | <a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a> | 8 | <a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.first_team.lp_name team_event_object.id %}#comment">{% trans "Add Comment" %}</a> |
296 | 9 | {% if user.is_authenticated %} | 9 | {% if user.is_authenticated %} |
297 | 10 | {% if user_is_team_member %} | 10 | {% if user_is_team_member %} |
301 | 11 | <a class="sub-nav-item" href="{% url team-event-update team_event_object.id %}">{% trans "Edit Details" %}</a> | 11 | <a class="sub-nav-item" href="{% url team-event-update team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Edit Details" %}</a> |
302 | 12 | <a class="sub-nav-item" href="{% url team-event-delete team_event_object.id %}">{% trans "Delete Event" %}</a> | 12 | <a class="sub-nav-item" href="{% url team-event-delete team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Delete Event" %}</a> |
303 | 13 | <a class="sub-nav-item" href="{% url team-event-copy team_event_object.id %}">{% trans "Copy Event" %}</a> | 13 | <a class="sub-nav-item" href="{% url team-event-copy team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Copy Event" %}</a> |
304 | 14 | {% endif %} | 14 | {% endif %} |
305 | 15 | {% endif %} | 15 | {% endif %} |
307 | 16 | <a class="sub-nav-item" href="{% url event-ical team_event_object.id %}">{% trans "iCal Feed" %}</a> | 16 | <a class="sub-nav-item" href="{% url event-ical team_event_object.first_team.lp_name team_event_object.id %}">{% trans "iCal Feed" %}</a> |
308 | 17 | {% endblock %} | 17 | {% endblock %} |
309 | 18 | 18 | ||
310 | 19 | {% block content %} | 19 | {% block content %} |
311 | 20 | 20 | ||
312 | === modified file 'loco_directory/templates/events/team_event_detail_attendees.inc.html' | |||
313 | --- loco_directory/templates/events/team_event_detail_attendees.inc.html 2011-01-02 18:45:45 +0000 | |||
314 | +++ loco_directory/templates/events/team_event_detail_attendees.inc.html 2011-03-18 13:41:34 +0000 | |||
315 | @@ -5,12 +5,12 @@ | |||
316 | 5 | <td colspan="2"> | 5 | <td colspan="2"> |
317 | 6 | {% if user.is_authenticated %} | 6 | {% if user.is_authenticated %} |
318 | 7 | {% if user_is_attending %} | 7 | {% if user_is_attending %} |
320 | 8 | <a href="{% url team-event-register team_event_object.id %}">{% trans 'Change your Registration Status' %}</a> | 8 | <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Change your Registration Status' %}</a> |
321 | 9 | {% else %} | 9 | {% else %} |
323 | 10 | <a href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a> | 10 | <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a> |
324 | 11 | {% endif %} | 11 | {% endif %} |
325 | 12 | {% else %} | 12 | {% else %} |
327 | 13 | <a href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a> | 13 | <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a> |
328 | 14 | {% endif %} | 14 | {% endif %} |
329 | 15 | </td> | 15 | </td> |
330 | 16 | </tr> | 16 | </tr> |
331 | 17 | 17 | ||
332 | === modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html' | |||
333 | --- loco_directory/templates/events/team_event_detail_comments.inc.html 2010-11-19 13:17:17 +0000 | |||
334 | +++ loco_directory/templates/events/team_event_detail_comments.inc.html 2011-03-18 13:41:34 +0000 | |||
335 | @@ -3,7 +3,7 @@ | |||
336 | 3 | <table id="team-event-comments"> | 3 | <table id="team-event-comments"> |
337 | 4 | <tr> | 4 | <tr> |
338 | 5 | <td colspan="2" class="form-item-value"> | 5 | <td colspan="2" class="form-item-value"> |
340 | 6 | <a href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a> | 6 | <a href="{% url team-event-comment-new team_event_object.first_team.lp_name team_event_object.id %}#comment">{% trans "Add Comment" %}</a> |
341 | 7 | </td> | 7 | </td> |
342 | 8 | </tr> | 8 | </tr> |
343 | 9 | {% regroup team_event_object.teameventcomment_set.all by local_date_created|date:"D d M Y" as comment_list %} | 9 | {% regroup team_event_object.teameventcomment_set.all by local_date_created|date:"D d M Y" as comment_list %} |
344 | 10 | 10 | ||
345 | === modified file 'loco_directory/templates/events/team_event_li.inc.html' | |||
346 | --- loco_directory/templates/events/team_event_li.inc.html 2011-01-20 14:36:48 +0000 | |||
347 | +++ loco_directory/templates/events/team_event_li.inc.html 2011-03-18 13:41:34 +0000 | |||
348 | @@ -1,5 +1,5 @@ | |||
349 | 1 | {% load i18n %} | 1 | {% load i18n %} |
350 | 2 | {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %} | 2 | {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %} |
351 | 3 | <li> | 3 | <li> |
353 | 4 | <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }} | 4 | <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.first_team.lp_name team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }} |
354 | 5 | </li> | 5 | </li> |
355 | 6 | 6 | ||
356 | === modified file 'loco_directory/templates/events/team_events_rss.xml' | |||
357 | --- loco_directory/templates/events/team_events_rss.xml 2010-08-17 08:48:39 +0000 | |||
358 | +++ loco_directory/templates/events/team_events_rss.xml 2011-03-18 13:41:34 +0000 | |||
359 | @@ -8,7 +8,7 @@ | |||
360 | 8 | {% for e in events %} | 8 | {% for e in events %} |
361 | 9 | <item> | 9 | <item> |
362 | 10 | <title> {{ e.name }}</title> | 10 | <title> {{ e.name }}</title> |
364 | 11 | <link>{{base}}{% url team-event-detail e.id %}</link> | 11 | <link>{{base}}{% url team-event-detail e.first_team.lp_name e.id %}</link> |
365 | 12 | <description>{% trans "When:" %} {% spaceless %} | 12 | <description>{% trans "When:" %} {% spaceless %} |
366 | 13 | {% ifequal e.date_begin|date e.date_end|date %} | 13 | {% ifequal e.date_begin|date e.date_end|date %} |
367 | 14 | {{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"H:i O" }} | 14 | {{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"H:i O" }} |
368 | @@ -17,7 +17,7 @@ | |||
369 | 17 | {% endifequal %} | 17 | {% endifequal %} |
370 | 18 | {% endspaceless %}{% if e.venue.name %} | {% trans "Where:" %} {{ e.venue.name }}{% endif %} | 18 | {% endspaceless %}{% if e.venue.name %} | {% trans "Where:" %} {{ e.venue.name }}{% endif %} |
371 | 19 | {% if e.description %} | {% trans "Description:" %} {{ e.description }}{% endif %}</description> | 19 | {% if e.description %} | {% trans "Description:" %} {{ e.description }}{% endif %}</description> |
373 | 20 | <guid>{{base}}{% url team-event-detail e.id %}</guid> | 20 | <guid>{{base}}{% url team-event-detail e.first_team.lp_name e.id %}</guid> |
374 | 21 | </item> | 21 | </item> |
375 | 22 | {% endfor %} | 22 | {% endfor %} |
376 | 23 | </channel> | 23 | </channel> |
377 | 24 | 24 | ||
378 | === modified file 'loco_directory/templates/meetings/agenda_item_delete_confirm.html' | |||
379 | --- loco_directory/templates/meetings/agenda_item_delete_confirm.html 2011-01-23 15:20:31 +0000 | |||
380 | +++ loco_directory/templates/meetings/agenda_item_delete_confirm.html 2011-03-18 13:41:34 +0000 | |||
381 | @@ -5,7 +5,7 @@ | |||
382 | 5 | {% block title %}{% trans "Delete Agenda Item" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} | 5 | {% block title %}{% trans "Delete Agenda Item" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} |
383 | 6 | 6 | ||
384 | 7 | {% block sub_nav_links %} | 7 | {% block sub_nav_links %} |
386 | 8 | <a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a> | 8 | <a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a> |
387 | 9 | {% endblock %} | 9 | {% endblock %} |
388 | 10 | 10 | ||
389 | 11 | {% block extrahead %}{{ block.super }} | 11 | {% block extrahead %}{{ block.super }} |
390 | 12 | 12 | ||
391 | === modified file 'loco_directory/templates/meetings/agenda_item_new.html' | |||
392 | --- loco_directory/templates/meetings/agenda_item_new.html 2011-01-22 16:05:24 +0000 | |||
393 | +++ loco_directory/templates/meetings/agenda_item_new.html 2011-03-18 13:41:34 +0000 | |||
394 | @@ -4,7 +4,7 @@ | |||
395 | 4 | {% block title %}{% trans "New Agenda Item" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} | 4 | {% block title %}{% trans "New Agenda Item" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} |
396 | 5 | 5 | ||
397 | 6 | {% block sub_nav_links %} | 6 | {% block sub_nav_links %} |
399 | 7 | <a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a> | 7 | <a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a> |
400 | 8 | {% endblock %} | 8 | {% endblock %} |
401 | 9 | 9 | ||
402 | 10 | {% block extrahead %}{{ block.super }} | 10 | {% block extrahead %}{{ block.super }} |
403 | 11 | 11 | ||
404 | === modified file 'loco_directory/templates/meetings/agenda_item_update.html' | |||
405 | --- loco_directory/templates/meetings/agenda_item_update.html 2011-01-23 02:17:54 +0000 | |||
406 | +++ loco_directory/templates/meetings/agenda_item_update.html 2011-03-18 13:41:34 +0000 | |||
407 | @@ -4,7 +4,7 @@ | |||
408 | 4 | {% block title %}{% trans "Update Agenda Item" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} | 4 | {% block title %}{% trans "Update Agenda Item" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %} |
409 | 5 | 5 | ||
410 | 6 | {% block sub_nav_links %} | 6 | {% block sub_nav_links %} |
412 | 7 | <a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a> | 7 | <a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a> |
413 | 8 | <a class="sub-nav-item" href="{% url agenda-item-delete team_meeting_object.id agenda_item_object.id %}">{% trans "Delete Agenda Item" %}</a> | 8 | <a class="sub-nav-item" href="{% url agenda-item-delete team_meeting_object.id agenda_item_object.id %}">{% trans "Delete Agenda Item" %}</a> |
414 | 9 | {% endblock %} | 9 | {% endblock %} |
415 | 10 | 10 | ||
416 | 11 | 11 | ||
417 | === modified file 'loco_directory/templates/meetings/team_meeting_detail.html' | |||
418 | --- loco_directory/templates/meetings/team_meeting_detail.html 2010-12-24 14:18:40 +0000 | |||
419 | +++ loco_directory/templates/meetings/team_meeting_detail.html 2011-03-18 13:41:34 +0000 | |||
420 | @@ -7,12 +7,12 @@ | |||
421 | 7 | <a class="sub-nav-item" href="{% url meeting-list %}">{% trans "Back to Meetings List" %}</a> | 7 | <a class="sub-nav-item" href="{% url meeting-list %}">{% trans "Back to Meetings List" %}</a> |
422 | 8 | {% if user.is_authenticated %} | 8 | {% if user.is_authenticated %} |
423 | 9 | {% if user_is_team_member %} | 9 | {% if user_is_team_member %} |
427 | 10 | <a class="sub-nav-item" href="{% url team-meeting-update team_meeting_object.id %}">{% trans "Edit Details" %}</a> | 10 | <a class="sub-nav-item" href="{% url team-meeting-update team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Edit Details" %}</a> |
428 | 11 | <a class="sub-nav-item" href="{% url team-meeting-delete team_meeting_object.id %}">{% trans "Delete Meeting" %}</a> | 11 | <a class="sub-nav-item" href="{% url team-meeting-delete team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Delete Meeting" %}</a> |
429 | 12 | <a class="sub-nav-item" href="{% url team-meeting-copy team_meeting_object.id %}">{% trans "Copy Meeting" %}</a> | 12 | <a class="sub-nav-item" href="{% url team-meeting-copy team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Copy Meeting" %}</a> |
430 | 13 | {% endif %} | 13 | {% endif %} |
431 | 14 | {% endif %} | 14 | {% endif %} |
433 | 15 | <a class="sub-nav-item" href="{% url meeting-ical team_meeting_object.id %}">{% trans "iCal Feed" %}</a> | 15 | <a class="sub-nav-item" href="{% url meeting-ical team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "iCal Feed" %}</a> |
434 | 16 | {% endblock %} | 16 | {% endblock %} |
435 | 17 | 17 | ||
436 | 18 | {% block content %} | 18 | {% block content %} |
437 | 19 | 19 | ||
438 | === modified file 'loco_directory/templates/meetings/team_meeting_li.inc.html' | |||
439 | --- loco_directory/templates/meetings/team_meeting_li.inc.html 2011-01-24 02:40:53 +0000 | |||
440 | +++ loco_directory/templates/meetings/team_meeting_li.inc.html 2011-03-18 13:41:34 +0000 | |||
441 | @@ -1,5 +1,5 @@ | |||
442 | 1 | {% load i18n %} | 1 | {% load i18n %} |
443 | 2 | {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %} | 2 | {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %} |
444 | 3 | <li> | 3 | <li> |
446 | 4 | <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.date_begin|date:"H:i T" }} | 4 | <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.first_team.lp_name team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.date_begin|date:"H:i T" }} |
447 | 5 | </li> | 5 | </li> |
448 | 6 | 6 | ||
449 | === modified file 'loco_directory/templates/meetings/team_meetings_rss.xml' | |||
450 | --- loco_directory/templates/meetings/team_meetings_rss.xml 2010-12-02 07:56:46 +0000 | |||
451 | +++ loco_directory/templates/meetings/team_meetings_rss.xml 2011-03-18 13:41:34 +0000 | |||
452 | @@ -8,7 +8,7 @@ | |||
453 | 8 | {% for e in meetings %} | 8 | {% for e in meetings %} |
454 | 9 | <item> | 9 | <item> |
455 | 10 | <title> {{ e.name }}</title> | 10 | <title> {{ e.name }}</title> |
457 | 11 | <link>{{base}}{% url team-meeting-detail e.id %}</link> | 11 | <link>{{base}}{% url team-meeting-detail e.first_team.lp_name e.id %}</link> |
458 | 12 | <description>{% trans "When:" %} {% spaceless %} | 12 | <description>{% trans "When:" %} {% spaceless %} |
459 | 13 | {% ifequal e.date_begin|date e.date_end|date %} | 13 | {% ifequal e.date_begin|date e.date_end|date %} |
460 | 14 | {{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"H:i O" }} | 14 | {{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"H:i O" }} |
461 | @@ -16,7 +16,7 @@ | |||
462 | 16 | {{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"D, d N Y H:i O" }} | 16 | {{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"D, d N Y H:i O" }} |
463 | 17 | {% endifequal %} | 17 | {% endifequal %} |
464 | 18 | {% endspaceless %}</description> | 18 | {% endspaceless %}</description> |
466 | 19 | <guid>{{base}}{% url team-meeting-detail e.id %}</guid> | 19 | <guid>{{base}}{% url team-meeting-detail e.first_team.lp_name e.id %}</guid> |
467 | 20 | </item> | 20 | </item> |
468 | 21 | {% endfor %} | 21 | {% endfor %} |
469 | 22 | </channel> | 22 | </channel> |
470 | 23 | 23 | ||
471 | === modified file 'loco_directory/templates/venues/venue_detail.html' | |||
472 | --- loco_directory/templates/venues/venue_detail.html 2011-02-17 17:54:09 +0000 | |||
473 | +++ loco_directory/templates/venues/venue_detail.html 2011-03-18 13:41:34 +0000 | |||
474 | @@ -11,7 +11,7 @@ | |||
475 | 11 | 11 | ||
476 | 12 | {% block sub_nav_links %} | 12 | {% block sub_nav_links %} |
477 | 13 | <a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a> | 13 | <a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a> |
479 | 14 | <a class="sub-nav-item" href="{% url venue-update venue_object.id %}">{% trans "Edit Venue Details" %}</a> | 14 | <a class="sub-nav-item" href="{% url venue-update venue_object.country venue_object.id %}">{% trans "Edit Venue Details" %}</a> |
480 | 15 | {% endblock %} | 15 | {% endblock %} |
481 | 16 | 16 | ||
482 | 17 | {% block content %} | 17 | {% block content %} |
483 | 18 | 18 | ||
484 | === modified file 'loco_directory/venues/models.py' | |||
485 | --- loco_directory/venues/models.py 2010-12-20 23:54:15 +0000 | |||
486 | +++ loco_directory/venues/models.py 2011-03-18 13:41:34 +0000 | |||
487 | @@ -44,7 +44,7 @@ | |||
488 | 44 | @models.permalink | 44 | @models.permalink |
489 | 45 | def get_absolute_url(self): | 45 | def get_absolute_url(self): |
490 | 46 | """ get the absolute url for the venue """ | 46 | """ get the absolute url for the venue """ |
492 | 47 | return ('venue-detail', [self.id]) | 47 | return ('venue-detail', [self.country or 'no-country', self.id]) |
493 | 48 | 48 | ||
494 | 49 | def get_timezone(self): | 49 | def get_timezone(self): |
495 | 50 | try: | 50 | try: |
496 | 51 | 51 | ||
497 | === modified file 'loco_directory/venues/urls.py' | |||
498 | --- loco_directory/venues/urls.py 2009-12-21 20:45:43 +0000 | |||
499 | +++ loco_directory/venues/urls.py 2011-03-18 13:41:34 +0000 | |||
500 | @@ -3,8 +3,12 @@ | |||
501 | 3 | urlpatterns = patterns('', | 3 | urlpatterns = patterns('', |
502 | 4 | #venues | 4 | #venues |
503 | 5 | url(r'^$', 'venues.views.venue_list', name='venue-list'), | 5 | url(r'^$', 'venues.views.venue_list', name='venue-list'), |
506 | 6 | url(r'^(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', name='venue-detail'), | 6 | url(r'^(?P<country>[\w\s]+)/(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', name='venue-detail'), |
507 | 7 | url(r'^(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', name='venue-update'), | 7 | url(r'^(?P<country>[\w\s]+)/(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', name='venue-update'), |
508 | 8 | url(r'add/$', 'venues.views.venue_new', name='venue-new'), | 8 | url(r'add/$', 'venues.views.venue_new', name='venue-new'), |
510 | 9 | ) | 9 | |
511 | 10 | # Old urls for compatibility | ||
512 | 11 | url(r'^(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', kwargs={'country':''}), | ||
513 | 12 | url(r'^(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', kwargs={'country':''}), | ||
514 | 13 | ) | ||
515 | 10 | 14 | ||
516 | 11 | 15 | ||
517 | === modified file 'loco_directory/venues/views.py' | |||
518 | --- loco_directory/venues/views.py 2011-01-03 23:11:35 +0000 | |||
519 | +++ loco_directory/venues/views.py 2011-03-18 13:41:34 +0000 | |||
520 | @@ -32,7 +32,7 @@ | |||
521 | 32 | return render_to_response('venues/venue_list.html', context, | 32 | return render_to_response('venues/venue_list.html', context, |
522 | 33 | RequestContext(request)) | 33 | RequestContext(request)) |
523 | 34 | 34 | ||
525 | 35 | def venue_detail(request, venue_id): | 35 | def venue_detail(request, country, venue_id): |
526 | 36 | """ | 36 | """ |
527 | 37 | detailed view for a venue | 37 | detailed view for a venue |
528 | 38 | """ | 38 | """ |
529 | @@ -59,7 +59,7 @@ | |||
530 | 59 | # escape() calls force_unicode. | 59 | # escape() calls force_unicode. |
531 | 60 | (escape(venue_object.pk), escape(venue_object))) | 60 | (escape(venue_object.pk), escape(venue_object))) |
532 | 61 | else: | 61 | else: |
534 | 62 | return HttpResponseRedirect(reverse('venue-detail', kwargs={'venue_id': new_venue_id})) | 62 | return HttpResponseRedirect(venue_object.get_absolute_url()) |
535 | 63 | else: | 63 | else: |
536 | 64 | form = VenueForm() | 64 | form = VenueForm() |
537 | 65 | 65 | ||
538 | @@ -70,7 +70,7 @@ | |||
539 | 70 | context, RequestContext(request)) | 70 | context, RequestContext(request)) |
540 | 71 | 71 | ||
541 | 72 | @login_required | 72 | @login_required |
543 | 73 | def venue_update(request, venue_id): | 73 | def venue_update(request, country, venue_id): |
544 | 74 | """ | 74 | """ |
545 | 75 | update venue | 75 | update venue |
546 | 76 | """ | 76 | """ |
547 | @@ -81,7 +81,7 @@ | |||
548 | 81 | if form.is_valid(): | 81 | if form.is_valid(): |
549 | 82 | form.save() | 82 | form.save() |
550 | 83 | request.user.message_set.create(message=_('Venue updated')) | 83 | request.user.message_set.create(message=_('Venue updated')) |
552 | 84 | return HttpResponseRedirect( reverse( 'venue-detail', args=[venue_object.id] ) ) | 84 | return HttpResponseRedirect(venue_object.get_absolute_url()) |
553 | 85 | else: | 85 | else: |
554 | 86 | form = VenueForm(instance=venue_object) | 86 | form = VenueForm(instance=venue_object) |
555 | 87 | 87 |
When adding a team event, click submit and I get:
Exception Type: NoReverseMatch at /events/ ubuntu- us-florida/ add/
Exception Value: Reverse for 'team-event-detail' with arguments '()' and keyword arguments '{'team_event_id': 818}' not found.
Unable to click on links that are to global events.