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

Well that wasn't clever of me

Browse Source
This commit is contained in:
FreneticScribbler
2020-05-26 13:42:37 +01:00
parent 7356d020b2
commit 0bbc23853d
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PyRIGS/views.py
View File

@@ -156,6 +156,6 @@ class GenericListView(generic.ListView):
object_list = self.model.objects.filter(filter) object_list = self.model.objects.filter(filter)
orderBy = self.request.GET.get('orderBy', "name") orderBy = self.request.GET.get('orderBy', "name")
if orderBy is not "": if orderBy != "":
object_list = object_list.order_by(orderBy) object_list = object_list.order_by(orderBy)
return object_list return object_list

2
RIGS/rigboard.py
View File

@@ -262,7 +262,7 @@ class EventArchive(generic.ListView):
q = self.request.GET.get('q', "") q = self.request.GET.get('q', "")
if q is not "": if q != "":
qfilter = Q(name__icontains=q) | Q(description__icontains=q) | Q(notes__icontains=q) qfilter = Q(name__icontains=q) | Q(description__icontains=q) | Q(notes__icontains=q)
# try and parse an int # try and parse an int

3
RIGS/tests/regions.py
View File

@@ -5,7 +5,7 @@ from selenium.webdriver.remote.webelement import WebElement
from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support.select import Select from selenium.webdriver.support.select import Select
import datetime import datetime
from PyRIGS.regions import Modal from PyRIGS.tests.regions import Modal
class Header(Region): class Header(Region):
@@ -40,6 +40,7 @@ class ItemRow(Region):
def subtotal(self): def subtotal(self):
return self.find_element(*self._subtotal_locator).text return self.find_element(*self._subtotal_locator).text
class ItemModal(Modal): class ItemModal(Modal):
_header_selector = (By.TAG_NAME, 'h4') _header_selector = (By.TAG_NAME, 'h4')