Update login_embed.html

Scrolling is not allowed in Discourse oneboxes, so make sure all the content will fit

PyRIGS/settings.py

@@ -35,6 +35,7 @@ if STAGING:
 if DEBUG:
     ALLOWED_HOSTS.append('localhost')
     ALLOWED_HOSTS.append('example.com')
+    ALLOWED_HOSTS.append('127.0.0.1')
 
 SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 if not DEBUG:

RIGS/rigboard.py

@@ -66,10 +66,10 @@ class EventOembed(generic.View):
         full_url = "{0}://{1}{2}".format(request.scheme, request.META['HTTP_HOST'], embed_url)
 
         data = {
-            'html': '<iframe src="{0}" frameborder="0" width="100%" height="250"></iframe>'.format(full_url),
+            'html': '<iframe src="{0}" frameborder="0" width="100%" height="350"></iframe>'.format(full_url),
             'version': '1.0',
             'type': 'rich',
-            'height': '250'
+            'height': '350'
         }
 
         json = simplejson.JSONEncoderForHTML().encode(data)
@@ -138,7 +138,11 @@ class EventDuplicate(EventUpdate):
         old = super(EventDuplicate, self).get_object(queryset)  # Get the object (the event you're duplicating)
         new = copy.copy(old)  # Make a copy of the object in memory
         new.based_on = old  # Make the new event based on the old event
-        new.purchase_order = None
+        new.purchase_order = None  # Remove old PO
+
+        # Clear checked in by if it's a dry hire
+        if new.dry_hire is True:
+            new.checked_in_by = None
 
         # Remove all the authorisation information from the new event
         new.auth_request_to = None
@@ -340,8 +344,10 @@ class EventAuthorisationRequest(generic.FormView, generic.detail.SingleObjectMix
                 'sent_by': self.request.user.pk,
             }),
         }
-        if email == event.person.email:
+        if event.person is not None and email == event.person.email:
             context['to_name'] = event.person.name
+        elif event.organisation is not None and email == event.organisation.email:
+            context['to_name'] = event.organisation.name
 
         msg = EmailMultiAlternatives(
             "N%05d | %s - Event Authorisation Request" % (self.object.pk, self.object.name),

RIGS/signals.py

@@ -50,8 +50,10 @@ def send_eventauthorisation_success_email(instance):
         'object': instance,
     }
 
-    if instance.email == instance.event.person.email:
+    if instance.event.person is not None and instance.email == instance.event.person.email:
         context['to_name'] = instance.event.person.name
+    elif instance.event.organisation is not None and instance.email == instance.event.organisation.email:
+        context['to_name'] = instance.event.organisation.name
 
     subject = "N%05d | %s - Event Authorised" % (instance.event.pk, instance.event.name)
 
@@ -89,6 +91,10 @@ def send_eventauthorisation_success_email(instance):
     client_email.send(fail_silently=True)
     mic_email.send(fail_silently=True)
 
+    # Set event to booked now that it's authorised
+    instance.event.status = models.Event.BOOKED
+    instance.event.save()
+
 
 def on_revision_commit(sender, instance, created, **kwargs):
     if created:

RIGS/templates/RIGS/index.html

@@ -27,7 +27,7 @@
                     <a class="list-group-item" href="//members.nottinghamtec.co.uk/wiki" target="_blank"><span class="glyphicon glyphicon-link"></span> TEC Wiki</a>
                     <a class="list-group-item" href="http://members.nottinghamtec.co.uk/wiki/images/2/22/Event_Risk_Assesment.pdf" target="_blank"><span class="glyphicon glyphicon-link"></span> Pre-Event Risk Assessment</a>
                     <a class="list-group-item" href="//members.nottinghamtec.co.uk/price" target="_blank"><span class="glyphicon glyphicon-link"></span> Price List</a>
-                    <a class="list-group-item" href="https://form.jotformeu.com/62203600438344" target="_blank"><span class="glyphicon glyphicon-link"></span> Subhire Insurance Form</a>
+                    <a class="list-group-item" href="https://goo.gl/forms/jdPWov8PCNPoXtbn2" target="_blank"><span class="glyphicon glyphicon-link"></span> Subhire Insurance Form</a>
                 
             </div>
         </div>

requirements.txt

@@ -3,36 +3,36 @@ contextlib2==0.5.5
 diff-match-patch==20121119
 dj-database-url==0.5.0
 dj-static==0.0.6
-Django==2.0.3
+Django==2.0.5
 django-debug-toolbar==1.9.1
 django-ical==1.4
 django-recaptcha==1.4.0
-django-registration-redux==2.2
+django-registration-redux==2.4
 django-reversion==2.0.13
 django-toolbelt==0.0.1
-premailer==3.1.1
+premailer==3.2.0
 #django-widget-tweaks==1.4.1
 git+git://github.com/jazzband/django-widget-tweaks.git@1.4.2
-gunicorn==19.7.1
+gunicorn==19.8.1
 icalendar==4.0.1
 lxml==4.2.1
 Markdown==2.6.11
-Pillow==5.0.0
+Pillow==5.1.0
 psycopg2==2.7.4
 Pygments==2.2.0
 PyPDF2==1.26.0
-python-dateutil==2.7.1
-pytz==2018.3
-raven==6.6.0
+python-dateutil==2.7.3
+pytz==2018.4
+raven==6.8.0
 reportlab==3.4.0
-selenium==3.11.0
-simplejson==3.13.2
+selenium==3.12.0
+simplejson==3.15.0
 six==1.11.0
 sqlparse==0.2.4
 static3==0.7.0
 svg2rlg==0.3
 yolk==0.4.3
-z3c.rml==3.3.0
+z3c.rml==3.5.0
 zope.event==4.3.0
-zope.interface==4.4.3
+zope.interface==4.5.0
 zope.schema==4.5.0

templates/registration/login_embed.html

@@ -17,11 +17,11 @@
     <form id="loginForm" action="" method="post" role="form" target="_self">{% csrf_token %}
         <div class="form-group">
             <label for="id_username">{{ form.username.label }}</label>
-            {% render_field form.username class+="form-control" placeholder=form.username.label %}
+            {{ form.username }}
         </div>
         <div class="form-group">
             <label for="{{ form.password.id_for_label }}">{{ form.password.label }}</label>
-            {% render_field form.password class+="form-control" placeholder=form.password.label %}
+            {{ form.password }}
         </div>
         <div class="text-right">
             <input type="submit" value="Login" class="btn btn-primary"/>