@@ -442,4 +445,4 @@
{% include 'RIGS/item_modal.html' %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/RIGS/templates/RIGS/event_invoice.html b/RIGS/templates/RIGS/event_invoice.html
index c16c501b..fcbe5e87 100644
--- a/RIGS/templates/RIGS/event_invoice.html
+++ b/RIGS/templates/RIGS/event_invoice.html
@@ -1,66 +1,91 @@
{% extends 'base.html' %}
{% load paginator from filters %}
+{% load static %}
{% block title %}Events for Invoice{% endblock %}
+{% block js %}
+
+
+{% endblock %}
+
{% block content %}
{% paginator %}
diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/RIGS/event_table.html
index 1868f2dd..949c710a 100644
--- a/RIGS/templates/RIGS/event_table.html
+++ b/RIGS/templates/RIGS/event_table.html
@@ -1,7 +1,7 @@
- #
+ #
Event Date
Event Details
Event Timings
@@ -23,7 +23,7 @@
danger
{% endif %}
">
- {{ event.pk }}
+ {{ event.pk }}
{{ event.start_date|date:"D d/m/Y" }}
{% if event.end_date and event.end_date != event.start_date %}
diff --git a/RIGS/templates/RIGS/index.html b/RIGS/templates/RIGS/index.html
index a99dfa18..99355dc5 100644
--- a/RIGS/templates/RIGS/index.html
+++ b/RIGS/templates/RIGS/index.html
@@ -23,9 +23,11 @@
-
+
+
Delete invoice {{ object.pk }}
+
+
Are you sure you wish to delete invoice {{ object.pk }}?
+
+
This action cannot be undone!
+
+
+
+
-
-
Event Details
+
+
Event Details
+ {% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(OUTSTANDING){% endif %}
+
+
Event Number
@@ -109,6 +116,11 @@
{% endfor %}
+
+ Balance: {{ object.balance|floatformat:2 }}
+
diff --git a/RIGS/templates/RIGS/invoice_list.html b/RIGS/templates/RIGS/invoice_list.html
index bf9fe31f..2f34b6c9 100644
--- a/RIGS/templates/RIGS/invoice_list.html
+++ b/RIGS/templates/RIGS/invoice_list.html
@@ -5,38 +5,71 @@
{% block content %}
-
Invoices
+
{% block heading %}Invoices{% endblock %}
+ {% block description %}{% endblock %}
{% if is_paginated %}
{% paginator %}
{% endif %}
-
-
-
- #
- Event
- Invoice Date
- Balance
-
-
-
- {% for object in object_list %}
-
- {{ object.pk }}
- N{{ object.event.pk|stringformat:"05d" }} : {{ object.event.name }}{{ object.invoice_date }}
- {{ object.balance|floatformat:2 }}
-
-
-
-
+
+
+
+
+ Invoice #
+ Event
+ Client
+ Event Date
+ Invoice Date
+ Balance
+
- {% endfor %}
-
-
+
+
+ {% for object in object_list %}
+
+ {{ object.pk }}{% if object.void %}(VOID){% elif object.is_closed %}(PAID){% else %}(O/S){% endif %}
+ N{{ object.event.pk|stringformat:"05d" }} : {{ object.event.name }} {{ object.event.get_status_display }}{% if not object.event.mic %}, No MIC{% endif %}
+ {% if object.event.organisation %}
+ {{ object.event.organisation.name }}
+ {{ object.event.organisation.union_account|yesno:'Internal,External' }}
+ {% else %}
+ {{ object.event.person.name }}
+ External
+ {% endif %}
+
+ {{ object.event.start_date }}
+ {{ object.invoice_date }}
+ {{ object.balance|floatformat:2 }}
+
+
+
+
+
+ {% endfor %}
+
+
+
{% if is_paginated %}
{% paginator %}
diff --git a/RIGS/templates/RIGS/invoice_list_active.html b/RIGS/templates/RIGS/invoice_list_active.html
new file mode 100644
index 00000000..23bfc768
--- /dev/null
+++ b/RIGS/templates/RIGS/invoice_list_active.html
@@ -0,0 +1,13 @@
+{% extends 'RIGS/invoice_list.html' %}
+
+{% block title %}
+Outstanding Invoices
+{% endblock %}
+
+{% block heading %}
+Outstanding Invoices ({{ count }} Events, £ {{ total|floatformat:2 }})
+{% endblock %}
+
+{% block description %}
+
Paperwork for these events has been sent to treasury, but the full balance has not yet appeared on a ledger
+{% endblock %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/invoice_list_archive.html b/RIGS/templates/RIGS/invoice_list_archive.html
new file mode 100644
index 00000000..77bab204
--- /dev/null
+++ b/RIGS/templates/RIGS/invoice_list_archive.html
@@ -0,0 +1,13 @@
+{% extends 'RIGS/invoice_list.html' %}
+
+{% block title %}
+Invoice Archive
+{% endblock %}
+
+{% block heading %}
+All Invoices
+{% endblock %}
+
+{% block description %}
+
This page displays all invoices: outstanding, paid, and void
+{% endblock %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/organisation_list.html b/RIGS/templates/RIGS/organisation_list.html
index 2c88408a..c8856886 100644
--- a/RIGS/templates/RIGS/organisation_list.html
+++ b/RIGS/templates/RIGS/organisation_list.html
@@ -45,7 +45,7 @@
{{ object.pk }}
{{ object.name }}
{{ object.email }}
-
{{ object.phone }}
+
{{ object.phone }} {{ object.notes|yesno|capfirst }}
{{ object.union_account|yesno|capfirst }}
diff --git a/RIGS/templates/RIGS/person_list.html b/RIGS/templates/RIGS/person_list.html
index a7c1c08d..2cbdff8e 100644
--- a/RIGS/templates/RIGS/person_list.html
+++ b/RIGS/templates/RIGS/person_list.html
@@ -44,7 +44,7 @@
{{ person.pk }}
{{ person.name }}
{{ person.email }}
-
{{ person.phone }}
+
{{ person.phone }} {{ person.notes|yesno|capfirst }}
diff --git a/RIGS/templates/RIGS/profile_detail.html b/RIGS/templates/RIGS/profile_detail.html
index 8fce1e60..11904b18 100644
--- a/RIGS/templates/RIGS/profile_detail.html
+++ b/RIGS/templates/RIGS/profile_detail.html
@@ -71,7 +71,7 @@
{{object.initials}}
Phone
- {{object.phone}}
+ {{object.phone}}
{% if user.api_key %}
Click here to add to google calendar.Click here for instructions on adding to google calendar.this page on your device and tick "RIGS Calendar".No API Key Generated
diff --git a/RIGS/templates/RIGS/venue_list.html b/RIGS/templates/RIGS/venue_list.html
index cf89686c..88ae61ac 100644
--- a/RIGS/templates/RIGS/venue_list.html
+++ b/RIGS/templates/RIGS/venue_list.html
@@ -45,7 +45,7 @@
{{ object.pk }}
{{ object.name }}
{{ object.email }}
- {{ object.phone }}
+ {{ object.phone }} {{ object.notes|yesno|capfirst }}
diff --git a/RIGS/templates/RIGS/version_history.html b/RIGS/templates/RIGS/version_history.html
index 163a1ac5..3261c5df 100644
--- a/RIGS/templates/RIGS/version_history.html
+++ b/RIGS/templates/RIGS/version_history.html
@@ -35,6 +35,7 @@
Version ID
User
Changes
+ Comment
@@ -46,11 +47,14 @@
{{ version.revision.user.name }}
{% if version.old == None %}
- Object Created
+ {{object|to_class_name}} Created
{% else %}
{% include 'RIGS/version_changes.html' %}
{% endif %}
+
+ {{ version.revision.comment }}
+
{% endif %}
{% endfor %}
diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py
index 1b87cd08..2cd3af8d 100644
--- a/RIGS/test_functional.py
+++ b/RIGS/test_functional.py
@@ -1,12 +1,20 @@
# -*- coding: utf-8 -*-
+import os
+import re
+from datetime import date, timedelta
+
+import reversion
+from django.core import mail
+from django.db import transaction
from django.test import LiveServerTestCase
from django.test.client import Client
-from django.core import mail
from selenium import webdriver
-from selenium.webdriver.common.keys import Keys
from selenium.common.exceptions import StaleElementReferenceException, WebDriverException
+from selenium.webdriver.common.keys import Keys
from selenium.webdriver.support.ui import WebDriverWait
+
from RIGS import models
+
import re
import os
from datetime import date, timedelta
@@ -15,6 +23,7 @@ from reversion import revisions as reversion
import json
+
class UserRegistrationTest(LiveServerTestCase):
def setUp(self):
@@ -103,7 +112,7 @@ class UserRegistrationTest(LiveServerTestCase):
# Check Email
self.assertEqual(len(mail.outbox), 1)
email = mail.outbox[0]
- self.assertIn('activation required', email.subject)
+ self.assertIn('John Smith "JS" activation required', email.subject)
urls = re.findall(
'http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', email.body)
self.assertEqual(len(urls), 1)
@@ -437,7 +446,7 @@ class EventTest(LiveServerTestCase):
pass
def testEventDuplicate(self):
- testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, start_date=date.today() + timedelta(days=6), description="start future no end")
+ testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL, start_date=date.today() + timedelta(days=6), description="start future no end", purchase_order="TESTPO")
item1 = models.EventItem(
event=testEvent,
@@ -470,6 +479,9 @@ class EventTest(LiveServerTestCase):
self.assertIn("Test Item 1", table.text)
self.assertIn("Test Item 2", table.text)
+ # Check the info message is visible
+ self.assertIn("Event data duplicated but not yet saved",self.browser.find_element_by_id('content').text)
+
# Add item
form.find_element_by_xpath('//button[contains(@class, "item-add")]').click()
wait.until(animation_is_finished())
@@ -487,7 +499,12 @@ class EventTest(LiveServerTestCase):
# Attempt to save
save.click()
+<<<<<<< HEAD
self.assertNotIn("N%05d"%testEvent.pk, self.browser.find_element_by_xpath('//h1').text)
+=======
+ self.assertNotIn("N0000%d"%testEvent.pk, self.browser.find_element_by_xpath('//h1').text)
+ self.assertNotIn("Event data duplicated but not yet saved", self.browser.find_element_by_id('content').text) # Check info message not visible
+>>>>>>> 9b7c84cf0890788a08a3dec71e00cbe78748b1fb
# Check the new items are visible
table = self.browser.find_element_by_id('item-table') # ID number is known, see above
@@ -496,7 +513,13 @@ class EventTest(LiveServerTestCase):
self.assertIn("Test Item 3", table.text)
infoPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
+<<<<<<< HEAD
self.assertIn("N%05d"%testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
+=======
+ self.assertIn("N0000%d"%testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
+ # Check the PO hasn't carried through
+ self.assertNotIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
+>>>>>>> 9b7c84cf0890788a08a3dec71e00cbe78748b1fb
@@ -504,7 +527,13 @@ class EventTest(LiveServerTestCase):
#Check that based-on hasn't crept into the old event
infoPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
+<<<<<<< HEAD
self.assertNotIn("N%05d"%testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
+=======
+ self.assertNotIn("N0000%d"%testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
+ # Check the PO remains on the old event
+ self.assertIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
+>>>>>>> 9b7c84cf0890788a08a3dec71e00cbe78748b1fb
# Check the items are as they were
table = self.browser.find_element_by_id('item-table') # ID number is known, see above
diff --git a/RIGS/test_unit.py b/RIGS/test_unit.py
new file mode 100644
index 00000000..82a7acca
--- /dev/null
+++ b/RIGS/test_unit.py
@@ -0,0 +1,310 @@
+from datetime import date
+
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.management import call_command
+from django.core.urlresolvers import reverse
+from django.test import TestCase
+from django.test.utils import override_settings
+
+from RIGS import models
+
+
+class TestAdminMergeObjects(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True,
+ is_active=True, is_staff=True)
+
+ cls.persons = {
+ 1: models.Person.objects.create(name="Person 1"),
+ 2: models.Person.objects.create(name="Person 2"),
+ 3: models.Person.objects.create(name="Person 3"),
+ }
+
+ cls.organisations = {
+ 1: models.Organisation.objects.create(name="Organisation 1"),
+ 2: models.Organisation.objects.create(name="Organisation 2"),
+ 3: models.Organisation.objects.create(name="Organisation 3"),
+ }
+
+ cls.venues = {
+ 1: models.Venue.objects.create(name="Venue 1"),
+ 2: models.Venue.objects.create(name="Venue 2"),
+ 3: models.Venue.objects.create(name="Venue 3"),
+ }
+
+ cls.events = {
+ 1: models.Event.objects.create(name="TE E1", start_date=date.today(), person=cls.persons[1],
+ organisation=cls.organisations[3], venue=cls.venues[2]),
+ 2: models.Event.objects.create(name="TE E2", start_date=date.today(), person=cls.persons[2],
+ organisation=cls.organisations[2], venue=cls.venues[3]),
+ 3: models.Event.objects.create(name="TE E3", start_date=date.today(), person=cls.persons[3],
+ organisation=cls.organisations[1], venue=cls.venues[1]),
+ 4: models.Event.objects.create(name="TE E4", start_date=date.today(), person=cls.persons[3],
+ organisation=cls.organisations[3], venue=cls.venues[3]),
+ }
+
+ def setUp(self):
+ self.profile.set_password('testuser')
+ self.profile.save()
+ self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
+
+ def test_merge_confirmation(self):
+ change_url = reverse('admin:RIGS_venue_changelist')
+ data = {
+ 'action': 'merge',
+ '_selected_action': [unicode(val.pk) for key, val in self.venues.iteritems()]
+
+ }
+ response = self.client.post(change_url, data, follow=True)
+
+ self.assertContains(response, "The following objects will be merged")
+ for key, venue in self.venues.iteritems():
+ self.assertContains(response, venue.name)
+
+ def test_merge_no_master(self):
+ change_url = reverse('admin:RIGS_venue_changelist')
+ data = {'action': 'merge',
+ '_selected_action': [unicode(val.pk) for key, val in self.venues.iteritems()],
+ 'post': 'yes',
+ }
+ response = self.client.post(change_url, data, follow=True)
+
+ self.assertContains(response, "An error occured")
+
+ def test_venue_merge(self):
+ change_url = reverse('admin:RIGS_venue_changelist')
+
+ data = {'action': 'merge',
+ '_selected_action': [unicode(self.venues[1].pk), unicode(self.venues[2].pk)],
+ 'post': 'yes',
+ 'master': self.venues[1].pk
+ }
+
+ response = self.client.post(change_url, data, follow=True)
+ self.assertContains(response, "Objects successfully merged")
+ self.assertContains(response, self.venues[1].name)
+
+ # Check the master copy still exists
+ self.assertTrue(models.Venue.objects.get(pk=self.venues[1].pk))
+
+ # Check the un-needed venue has been disposed of
+ self.assertRaises(ObjectDoesNotExist, models.Venue.objects.get, pk=self.venues[2].pk)
+
+ # Check the one we didn't delete is still there
+ self.assertEqual(models.Venue.objects.get(pk=self.venues[3].pk), self.venues[3])
+
+ # Check the events have been moved to the master venue
+ for key, event in self.events.iteritems():
+ updatedEvent = models.Event.objects.get(pk=event.pk)
+ if event.venue == self.venues[3]: # The one we left in place
+ continue
+ self.assertEqual(updatedEvent.venue, self.venues[1])
+
+ def test_person_merge(self):
+ change_url = reverse('admin:RIGS_person_changelist')
+
+ data = {'action': 'merge',
+ '_selected_action': [unicode(self.persons[1].pk), unicode(self.persons[2].pk)],
+ 'post': 'yes',
+ 'master': self.persons[1].pk
+ }
+
+ response = self.client.post(change_url, data, follow=True)
+ self.assertContains(response, "Objects successfully merged")
+ self.assertContains(response, self.persons[1].name)
+
+ # Check the master copy still exists
+ self.assertTrue(models.Person.objects.get(pk=self.persons[1].pk))
+
+ # Check the un-needed people have been disposed of
+ self.assertRaises(ObjectDoesNotExist, models.Person.objects.get, pk=self.persons[2].pk)
+
+ # Check the one we didn't delete is still there
+ self.assertEqual(models.Person.objects.get(pk=self.persons[3].pk), self.persons[3])
+
+ # Check the events have been moved to the master person
+ for key, event in self.events.iteritems():
+ updatedEvent = models.Event.objects.get(pk=event.pk)
+ if event.person == self.persons[3]: # The one we left in place
+ continue
+ self.assertEqual(updatedEvent.person, self.persons[1])
+
+ def test_organisation_merge(self):
+ change_url = reverse('admin:RIGS_organisation_changelist')
+
+ data = {'action': 'merge',
+ '_selected_action': [unicode(self.organisations[1].pk), unicode(self.organisations[2].pk)],
+ 'post': 'yes',
+ 'master': self.organisations[1].pk
+ }
+
+ response = self.client.post(change_url, data, follow=True)
+ self.assertContains(response, "Objects successfully merged")
+ self.assertContains(response, self.organisations[1].name)
+
+ # Check the master copy still exists
+ self.assertTrue(models.Organisation.objects.get(pk=self.organisations[1].pk))
+
+ # Check the un-needed organisations have been disposed of
+ self.assertRaises(ObjectDoesNotExist, models.Organisation.objects.get, pk=self.organisations[2].pk)
+
+ # Check the one we didn't delete is still there
+ self.assertEqual(models.Organisation.objects.get(pk=self.organisations[3].pk), self.organisations[3])
+
+ # Check the events have been moved to the master organisation
+ for key, event in self.events.iteritems():
+ updatedEvent = models.Event.objects.get(pk=event.pk)
+ if event.organisation == self.organisations[3]: # The one we left in place
+ continue
+ self.assertEqual(updatedEvent.organisation, self.organisations[1])
+
+class TestInvoiceDelete(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, is_active=True, is_staff=True)
+
+ cls.events = {
+ 1: models.Event.objects.create(name="TE E1", start_date=date.today()),
+ 2: models.Event.objects.create(name="TE E2", start_date=date.today())
+ }
+
+ cls.invoices = {
+ 1: models.Invoice.objects.create(event=cls.events[1]),
+ 2: models.Invoice.objects.create(event=cls.events[2])
+ }
+
+ cls.payments = {
+ 1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34, method=models.Payment.CASH)
+ }
+
+ def setUp(self):
+ self.profile.set_password('testuser')
+ self.profile.save()
+ self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
+
+ def test_invoice_delete_allowed(self):
+ request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[2].pk})
+
+ response = self.client.get(request_url, follow=True)
+ self.assertContains(response, "Are you sure")
+
+ # Check the invoice still exists
+ self.assertTrue(models.Invoice.objects.get(pk=self.invoices[2].pk))
+
+ # Actually delete it
+ response = self.client.post(request_url, follow=True)
+
+ # Check the invoice is deleted
+ self.assertRaises(ObjectDoesNotExist, models.Invoice.objects.get, pk=self.invoices[2].pk)
+
+ def test_invoice_delete_not_allowed(self):
+ request_url = reverse('invoice_delete', kwargs={'pk':self.invoices[1].pk})
+
+ response = self.client.get(request_url, follow=True)
+ self.assertContains(response, "To delete an invoice, delete the payments first.")
+
+ # Check the invoice still exists
+ self.assertTrue(models.Invoice.objects.get(pk=self.invoices[1].pk))
+
+ # Try to actually delete it
+ response = self.client.post(request_url, follow=True)
+
+ # Check this didn't work
+ self.assertTrue(models.Invoice.objects.get(pk=self.invoices[1].pk))
+
+
+class TestEmbeddedViews(TestCase):
+ @classmethod
+ def setUpTestData(cls):
+ cls.profile = models.Profile.objects.create(username="testuser1", email="1@test.com", is_superuser=True, is_active=True, is_staff=True)
+
+ cls.events = {
+ 1: models.Event.objects.create(name="TE E1", start_date=date.today()),
+ 2: models.Event.objects.create(name="TE E2", start_date=date.today())
+ }
+
+ cls.invoices = {
+ 1: models.Invoice.objects.create(event=cls.events[1]),
+ 2: models.Invoice.objects.create(event=cls.events[2])
+ }
+
+ cls.payments = {
+ 1: models.Payment.objects.create(invoice=cls.invoices[1], date=date.today(), amount=12.34, method=models.Payment.CASH)
+ }
+
+ def setUp(self):
+ self.profile.set_password('testuser')
+ self.profile.save()
+
+ def testLoginRedirect(self):
+ request_url = reverse('event_embed', kwargs={'pk': 1})
+ expected_url = "{0}?next={1}".format(reverse('login_embed'), request_url)
+
+ # Request the page and check it redirects
+ response = self.client.get(request_url, follow=True)
+ self.assertRedirects(response, expected_url, status_code=302, target_status_code=200)
+
+ # Now login
+ self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
+
+ # And check that it no longer redirects
+ response = self.client.get(request_url, follow=True)
+ self.assertEqual(len(response.redirect_chain), 0)
+
+ def testLoginCookieWarning(self):
+ login_url = reverse('login_embed')
+ response = self.client.post(login_url, follow=True)
+ self.assertContains(response, "Cookies do not seem to be enabled")
+
+ def testXFrameHeaders(self):
+ event_url = reverse('event_embed', kwargs={'pk': 1})
+ login_url = reverse('login_embed')
+
+ self.assertTrue(self.client.login(username=self.profile.username, password='testuser'))
+
+ response = self.client.get(event_url, follow=True)
+ with self.assertRaises(KeyError):
+ response._headers["X-Frame-Options"]
+
+ response = self.client.get(login_url, follow=True)
+ with self.assertRaises(KeyError):
+ response._headers["X-Frame-Options"]
+
+ def testOEmbed(self):
+ event_url = reverse('event_detail', kwargs={'pk': 1})
+ event_embed_url = reverse('event_embed', kwargs={'pk': 1})
+ oembed_url = reverse('event_oembed', kwargs={'pk': 1})
+
+ alt_oembed_url = reverse('event_oembed', kwargs={'pk': 999})
+ alt_event_embed_url = reverse('event_embed', kwargs={'pk': 999})
+
+ # Test the meta tag is in place
+ response = self.client.get(event_url, follow=True, HTTP_HOST='example.com')
+ self.assertContains(response, '\d+)/$',
- permission_required_with_403('RIGS.view_person')(views.PersonDetail.as_view()),
- name='person_detail'),
- url(r'^people/(?P\d+)/history/$',
- permission_required_with_403('RIGS.view_person')(versioning.VersionHistory.as_view()),
- name='person_history', kwargs={'model': models.Person}),
- url(r'^people/(?P\d+)/edit/$',
- permission_required_with_403('RIGS.change_person')(views.PersonUpdate.as_view()),
- name='person_update'),
+ # People
+ url(r'^people/$', permission_required_with_403('RIGS.view_person')(views.PersonList.as_view()),
+ name='person_list'),
+ url(r'^people/add/$',
+ permission_required_with_403('RIGS.add_person')(views.PersonCreate.as_view()),
+ name='person_create'),
+ url(r'^people/(?P\d+)/$',
+ permission_required_with_403('RIGS.view_person')(views.PersonDetail.as_view()),
+ name='person_detail'),
+ url(r'^people/(?P\d+)/history/$',
+ permission_required_with_403('RIGS.view_person')(versioning.VersionHistory.as_view()),
+ name='person_history', kwargs={'model': models.Person}),
+ url(r'^people/(?P\d+)/edit/$',
+ permission_required_with_403('RIGS.change_person')(views.PersonUpdate.as_view()),
+ name='person_update'),
- # Organisations
- url(r'^organisations/$',
- permission_required_with_403('RIGS.view_organisation')(views.OrganisationList.as_view()),
- name='organisation_list'),
- url(r'^organisations/add/$',
- permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()),
- name='organisation_create'),
- url(r'^organisations/(?P\d+)/$',
- permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()),
- name='organisation_detail'),
- url(r'^organisations/(?P\d+)/history/$',
- permission_required_with_403('RIGS.view_organisation')(versioning.VersionHistory.as_view()),
- name='organisation_history', kwargs={'model': models.Organisation}),
- url(r'^organisations/(?P\d+)/edit/$',
- permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()),
- name='organisation_update'),
+ # Organisations
+ url(r'^organisations/$',
+ permission_required_with_403('RIGS.view_organisation')(views.OrganisationList.as_view()),
+ name='organisation_list'),
+ url(r'^organisations/add/$',
+ permission_required_with_403('RIGS.add_organisation')(views.OrganisationCreate.as_view()),
+ name='organisation_create'),
+ url(r'^organisations/(?P\d+)/$',
+ permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()),
+ name='organisation_detail'),
+ url(r'^organisations/(?P\d+)/history/$',
+ permission_required_with_403('RIGS.view_organisation')(versioning.VersionHistory.as_view()),
+ name='organisation_history', kwargs={'model': models.Organisation}),
+ url(r'^organisations/(?P\d+)/edit/$',
+ permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()),
+ name='organisation_update'),
- # Venues
- url(r'^venues/$',
- permission_required_with_403('RIGS.view_venue')(views.VenueList.as_view()),
- name='venue_list'),
- url(r'^venues/add/$',
- permission_required_with_403('RIGS.add_venue')(views.VenueCreate.as_view()),
- name='venue_create'),
- url(r'^venues/(?P\d+)/$',
- permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()),
- name='venue_detail'),
- url(r'^venues/(?P\d+)/history/$',
- permission_required_with_403('RIGS.view_venue')(versioning.VersionHistory.as_view()),
- name='venue_history', kwargs={'model': models.Venue}),
- url(r'^venues/(?P\d+)/edit/$',
- permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()),
- name='venue_update'),
+ # Venues
+ url(r'^venues/$',
+ permission_required_with_403('RIGS.view_venue')(views.VenueList.as_view()),
+ name='venue_list'),
+ url(r'^venues/add/$',
+ permission_required_with_403('RIGS.add_venue')(views.VenueCreate.as_view()),
+ name='venue_create'),
+ url(r'^venues/(?P\d+)/$',
+ permission_required_with_403('RIGS.view_venue')(views.VenueDetail.as_view()),
+ name='venue_detail'),
+ url(r'^venues/(?P\d+)/history/$',
+ permission_required_with_403('RIGS.view_venue')(versioning.VersionHistory.as_view()),
+ name='venue_history', kwargs={'model': models.Venue}),
+ url(r'^venues/(?P\d+)/edit/$',
+ permission_required_with_403('RIGS.change_venue')(views.VenueUpdate.as_view()),
+ name='venue_update'),
- # Rigboard
- url(r'^rigboard/$', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
- url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
- url(r'^rigboard/calendar/(?P(month|week|day))/$', login_required()(rigboard.WebCalendar.as_view()),
- name='web_calendar'),
- url(r'^rigboard/calendar/(?P(month|week|day))/(?P(\d{4}-\d{2}-\d{2}))/$',
- login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
- url(r'^rigboard/archive/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
- url(r'^rigboard/activity/$',
- permission_required_with_403('RIGS.view_event')(versioning.ActivityTable.as_view()),
- name='activity_table'),
- url(r'^rigboard/activity/feed/$',
- permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
- name='activity_feed'),
+ # Rigboard
+ url(r'^rigboard/$', login_required(rigboard.RigboardIndex.as_view()), name='rigboard'),
+ url(r'^rigboard/calendar/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
+ url(r'^rigboard/calendar/(?P(month|week|day))/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
+ url(r'^rigboard/calendar/(?P(month|week|day))/(?P(\d{4}-\d{2}-\d{2}))/$', login_required()(rigboard.WebCalendar.as_view()), name='web_calendar'),
+ url(r'^rigboard/archive/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
+ url(r'^rigboard/activity/$',
+ permission_required_with_403('RIGS.view_event')(versioning.ActivityTable.as_view()),
+ name='activity_table'),
+ url(r'^rigboard/activity/feed/$',
+ permission_required_with_403('RIGS.view_event')(versioning.ActivityFeed.as_view()),
+ name='activity_feed'),
- url(r'^event/(?P\d+)/$',
- permission_required_with_403('RIGS.view_event')(rigboard.EventDetail.as_view()),
- name='event_detail'),
- url(r'^event/(?P\d+)/print/$',
- permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()),
- name='event_print'),
- url(r'^event/create/$',
- permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()),
- name='event_create'),
- url(r'^event/(?P\d+)/edit/$',
- permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()),
- name='event_update'),
- url(r'^event/(?P\d+)/duplicate/$',
- permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()),
- name='event_duplicate'),
- url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()),
- name='event_archive'),
+ url(r'^event/(?P\d+)/$',
+ permission_required_with_403('RIGS.view_event', oembed_view="event_oembed")(rigboard.EventDetail.as_view()),
+ name='event_detail'),
+ url(r'^event/(?P\d+)/embed/$',
+ xframe_options_exempt(login_required(login_url='/user/login/embed/')(rigboard.EventEmbed.as_view())),
+ name='event_embed'),
+ url(r'^event/(?P\d+)/oembed_json/$',
+ rigboard.EventOembed.as_view(),
+ name='event_oembed'),
+ url(r'^event/(?P\d+)/print/$',
+ permission_required_with_403('RIGS.view_event')(rigboard.EventPrint.as_view()),
+ name='event_print'),
+ url(r'^event/create/$',
+ permission_required_with_403('RIGS.add_event')(rigboard.EventCreate.as_view()),
+ name='event_create'),
+ url(r'^event/(?P\d+)/edit/$',
+ permission_required_with_403('RIGS.change_event')(rigboard.EventUpdate.as_view()),
+ name='event_update'),
+ url(r'^event/(?P\d+)/duplicate/$',
+ permission_required_with_403('RIGS.add_event')(rigboard.EventDuplicate.as_view()),
+ name='event_duplicate'),
+ url(r'^event/archive/$', login_required()(rigboard.EventArchive.as_view()),
+ name='event_archive'),
- url(r'^event/(?P\d+)/history/$',
- permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()),
- name='event_history', kwargs={'model': models.Event}),
+ url(r'^event/(?P\d+)/history/$',
+ permission_required_with_403('RIGS.view_event')(versioning.VersionHistory.as_view()),
+ name='event_history', kwargs={'model': models.Event}),
- # Finance
- url(r'^invoice/$',
- permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()),
- name='invoice_list'),
- url(r'^invoice/archive/$',
- permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()),
- name='invoice_archive'),
- url(r'^invoice/waiting/$',
- permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()),
- name='invoice_waiting'),
- url(r'^event/(?P\d+)/invoice/$',
- permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()),
- name='invoice_event'),
- url(r'^invoice/(?P\d+)/$',
- permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()),
- name='invoice_detail'),
- url(r'^invoice/(?P\d+)/print/$',
- permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()),
- name='invoice_print'),
- url(r'^invoice/(?P\d+)/void/$',
- permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()),
- name='invoice_void'),
- url(r'^payment/create/$',
- permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()),
- name='payment_create'),
- url(r'^payment/(?P\d+)/delete/$',
- permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()),
- name='payment_delete'),
+ # Finance
+ url(r'^invoice/$',
+ permission_required_with_403('RIGS.view_invoice')(finance.InvoiceIndex.as_view()),
+ name='invoice_list'),
+ url(r'^invoice/archive/$',
+ permission_required_with_403('RIGS.view_invoice')(finance.InvoiceArchive.as_view()),
+ name='invoice_archive'),
+ url(r'^invoice/waiting/$',
+ permission_required_with_403('RIGS.add_invoice')(finance.InvoiceWaiting.as_view()),
+ name='invoice_waiting'),
- # User editing
- url(r'^user/$', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
- url(r'^user/(?P\d+)/$',
- permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
- name='profile_detail'),
- url(r'^user/edit/$', login_required(views.ProfileUpdateSelf.as_view()),
- name='profile_update_self'),
- url(r'^user/reset_api_key$', login_required(views.ResetApiKey.as_view(permanent=False)), name='reset_api_key'),
+ url(r'^event/(?P\d+)/invoice/$',
+ permission_required_with_403('RIGS.add_invoice')(finance.InvoiceEvent.as_view()),
+ name='invoice_event'),
- # ICS Calendar - API key authentication
- url(r'^ical/(?P\d+)/(?P\w+)/rigs.ics$', api_key_required(ical.CalendarICS()), name="ics_calendar"),
+ url(r'^invoice/(?P\d+)/$',
+ permission_required_with_403('RIGS.view_invoice')(finance.InvoiceDetail.as_view()),
+ name='invoice_detail'),
+ url(r'^invoice/(?P\d+)/print/$',
+ permission_required_with_403('RIGS.view_invoice')(finance.InvoicePrint.as_view()),
+ name='invoice_print'),
+ url(r'^invoice/(?P\d+)/void/$',
+ permission_required_with_403('RIGS.change_invoice')(finance.InvoiceVoid.as_view()),
+ name='invoice_void'),
+ url(r'^invoice/(?P\d+)/delete/$',
+ permission_required_with_403('RIGS.change_invoice')(finance.InvoiceDelete.as_view()),
+ name='invoice_delete'),
+ url(r'^payment/create/$',
+ permission_required_with_403('RIGS.add_payment')(finance.PaymentCreate.as_view()),
+ name='payment_create'),
+ url(r'^payment/(?P\d+)/delete/$',
+ permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()),
+ name='payment_delete'),
- # API
- url(r'^api/(?P\w+)/$', login_required(views.SecureAPIRequest.as_view()), name="api_secure"),
- url(r'^api/(?P\w+)/(?P\d+)/$', login_required(views.SecureAPIRequest.as_view()), name="api_secure"),
+ # User editing
+ url(r'^user/$', login_required(views.ProfileDetail.as_view()), name='profile_detail'),
+ url(r'^user/(?P\d+)/$',
+ permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()),
+ name='profile_detail'),
+ url(r'^user/edit/$', login_required(views.ProfileUpdateSelf.as_view()),
+ name='profile_update_self'),
+ url(r'^user/reset_api_key$', login_required(views.ResetApiKey.as_view(permanent=False)), name='reset_api_key'),
- # Legacy URL's
- url(r'^rig/show/(?P\d+)/$', RedirectView.as_view(permanent=True, pattern_name='event_detail')),
- url(r'^bookings/$', RedirectView.as_view(permanent=True, pattern_name='rigboard')),
- url(r'^bookings/past/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
-]
+ # ICS Calendar - API key authentication
+ url(r'^ical/(?P\d+)/(?P\w+)/rigs.ics$', api_key_required(ical.CalendarICS()), name="ics_calendar"),
+
+ # API
+ url(r'^api/(?P\w+)/$', login_required(views.SecureAPIRequest.as_view()), name="api_secure"),
+ url(r'^api/(?P\w+)/(?P\d+)/$', login_required(views.SecureAPIRequest.as_view()), name="api_secure"),
+
+ # Legacy URL's
+ url(r'^rig/show/(?P\d+)/$', RedirectView.as_view(permanent=True, pattern_name='event_detail')),
+ url(r'^bookings/$', RedirectView.as_view(permanent=True, pattern_name='rigboard')),
+ url(r'^bookings/past/$', RedirectView.as_view(permanent=True, pattern_name='event_archive')),
+ )
diff --git a/RIGS/versioning.py b/RIGS/versioning.py
index 789fc5d7..6d524fc0 100644
--- a/RIGS/versioning.py
+++ b/RIGS/versioning.py
@@ -1,27 +1,18 @@
import logging
-from django.views import generic
-from django.core.urlresolvers import reverse_lazy
-from django.shortcuts import get_object_or_404
-from django.template import RequestContext
-from django.template.loader import get_template
-from django.conf import settings
-from django.http import HttpResponse
-from django.db.models import Q
-from django.contrib import messages
+
from django.core.exceptions import ObjectDoesNotExist
+from django.shortcuts import get_object_or_404
+from django.views import generic
# Versioning
import reversion
-import simplejson
from reversion.models import Version
-from django.contrib.contenttypes.models import ContentType # Used to lookup the content_type
-from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
-from django.db.models import ForeignKey, IntegerField, EmailField, TextField
+from django.contrib.contenttypes.models import ContentType # Used to lookup the content_type
+from django.db.models import IntegerField, EmailField, TextField
from diff_match_patch import diff_match_patch
-from RIGS import models, forms
+from RIGS import models
import datetime
-import re
logger = logging.getLogger('tec.pyrigs')
@@ -29,11 +20,10 @@ logger = logging.getLogger('tec.pyrigs')
def model_compare(oldObj, newObj, excluded_keys=[]):
# recieves two objects of the same model, and compares them. Returns an array of FieldCompare objects
try:
- theFields = oldObj._meta.fields #This becomes deprecated in Django 1.8!!!!!!!!!!!!! (but an alternative becomes available)
+ theFields = oldObj._meta.fields # This becomes deprecated in Django 1.8!!!!!!!!!!!!! (but an alternative becomes available)
except AttributeError:
theFields = newObj._meta.fields
-
class FieldCompare(object):
def __init__(self, field=None, old=None, new=None):
self.field = field
@@ -51,13 +41,13 @@ def model_compare(oldObj, newObj, excluded_keys=[]):
@property
def new(self):
- return self.display_value(self._new)
+ return self.display_value(self._new)
@property
def long(self):
if isinstance(self.field, EmailField):
return True
- return False
+ return False
@property
def linebreaks(self):
@@ -76,35 +66,43 @@ def model_compare(oldObj, newObj, excluded_keys=[]):
outputDiffs = []
for (op, data) in diffs:
- if op == dmp.DIFF_INSERT:
- outputDiffs.append({'type':'insert', 'text':data})
- elif op == dmp.DIFF_DELETE:
- outputDiffs.append({'type':'delete', 'text':data})
- elif op == dmp.DIFF_EQUAL:
- outputDiffs.append({'type':'equal', 'text':data})
+ if op == dmp.DIFF_INSERT:
+ outputDiffs.append({'type': 'insert', 'text': data})
+ elif op == dmp.DIFF_DELETE:
+ outputDiffs.append({'type': 'delete', 'text': data})
+ elif op == dmp.DIFF_EQUAL:
+ outputDiffs.append({'type': 'equal', 'text': data})
return outputDiffs
changes = []
for thisField in theFields:
name = thisField.name
-
- if name in excluded_keys:
- continue # if we're excluding this field, skip over it
- oldValue = getattr(oldObj, name, None)
- newValue = getattr(newObj, name, None)
+ if name in excluded_keys:
+ continue # if we're excluding this field, skip over it
+
+ try:
+ oldValue = getattr(oldObj, name, None)
+ except ObjectDoesNotExist:
+ oldValue = None
+
+ try:
+ newValue = getattr(newObj, name, None)
+ except ObjectDoesNotExist:
+ newValue = None
try:
bothBlank = (not oldValue) and (not newValue)
if oldValue != newValue and not bothBlank:
- compare = FieldCompare(thisField,oldValue,newValue)
+ compare = FieldCompare(thisField, oldValue, newValue)
changes.append(compare)
- except TypeError: # logs issues with naive vs tz-aware datetimes
+ except TypeError: # logs issues with naive vs tz-aware datetimes
logger.error('TypeError when comparing models')
-
+
return changes
+
def compare_event_items(old, new):
# Recieves two event version objects and compares their items, returns an array of ItemCompare objects
@@ -119,39 +117,43 @@ def compare_event_items(old, new):
self.changes = changes
# Build some dicts of what we have
- item_dict = {} # build a list of items, key is the item_pk
- for version in old_item_versions: # put all the old versions in a list
- compare = ItemCompare(old=version.object_version.object)
- item_dict[version.object_id] = compare
+ item_dict = {} # build a list of items, key is the item_pk
+ for version in old_item_versions: # put all the old versions in a list
+ if version.field_dict["event"] == old.object_id_int:
+ compare = ItemCompare(old=version.object_version.object)
+ item_dict[version.object_id] = compare
- for version in new_item_versions: # go through the new versions
- try:
- compare = item_dict[version.object_id] # see if there's a matching old version
- compare.new = version.object_version.object # then add the new version to the dictionary
- except KeyError: # there's no matching old version, so add this item to the dictionary by itself
- compare = ItemCompare(new=version.object_version.object)
-
- item_dict[version.object_id] = compare # update the dictionary with the changes
+ for version in new_item_versions: # go through the new versions
+ if version.field_dict["event"] == new.object_id_int:
+ try:
+ compare = item_dict[version.object_id] # see if there's a matching old version
+ compare.new = version.object_version.object # then add the new version to the dictionary
+ except KeyError: # there's no matching old version, so add this item to the dictionary by itself
+ compare = ItemCompare(new=version.object_version.object)
- changes = []
+ item_dict[version.object_id] = compare # update the dictionary with the changes
+
+ changes = []
for (_, compare) in item_dict.items():
- compare.changes = model_compare(compare.old, compare.new, ['id','event','order']) # see what's changed
+ compare.changes = model_compare(compare.old, compare.new, ['id', 'event', 'order']) # see what's changed
if len(compare.changes) >= 1:
- changes.append(compare) # transfer into a sequential array to make it easier to deal with later
+ changes.append(compare) # transfer into a sequential array to make it easier to deal with later
return changes
+
def get_versions_for_model(models):
content_types = []
for model in models:
content_types.append(ContentType.objects.get_for_model(model))
-
+
versions = reversion.models.Version.objects.filter(
- content_type__in = content_types,
+ content_type__in=content_types,
).select_related("revision").order_by("-pk")
return versions
+
def get_previous_version(version):
thisId = version.object_id
thisVersionId = version.pk
@@ -159,17 +161,19 @@ def get_previous_version(version):
versions = reversion.get_for_object_reference(version.content_type.model_class(), thisId)
try:
- previousVersions = versions.filter(revision_id__lt=version.revision_id).latest(field_name='revision__date_created')
+ previousVersions = versions.filter(revision_id__lt=version.revision_id).latest(
+ field_name='revision__date_created')
except ObjectDoesNotExist:
return False
return previousVersions
-def get_changes_for_version(newVersion, oldVersion=None):
- #Pass in a previous version if you already know it (for efficiancy)
- #if not provided then it will be looked up in the database
- if oldVersion == None:
+def get_changes_for_version(newVersion, oldVersion=None):
+ # Pass in a previous version if you already know it (for efficiancy)
+ # if not provided then it will be looked up in the database
+
+ if oldVersion == None:
oldVersion = get_previous_version(newVersion)
modelClass = newVersion.content_type.model_class()
@@ -193,6 +197,7 @@ def get_changes_for_version(newVersion, oldVersion=None):
return compare
+
class VersionHistory(generic.ListView):
model = reversion.revisions.Version
template_name = "RIGS/version_history.html"
@@ -208,7 +213,7 @@ class VersionHistory(generic.ListView):
def get_context_data(self, **kwargs):
thisModel = self.kwargs['model']
-
+
context = super(VersionHistory, self).get_context_data(**kwargs)
versions = context['object_list']
@@ -217,81 +222,82 @@ class VersionHistory(generic.ListView):
items = []
for versionNo, thisVersion in enumerate(versions):
- if versionNo >= len(versions)-1:
+ if versionNo >= len(versions) - 1:
thisItem = get_changes_for_version(thisVersion, None)
else:
- thisItem = get_changes_for_version(thisVersion, versions[versionNo+1])
-
+ thisItem = get_changes_for_version(thisVersion, versions[versionNo + 1])
+
items.append(thisItem)
context['object_list'] = items
context['object'] = thisObject
-
+
return context
+
class ActivityTable(generic.ListView):
model = reversion.revisions.Version
template_name = "RIGS/activity_table.html"
paginate_by = 25
-
+
def get_queryset(self):
- versions = get_versions_for_model([models.Event,models.Venue,models.Person,models.Organisation])
+ versions = get_versions_for_model([models.Event, models.Venue, models.Person, models.Organisation])
return versions
def get_context_data(self, **kwargs):
-
# Call the base implementation first to get a context
context = super(ActivityTable, self).get_context_data(**kwargs)
-
+
items = []
for thisVersion in context['object_list']:
thisItem = get_changes_for_version(thisVersion, None)
items.append(thisItem)
- context ['object_list'] = items
-
+ context['object_list'] = items
+
return context
+
class ActivityFeed(generic.ListView):
model = reversion.revisions.Version
template_name = "RIGS/activity_feed_data.html"
paginate_by = 25
-
+
def get_queryset(self):
- versions = get_versions_for_model([models.Event,models.Venue,models.Person,models.Organisation])
+ versions = get_versions_for_model([models.Event, models.Venue, models.Person, models.Organisation])
return versions
def get_context_data(self, **kwargs):
maxTimeDelta = []
- maxTimeDelta.append({ 'maxAge':datetime.timedelta(days=1), 'group':datetime.timedelta(hours=1)})
- maxTimeDelta.append({ 'maxAge':None, 'group':datetime.timedelta(days=1)})
+ maxTimeDelta.append({'maxAge': datetime.timedelta(days=1), 'group': datetime.timedelta(hours=1)})
+ maxTimeDelta.append({'maxAge': None, 'group': datetime.timedelta(days=1)})
# Call the base implementation first to get a context
context = super(ActivityFeed, self).get_context_data(**kwargs)
-
+
items = []
for thisVersion in context['object_list']:
thisItem = get_changes_for_version(thisVersion, None)
if thisItem['item_changes'] or thisItem['field_changes'] or thisItem['old'] == None:
thisItem['withPrevious'] = False
- if len(items)>=1:
- timeAgo = datetime.datetime.now(thisItem['revision'].date_created.tzinfo) - thisItem['revision'].date_created
+ if len(items) >= 1:
+ timeAgo = datetime.datetime.now(thisItem['revision'].date_created.tzinfo) - thisItem[
+ 'revision'].date_created
timeDiff = items[-1]['revision'].date_created - thisItem['revision'].date_created
timeTogether = False
for params in maxTimeDelta:
if params['maxAge'] is None or timeAgo <= params['maxAge']:
timeTogether = timeDiff < params['group']
break
-
+
sameUser = thisItem['revision'].user == items[-1]['revision'].user
thisItem['withPrevious'] = timeTogether & sameUser
items.append(thisItem)
- context ['object_list'] = items
-
+ context['object_list'] = items
- return context
\ No newline at end of file
+ return context
diff --git a/RIGS/views.py b/RIGS/views.py
index c013ce1d..c0186bed 100644
--- a/RIGS/views.py
+++ b/RIGS/views.py
@@ -12,6 +12,8 @@ from django.contrib import messages
import datetime, pytz
import operator
from registration.views import RegistrationView
+from django.views.decorators.csrf import csrf_exempt
+
from RIGS import models, forms
@@ -29,12 +31,37 @@ class Index(generic.TemplateView):
def login(request, **kwargs):
if request.user.is_authenticated():
next = request.REQUEST.get('next', '/')
- return HttpResponseRedirect(request.REQUEST.get('next', '/'))
+ return HttpResponseRedirect(next)
else:
from django.contrib.auth.views import login
return login(request)
+
+# This view should be exempt from requiring CSRF token.
+# Then we can check for it and show a nice error
+# Don't worry, django.contrib.auth.views.login will
+# check for it before logging the user in
+@csrf_exempt
+def login_embed(request, **kwargs):
+ print("Running LOGIN")
+ if request.user.is_authenticated():
+ next = request.REQUEST.get('next', '/')
+ return HttpResponseRedirect(next)
+ else:
+ from django.contrib.auth.views import login
+
+ if request.method == "POST":
+ csrf_cookie = request.COOKIES.get('csrftoken', None)
+
+ if csrf_cookie is None:
+ messages.warning(request, 'Cookies do not seem to be enabled. Try logging in using a new tab.')
+ request.method = 'GET' # Render the page without trying to login
+
+ return login(request, template_name="registration/login_embed.html")
+
+
+
"""
Called from a modal window (e.g. when an item is submitted to an event/invoice).
May optionally also include some javascript in a success message to cause a load of
diff --git a/app.json b/app.json
new file mode 100644
index 00000000..737e5eb0
--- /dev/null
+++ b/app.json
@@ -0,0 +1,53 @@
+{
+ "name": "PyRIGS",
+ "description": "",
+ "scripts": {
+ "postdeploy": "python manage.py migrate && python manage.py generateSampleData"
+ },
+ "env": {
+ "DEBUG": {
+ "required": true
+ },
+ "STAGING": "1",
+ "EMAIL_FROM": {
+ "required": true
+ },
+ "EMAIL_HOST": {
+ "required": true
+ },
+ "EMAIL_HOST_PASSWORD": {
+ "required": true
+ },
+ "EMAIL_HOST_USER": {
+ "required": true
+ },
+ "EMAIL_PORT": {
+ "required": true
+ },
+ "EMAIL_USE_SSL": {
+ "required": true
+ },
+ "RECAPTCHA_PRIVATE_KEY": {
+ "required": true
+ },
+ "RECAPTCHA_PUBLIC_KEY": {
+ "required": true
+ },
+ "SECRET_KEY": {
+ "generator": "secret"
+ }
+ },
+ "formation": {
+ "web": {
+ "quantity": 1
+ }
+ },
+ "addons": [
+ "heroku-postgresql"
+ ],
+ "buildpacks": [
+ {
+ "url": "heroku/python"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/templates/base.html b/templates/base.html
index c27231bd..24cc30bc 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -14,7 +14,7 @@
Invoices
{% endif %}
+
+
+ {% if messages %}
+ {% for message in messages %}
+
+ ×
+ {% endfor %}
+ {% endif %}
+
+ {% block content %}
+ {% endblock %}
+
+
+
Login is required for this page
+
Login
+
+
Rig Information Gathering System
+
{% include 'registration/loginform.html' %}
{% endblock %}
\ No newline at end of file
diff --git a/templates/registration/login_embed.html b/templates/registration/login_embed.html
new file mode 100644
index 00000000..bddb7333
--- /dev/null
+++ b/templates/registration/login_embed.html
@@ -0,0 +1,34 @@
+{% extends 'base_embed.html' %}
+{% load widget_tweaks %}
+
+{% block title %}Login{% endblock %}
+
+{% block content %}
+
+
Rig Information Gathering System
+
+
+
+{% include 'form_errors.html' %}
+
+
+
+
+{% endblock %}
diff --git a/templates/registration/loginform.html b/templates/registration/loginform.html
index 74a3787b..ad7e33d3 100644
--- a/templates/registration/loginform.html
+++ b/templates/registration/loginform.html
@@ -3,7 +3,7 @@
{% include 'form_errors.html' %}
\ No newline at end of file
+