Summit

Merge lp:~cjohnston/summit/989933 into lp:summit

  1. 989933
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 369
Merged at revision: 371
Proposed branch: lp:~cjohnston/summit/989933
Merge into: lp:summit
Diff against target: 51 lines (+4/-4)
4 files modified
summit/schedule/admin/attendeeadmin.py (+1/-1)
summit/schedule/admin/crewadmin.py (+1/-1)
summit/schedule/admin/meetingadmin.py (+1/-1)
summit/schedule/admin/roomadmin.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/989933
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+103934@code.launchpad.net

Commit message

Makes some minor changes to the admin area stuff.

To post a comment you must log in.
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 'summit/schedule/admin/attendeeadmin.py'
2--- summit/schedule/admin/attendeeadmin.py 2012-04-17 21:44:22 +0000
3+++ summit/schedule/admin/attendeeadmin.py 2012-04-27 19:44:18 +0000
4@@ -30,7 +30,7 @@
5 class AttendeeAdmin(admin.ModelAdmin):
6 list_display = ('summit', 'user')
7 list_display_links = ('user', )
8- list_filter = ('summit', 'tracks')
9+ list_filter = ('summit', )
10 search_fields = ('user__username', 'user__first_name', 'user__last_name',
11 'user__email')
12 inlines = (AttendeeBusyInline, )
13
14=== modified file 'summit/schedule/admin/crewadmin.py'
15--- summit/schedule/admin/crewadmin.py 2012-01-23 01:18:55 +0000
16+++ summit/schedule/admin/crewadmin.py 2012-04-27 19:44:18 +0000
17@@ -24,7 +24,7 @@
18
19 class CrewAdmin(admin.ModelAdmin):
20 list_display = ('attendee', 'date_utc')
21- list_display_links = ('date_utc', )
22+ list_display_links = ('attendee', 'date_utc')
23 list_filter = ('date_utc',)
24 search_fields = ('attendee__user__username', 'attendee__user__first_name',
25 'attendee__user__last_name', 'attendee__user__email')
26
27=== modified file 'summit/schedule/admin/meetingadmin.py'
28--- summit/schedule/admin/meetingadmin.py 2012-04-17 21:44:22 +0000
29+++ summit/schedule/admin/meetingadmin.py 2012-04-27 19:44:18 +0000
30@@ -132,7 +132,7 @@
31 share.short_description = "Share Meetings (Private only)"
32
33 class MeetingAdmin(admin.ModelAdmin):
34- list_display = ('summit', 'slots', 'name', 'title', 'type', 'approved')
35+ list_display = ('summit', 'name', 'title', 'slots', 'override_break', 'private', 'type', 'approved')
36 list_display_links = ('name', 'title')
37 list_filter = ('summit', 'type', 'tracks', 'slots', 'private',
38 'status', 'priority')
39
40=== modified file 'summit/schedule/admin/roomadmin.py'
41--- summit/schedule/admin/roomadmin.py 2012-02-06 18:25:01 +0000
42+++ summit/schedule/admin/roomadmin.py 2012-04-27 19:44:18 +0000
43@@ -28,7 +28,7 @@
44
45
46 class RoomAdmin(admin.ModelAdmin):
47- list_display = ('summit', 'name', 'title', 'type', 'size')
48+ list_display = ('summit', 'name', 'title', 'type', 'size', 'has_dial_in')
49 list_display_links = ('name', 'title')
50 list_filter = ('summit', 'type', 'tracks', 'size')
51 search_fields = ('name', 'title')

Subscribers

People subscribed via source and target branches