diff options
| author | Christian Pointner <equinox@helsinki.at> | 2016-05-27 20:03:04 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2016-05-27 20:03:04 (GMT) |
| commit | 4a66728a9bbe88704c6e01ec8dd683cdb0a4c0c6 (patch) | |
| tree | 9c62c09230aec03187cc13d2ac78d299bd96096b /program/admin.py | |
| parent | a1487772e667436e2274dece86cb40d2e58632a7 (diff) | |
| parent | c27b374386463c56f41815869d6209f9a422b858 (diff) | |
Merge branch 'master' into stable
Diffstat (limited to 'program/admin.py')
| -rw-r--r-- | program/admin.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/program/admin.py b/program/admin.py index e6c331a..1323697 100644 --- a/program/admin.py +++ b/program/admin.py @@ -58,11 +58,13 @@ class NoteAdmin(admin.ModelAdmin): class TimeSlotInline(admin.TabularInline): model = TimeSlot + ordering = ('-end',) class ProgramSlotAdmin(admin.ModelAdmin): actions = ('renew',) inlines = (TimeSlotInline,) + fields = (('rrule', 'byweekday'), ('dstart', 'tstart', 'tend'), 'until', 'is_repetition', 'automation_id') list_display = ('show', 'byweekday', 'rrule', 'tstart', 'tend', 'until') list_filter = ('byweekday', 'rrule', 'is_repetition', 'is_active') ordering = ('byweekday', 'dstart') @@ -83,6 +85,7 @@ class ProgramSlotAdmin(admin.ModelAdmin): class ProgramSlotInline(admin.TabularInline): model = ProgramSlot + ordering = ('-until',) class ShowAdmin(admin.ModelAdmin): |