Merge pull request #6 from joshuajonah/master

Fixed some issue conditions in utils and template tags.

Author: philippeowagner

openinghours/migrations/0001_initial.py

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ClosingRules',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('start', models.DateTimeField()),
+                ('end', models.DateTimeField()),
+                ('reason', models.TextField(null=True, blank=True)),
+            ],
+            options={
+                'verbose_name': 'Closing Rule',
+                'verbose_name_plural': 'Closing Rules',
+            },
+        ),
+        migrations.CreateModel(
+            name='Company',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=100)),
+                ('slug', models.SlugField(unique=True)),
+                ('logo', models.FileField(null=True, upload_to=b'logo', blank=True)),
+            ],
+            options={
+                'verbose_name': 'Company',
+                'verbose_name_plural': 'Companies',
+            },
+        ),
+        migrations.CreateModel(
+            name='OpeningHours',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('weekday', models.IntegerField(choices=[(1, 'Monday'), (2, 'Tuesday'), (3, 'Wednesday'), (4, 'Thursday'), (5, 'Friday'), (6, 'Saturday'), (7, 'Sunday')])),
+                ('from_hour', models.TimeField()),
+                ('to_hour', models.TimeField()),
+                ('company', models.ForeignKey(to='openinghours.Company')),
+            ],
+            options={
+                'verbose_name': 'Opening Hour',
+                'verbose_name_plural': 'Opening Hours',
+            },
+        ),
+        migrations.AddField(
+            model_name='closingrules',
+            name='company',
+            field=models.ForeignKey(to='openinghours.Company'),
+        ),
+    ]

openinghours/migrations/__init__.py

@@ -88,7 +88,10 @@ def companyOpeningHoursList(company_slug=None, concise=False):
     if company_slug: 
         ohrs = OpeningHours.objects.filter(company__slug=company_slug)
     else:
-        ohrs = Company.objects.first().openinghours_set.all()
+        try:
+            ohrs = Company.objects.first().openinghours_set.all()
+        except AttributeError:
+            raise Exception("You must define some opening hours to use the opening hours tags.")
 
     ohrs.order_by('weekday', 'from_hour')
 

openinghours/templatetags/openinghours_tags.py

@@ -15,9 +15,8 @@
 def get_now():
     ''' '''
     # Allow access global request and read a timestamp from query...
-    # I'm not exactly sure what you were trying to do here so I left it. - JJ
-    if 'get_current_request' is not None:
-        request = get_current_request()
+    request = get_current_request()
+    if request:
         openinghours_now = request.GET.get('openinghours-now')
         if openinghours_now:
             return datetime.datetime.strptime(openinghours_now, '%Y%m%d%H%M%S')