From e573088c5e9102b956bd4c6bd50380335c39dc4f Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 10 May 2017 17:51:55 +0100 Subject: [PATCH] Fix some issues caused by changes made over the last year --- RIGS/admin.py | 7 +++---- RIGS/management/commands/generateSampleData.py | 2 +- RIGS/models.py | 7 ------- RIGS/test_functional.py | 18 ++++++------------ RIGS/views.py | 5 ++--- 5 files changed, 12 insertions(+), 27 deletions(-) diff --git a/RIGS/admin.py b/RIGS/admin.py index 89779738..58b27e4c 100644 --- a/RIGS/admin.py +++ b/RIGS/admin.py @@ -12,11 +12,10 @@ from django.core.exceptions import ObjectDoesNotExist from django.db.models import Count from django.forms import ModelForm +from reversion import revisions as reversion + # Register your models here. -admin.site.register(models.Person, VersionAdmin) -admin.site.register(models.Organisation, VersionAdmin) admin.site.register(models.VatRate, VersionAdmin) -admin.site.register(models.Venue, VersionAdmin) admin.site.register(models.Event, VersionAdmin) admin.site.register(models.EventItem, VersionAdmin) admin.site.register(models.Invoice) @@ -44,7 +43,7 @@ class ProfileAdmin(UserAdmin): add_form = forms.ProfileCreationForm -class AssociateAdmin(reversion.VersionAdmin): +class AssociateAdmin(VersionAdmin): list_display = ('id', 'name', 'number_of_events') search_fields = ['id', 'name'] list_display_links = ['id', 'name'] diff --git a/RIGS/management/commands/generateSampleData.py b/RIGS/management/commands/generateSampleData.py index bf1ce7d2..59c39c97 100644 --- a/RIGS/management/commands/generateSampleData.py +++ b/RIGS/management/commands/generateSampleData.py @@ -1,7 +1,7 @@ from django.core.management.base import BaseCommand, CommandError from django.contrib.auth.models import Group, Permission from django.db import transaction -import reversion +from reversion import revisions as reversion import datetime import random diff --git a/RIGS/models.py b/RIGS/models.py index cbdc3e74..b245f543 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -12,18 +12,11 @@ from reversion import revisions as reversion import string import random -import string from collections import Counter from decimal import Decimal -import reversion -from django.conf import settings -from django.contrib.auth.models import AbstractUser from django.core.exceptions import ValidationError from django.core.urlresolvers import reverse_lazy -from django.db import models -from django.utils.encoding import python_2_unicode_compatible -from django.utils.functional import cached_property # Create your models here. diff --git a/RIGS/test_functional.py b/RIGS/test_functional.py index 2cd3af8d..3b867652 100644 --- a/RIGS/test_functional.py +++ b/RIGS/test_functional.py @@ -499,12 +499,8 @@ 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 @@ -513,13 +509,12 @@ 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 + @@ -527,13 +522,12 @@ 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/views.py b/RIGS/views.py index c0186bed..b681c1bb 100644 --- a/RIGS/views.py +++ b/RIGS/views.py @@ -30,7 +30,7 @@ class Index(generic.TemplateView): def login(request, **kwargs): if request.user.is_authenticated(): - next = request.REQUEST.get('next', '/') + next = request.GET.get('next', '/') return HttpResponseRedirect(next) else: from django.contrib.auth.views import login @@ -44,9 +44,8 @@ def login(request, **kwargs): # 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', '/') + next = request.GET.get('next', '/') return HttpResponseRedirect(next) else: from django.contrib.auth.views import login