From 6287dc430cb47c58cea6f7c66bb6066796aef048 Mon Sep 17 00:00:00 2001 From: Johnson Chetty Date: Fri, 5 Oct 2012 12:43:52 +0200 Subject: [PATCH] holiday tweaks 2 --- chaloBEST/mumbai/admin.py | 4 ++-- chaloBEST/mumbai/models.py | 1 - sqldiff/sqldiff05102012.sql | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/chaloBEST/mumbai/admin.py b/chaloBEST/mumbai/admin.py index 5a74a7d..a604e9b 100644 --- a/chaloBEST/mumbai/admin.py +++ b/chaloBEST/mumbai/admin.py @@ -194,8 +194,8 @@ class DepotAdmin(admin.ModelAdmin): class HolidayAdmin(admin.ModelAdmin): - list_display = ("date", "name","day","operating_schedule") - list_editable = ("day","operating_schedule") + list_display = ("date", "name","operating_schedule") + list_editable = ("operating_schedule") readonly_fields = ("date", "name") search_fields = ("name", "date") formfield_overrides = { diff --git a/chaloBEST/mumbai/models.py b/chaloBEST/mumbai/models.py index 948e457..8373e9d 100644 --- a/chaloBEST/mumbai/models.py +++ b/chaloBEST/mumbai/models.py @@ -414,7 +414,6 @@ class Depot(models.Model): class Holiday(models.Model): date = models.DateField() name = models.TextField(max_length=100) - day = models.TextField(max_length=20) operating_schedule=models.TextField(max_length=20) def __unicode__(self): diff --git a/sqldiff/sqldiff05102012.sql b/sqldiff/sqldiff05102012.sql index f111a77..9b9e19e 100644 --- a/sqldiff/sqldiff05102012.sql +++ b/sqldiff/sqldiff05102012.sql @@ -1,5 +1,3 @@ ALTER TABLE "mumbai_holiday" ADD "operating_schedule" text; -ALTER TABLE "mumbai_holiday" - ADD "day" text; COMMIT; \ No newline at end of file