|
- Coding Pirates {{activity.department.name}}
+ {{activity.union.name}}
|
{{activity.name}} |
diff --git a/members/tests/test_functional/test_activities.py b/members/tests/test_functional/test_activities.py
index bd401e30..bcddd229 100644
--- a/members/tests/test_functional/test_activities.py
+++ b/members/tests/test_functional/test_activities.py
@@ -181,7 +181,6 @@ def test_entry_page(self):
self.assertEqual(links[0], links[1])
def test_activities(self):
-
# Loads the activities
self.browser.find_element_by_link_text("Arrangementer").click()
WebDriverWait(self.browser, 10).until(
@@ -220,26 +219,32 @@ def test_membership(self):
self.browser.save_screenshot("test-screens/membership_list.png")
# Check that the page contains all participating activities
- activity_names = [
- e.text
- for e in self.browser.find_elements_by_xpath(
- "//section[@id='participation']/table/tbody/tr/td[@data-label='Aktivitet']"
- )
- ]
- self.assertEqual(1, len(activity_names))
- self.assertIn(
- self.activity_foreningsmedlemskab_participate.name, activity_names
+ activities = self.browser.find_elements_by_xpath(
+ "//section[@id='participation']/table/tbody/tr"
+ )
+ self.assertEqual(1, len(activities))
+ self.assertEqual(
+ self.activity_foreningsmedlemskab_participate.name,
+ activities[0].find_element_by_xpath("td[@data-label='Aktivitet']").text,
+ )
+ self.assertEqual(
+ self.activity_foreningsmedlemskab_participate.union.name,
+ activities[0].find_element_by_xpath("td[@data-label='Forening']").text,
)
# Check that the page contains all activities
- activity_names = [
- e.text
- for e in self.browser.find_elements_by_xpath(
- "//section[@id='open_activities']/table/tbody/tr/td[@data-label='Aktivitet']"
- )
- ]
- self.assertEqual(1, len(activity_names))
- self.assertIn(self.activity_foreningsmedlemskab.name, activity_names)
+ activities = self.browser.find_elements_by_xpath(
+ "//section[@id='open_activities']/table/tbody/tr"
+ )
+ self.assertEqual(1, len(activities))
+ self.assertEqual(
+ self.activity_foreningsmedlemskab.name,
+ activities[0].find_element_by_xpath("td[@data-label='Aktivitet']").text,
+ )
+ self.assertEqual(
+ self.activity_foreningsmedlemskab.union.name,
+ activities[0].find_element_by_xpath("td[@data-label='Forening']").text,
+ )
def test_supportmembership(self):
# Loads the members
@@ -250,21 +255,30 @@ def test_supportmembership(self):
self.browser.save_screenshot("test-screens/supportmembership_list.png")
# Check that the page contains all participating activities
- activity_names = [
- e.text
- for e in self.browser.find_elements_by_xpath(
- "//section[@id='participation']/table/tbody/tr/td[@data-label='Aktivitet']"
- )
- ]
- self.assertEqual(1, len(activity_names))
- self.assertIn(self.activity_støttemedlemskab_participate.name, activity_names)
+ activities = self.browser.find_elements_by_xpath(
+ "//section[@id='participation']/table/tbody/tr"
+ )
+ self.assertEqual(1, len(activities))
+ self.assertEqual(
+ self.activity_støttemedlemskab_participate.name,
+ activities[0].find_element_by_xpath("td[@data-label='Aktivitet']").text,
+ )
+ self.assertEqual(
+ self.activity_støttemedlemskab_participate.union.name,
+ activities[0].find_element_by_xpath("td[@data-label='Forening']").text,
+ )
# Check that the page contains all activities
- activity_names = [
- e.text
- for e in self.browser.find_elements_by_xpath(
- "//section[@id='open_activities']/table/tbody/tr/td[@data-label='Aktivitet']"
- )
- ]
- self.assertEqual(1, len(activity_names))
- self.assertIn(self.activity_støttemedlemskab.name, activity_names)
+ activities = self.browser.find_elements_by_xpath(
+ "//section[@id='open_activities']/table/tbody/tr"
+ )
+ self.assertEqual(1, len(activities))
+ self.assertEqual(1, len(activities))
+ self.assertEqual(
+ self.activity_støttemedlemskab.name,
+ activities[0].find_element_by_xpath("td[@data-label='Aktivitet']").text,
+ )
+ self.assertEqual(
+ self.activity_støttemedlemskab.union.name,
+ activities[0].find_element_by_xpath("td[@data-label='Forening']").text,
+ )
diff --git a/members/views/ActivitySignup.py b/members/views/ActivitySignup.py
index 7f00d561..4a5874ec 100644
--- a/members/views/ActivitySignup.py
+++ b/members/views/ActivitySignup.py
@@ -176,7 +176,7 @@ def ActivitySignup(request, activity_id, person_id=None):
payment.save()
return_link_url = payment.get_quickpaytransaction().get_link_url(
- return_url=settings.BASE_URL # skip trailing slash
+ return_url=settings.BASE_URL
+ reverse("activity_view_person", args=[activity.id, person.id])
)
diff --git a/members/views/Membership.py b/members/views/Membership.py
index 34fcee65..f49c1ba6 100644
--- a/members/views/Membership.py
+++ b/members/views/Membership.py
@@ -40,7 +40,7 @@ def Membership(request):
{
"id": curActivity.id,
"name": curActivity.name,
- "department": curActivity.department,
+ "union": curActivity.union,
"persons": applicablePersons,
}
)
diff --git a/members/views/SupportMembership.py b/members/views/SupportMembership.py
index 4050d3c5..06659dd9 100644
--- a/members/views/SupportMembership.py
+++ b/members/views/SupportMembership.py
@@ -40,7 +40,7 @@ def SupportMembership(request):
{
"id": curActivity.id,
"name": curActivity.name,
- "department": curActivity.department,
+ "union": curActivity.union,
"persons": applicablePersons,
}
)
From 40b5fb69177400350408f1d88414d0c18713b914 Mon Sep 17 00:00:00 2001
From: Jarl Friis
Date: Mon, 7 Jun 2021 12:39:37 +0200
Subject: [PATCH 6/9] Bugs/681 departments skal ikke vise headermenu (#682)
* Red: iframe view shall not showheader
* Green: Fix #681. iframe view shall not showheader
Co-authored-by: Jakob Libak Rasmussen <31068308+JakobLibak@users.noreply.github.com>
---
members/templates/members/base.html | 4 +++-
members/tests/test_functional/test_department_list.py | 1 +
members/views/departmentView.py | 3 ++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/members/templates/members/base.html b/members/templates/members/base.html
index dad86715..c69e80ae 100644
--- a/members/templates/members/base.html
+++ b/members/templates/members/base.html
@@ -27,15 +27,17 @@
- {% include "members/header.html" %}
+ {% if not skip_context %} {% include "members/header.html" %} {% endif %}
{% block content %}{% endblock %}
+ {% if not skip_context %}
+ {% endif %}
|