arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Do not display "not saved" message when the event has been saved

Browse Source
This commit is contained in:
David Taylor
2016-10-23 14:05:25 +01:00
parent 5e8f2312d3
commit b939bc5a64
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
RIGS/rigboard.py
View File

@@ -125,8 +125,8 @@ class EventDuplicate(EventUpdate):
if self.request.method in ('POST', 'PUT'): # This only happens on save (otherwise items won't display in editor) if self.request.method in ('POST', 'PUT'): # This only happens on save (otherwise items won't display in editor)
new.pk = None # This means a new event will be created on save, and all items will be re-created new.pk = None # This means a new event will be created on save, and all items will be re-created
else:
messages.info(self.request, 'Event data duplicated but not yet saved. Click save to complete operation.') messages.info(self.request, 'Event data duplicated but not yet saved. Click save to complete operation.')
return new return new

4
RIGS/test_functional.py
View File

@@ -471,6 +471,9 @@ class EventTest(LiveServerTestCase):
self.assertIn("Test Item 1", table.text) self.assertIn("Test Item 1", table.text)
self.assertIn("Test Item 2", 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 # Add item
form.find_element_by_xpath('//button[contains(@class, "item-add")]').click() form.find_element_by_xpath('//button[contains(@class, "item-add")]').click()
wait.until(animation_is_finished()) wait.until(animation_is_finished())
@@ -489,6 +492,7 @@ class EventTest(LiveServerTestCase):
save.click() save.click()
self.assertNotIn("N0000%d"%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
# Check the new items are visible # Check the new items are visible
table = self.browser.find_element_by_id('item-table') # ID number is known, see above table = self.browser.find_element_by_id('item-table') # ID number is known, see above