-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #171 from Teknologforeningen/feature/list-groupmem…
…berships-per-person Feature: List group memberships per person
- Loading branch information
Showing
22 changed files
with
348 additions
and
178 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
{% extends "home.html" %} | ||
|
||
{% block content %} | ||
<div class="row"> | ||
<div class="col-12 col-md-10 offset-md-1 col-lg-8 offset-lg-2"> | ||
<h3 class="page-header"> | ||
Medlemmar av | ||
{% if is_staff %} | ||
<a class="admin-link" href="{% url 'admin:group_type' group_type.id %}">{{ group_type.name }}</a> | ||
{% else %} | ||
{{ group_type.name }} | ||
{% endif %} | ||
</h3> | ||
{{ group_type.comment|linebreaks }} | ||
<table class="table table-sm table-striped"> | ||
<thead> | ||
<tr> | ||
<th> | ||
<span class="order-by attribute default-order">Namn</span> | ||
<a class="fas fa-expand-arrows-alt" href="{% url 'katalogen:groups' group_type.id %}" title="Visa gruppmandat per undergrupp"></a> | ||
</th> | ||
<th><span class="order-by attribute">Datum</span></th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
{% for member, duration in group_membership_durations %} | ||
<tr> | ||
<td order-data="{{ member.public_full_name_for_sorting }}"><a href="{% url 'katalogen:profile' member.id %}">{{ member.public_full_name }}</a></td> | ||
<td order-data="{{ duration.to_sort_string }}">{{ duration }}</td> | ||
</tr> | ||
{% endfor %} | ||
</tbody> | ||
</table> | ||
</div> | ||
</div> | ||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
|
||
from rest_framework import status | ||
from api.tests import BaseAPITest | ||
|
||
class GetPageTests(): | ||
def test_get_for_anonymous_users(self): | ||
response = self.get_all() | ||
self.check_status_code(response, status.HTTP_302_FOUND) | ||
self.assertTrue(response.url.startswith('/login/'), response.url) | ||
|
||
def test_get_for_user(self): | ||
self.login_user() | ||
response = self.get_all() | ||
self.check_status_code(response, status.HTTP_200_OK) | ||
|
||
|
||
class SearchTests(BaseAPITest): | ||
path1 = '/search/?q=Svakar' | ||
path2 = '/search/?q=Sverker' | ||
|
||
def test_search_for_user(self): | ||
# Test redirect if only one Member was found | ||
self.api_path = self.path1 | ||
self.login_user() | ||
response = self.get_all() | ||
self.check_status_code(response, status.HTTP_302_FOUND) | ||
self.assertEqual(f'/members/{self.m1.id}/', response.url) | ||
|
||
def test_search_for_superuser(self): | ||
self.api_path = self.path1 | ||
self.login_superuser() | ||
response = self.get_all() | ||
self.check_status_code(response, status.HTTP_302_FOUND) | ||
self.assertEqual(f'/members/{self.m1.id}/', response.url) | ||
|
||
def test_search_hidden_name_for_user(self): | ||
# Test that hidden Members are not found by their non-preferred given name | ||
self.api_path = self.path2 | ||
self.login_user() | ||
response = self.get_all() | ||
self.check_status_code(response, status.HTTP_200_OK) | ||
self.assertNotContains(response, "Svakar") | ||
self.assertNotContains(response, "Sverker") | ||
|
||
def test_search_hidden_name_for_superuser(self): | ||
self.api_path = self.path2 | ||
self.login_superuser() | ||
response = self.get_all() | ||
self.check_status_code(response, status.HTTP_200_OK) | ||
self.assertNotContains(response, "Svakar") | ||
self.assertNotContains(response, "Sverker") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.