Merge pull request #26 from ambitioninc/develop

Django Admin for Localized Recurrence

localized_recurrence/admin.py

@@ -0,0 +1,16 @@
+from django.contrib.admin import ModelAdmin, site
+
+from localized_recurrence.models import LocalizedRecurrence
+
+
+class LocalizedRecurrenceAdmin(ModelAdmin):
+    list_display = [
+        'id',
+        'interval',
+        'timezone',
+        'previous_scheduled',
+        'next_scheduled',
+    ]
+
+
+site.register(LocalizedRecurrence, LocalizedRecurrenceAdmin)

localized_recurrence/models.py

@@ -3,6 +3,7 @@
 
 from dateutil.relativedelta import relativedelta
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from timezone_field import TimeZoneField
 import fleming
 import pytz
@@ -69,6 +70,7 @@ def update_schedule(self, time=None):
         self.get_queryset().update_schedule(time=time)
 
 
+@python_2_unicode_compatible
 class LocalizedRecurrence(models.Model):
     """The information necessary to act on events in users local
     times. Can be instantiated with ``LocalizedRecurrence.objects.create``
@@ -128,6 +130,9 @@ class LocalizedRecurrence(models.Model):
 
     objects = LocalizedRecurrenceManager()
 
+    def __str__(self):
+        return 'ID: {0}, Interval: {1}, Next Scheduled: {2}'.format(self.id, self.interval, self.next_scheduled)
+
     def update_schedule(self, time=None):
         """Update the schedule for this recurrence or an object it tracks.
 

localized_recurrence/tests/admin_tests.py

@@ -0,0 +1,26 @@
+from django.contrib.admin.sites import AdminSite
+from django.test import TestCase
+
+from localized_recurrence.admin import LocalizedRecurrenceAdmin
+from localized_recurrence.models import LocalizedRecurrence
+
+
+class LocalizedRecurrenceAdminTest(TestCase):
+    """Verify that the admin can load.
+    """
+    def setUp(self):
+        super(LocalizedRecurrenceAdminTest, self).setUp()
+        self.site = AdminSite()
+
+    def test_model_admin_load(self):
+        lr_admin = LocalizedRecurrenceAdmin(LocalizedRecurrence, self.site)
+        self.assertEqual(
+            lr_admin.list_display,
+            [
+                'id',
+                'interval',
+                'timezone',
+                'previous_scheduled',
+                'next_scheduled'
+            ]
+        )

localized_recurrence/tests/models_tests.py

@@ -58,6 +58,13 @@ def test_timedelta_returned(self):
         lr = LocalizedRecurrence.objects.first()
         self.assertTrue(isinstance(lr.offset, timedelta))
 
+    def test_string_representation(self):
+        lr = LocalizedRecurrence.objects.first()
+        self.assertEqual(
+            str(lr),
+            'ID: {0}, Interval: {1}, Next Scheduled: {2}'.format(lr.id, lr.interval, lr.next_scheduled),
+        )
+
 
 class LocalizedRecurrenceUpdateScheduleTest(TestCase):
     def setUp(self):

localized_recurrence/version.py

@@ -1 +1 @@
-__version__ = '1.0.3'
+__version__ = '1.0.4'