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

Fix tests / default to headless tests

Browse Source 
(fingers crossed)
This commit is contained in:
FreneticScribbler
2020-10-13 09:46:24 +01:00
parent d255e1f89f
commit 8b2f2a9354
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PyRIGS/tests/base.py
View File

@@ -26,8 +26,8 @@ def create_browser():
options.add_argument("--disk-cache-size=0")
# God Save The Queen
options.add_argument("--lang=en_GB")
options.add_argument("--headless")
if os.environ.get('CI', False):
options.add_argument("--headless")
options.add_argument("--no-sandbox")
driver = webdriver.Chrome(options=options)
return driver

4
RIGS/templates/event_form.html
View File

@@ -128,7 +128,7 @@
{# Notes and item shit #}
<div class="col-sm-12">
<div class="card card-default form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}" style="display: none;">
<div class="card card-default form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
<div class="card-body">
<div class="col-sm-12">
<div class="form-group" data-toggle="tooltip" title="Notes on the event. This is only visible to keyholders, and is not displayed on the paperwork">
@@ -140,7 +140,7 @@
</div>
</div>
</div>
<div class="col-sm-12 text-right form-hws form-non_rig my-3" style="display: none;">
<div class="col-sm-12 text-right form-hws form-non_rig my-3" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
{% button 'submit' %}
</div>
</div>

4
RIGS/templates/partials/contact_details_form.html
View File

@@ -1,6 +1,6 @@
{% load widget_tweaks %}
<div class="col-md-6 mt-3">
<div class="card form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %} mb-3" style="display: none;">
<div class="card form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %} mb-3" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
<div class="card-header">Contact Details</div>
<div class="card-body">
<div class="form-group" data-toggle="tooltip" title="The main contact for the event, can be left blank if purely an organisation">
@@ -58,7 +58,7 @@
</div>
</div>
</div>
<div class="card form-hws form-non_rig mb-3" style="display: none;">
<div class="card form-hws form-non_rig mb-3" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
<div class="card-header">Event Description</div>
<div class="card-body">
<div class="form-group" data-toggle="tooltip" title="A short description of the event, shown on rigboard and on paperwork">

2
RIGS/templates/partials/event_details_form.html
View File

@@ -2,7 +2,7 @@
{% load l10n %}
<div class="col-md-6 my-3">
<div class="card card-default form-hws form-non_rig" style="display: none;">
<div class="card card-default form-hws form-non_rig" {% if not object.pk and not form.errors %}style="display: none;"{% endif%}>
<div class="card-header">Event Details</div>
<div class="card-body">
<div id="form-hws">

5
assets/views.py
View File

@@ -65,8 +65,9 @@ class AssetList(LoginRequiredMixin, generic.ListView):
def get_context_data(self, **kwargs):
context = super(AssetList, self).get_context_data(**kwargs)
context["form"] = self.form
context["category_filters"] = self.form.cleaned_data['category']
context["status_filters"] = self.form.cleaned_data['status']
if hasattr(self.form, 'cleaned_data'):
context["category_filters"] = self.form.cleaned_data.get('category')
context["status_filters"] = self.form.cleaned_data.get('status')
context["categories"] = models.AssetCategory.objects.all()
context["statuses"] = models.AssetStatus.objects.all()
context["page_title"] = "Asset List"