Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions rdmo/projects/templates/projects/projects_pagination.html

This file was deleted.

24 changes: 0 additions & 24 deletions rdmo/projects/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@

from django.contrib.auth.models import User
from django.contrib.sites.models import Site
from django.http import QueryDict

from rdmo.core.tests.utils import compute_checksum

from ..filters import ProjectFilter
from ..models import Invite, Project, Value
from ..utils import (
compute_set_prefix_from_set_value,
copy_project,
get_invite_email_project_path,
set_context_querystring_with_filter_and_page,
)

GET_queries = [
Expand All @@ -34,27 +31,6 @@
({'set_prefix': '0|0', 'set_index': 1}, {'set_prefix': '0|0|0'}, '0|0|1'),
]

@pytest.mark.parametrize('GET_query', GET_queries)
def test_set_context_querystring_with_filter_and_page(GET_query):
querydict = QueryDict(GET_query)
filter = ProjectFilter(querydict)
context = {'filter': filter}
context = set_context_querystring_with_filter_and_page(context)

if 'page' in GET_query and 'title' in GET_query:
assert 'querystring' in context
assert context['querystring'] == 'title=project'
querydict_copy = querydict.copy()
del querydict_copy['page']
assert context['querystring'] == querydict_copy.urlencode()
elif 'page' not in GET_query and 'title' in GET_query:
assert 'querystring' in context
assert context['querystring'] == 'title=project'
elif 'page' in GET_query and 'title' not in GET_query:
assert context.get('querystring', 'not-in-context') == ''
else:
assert context.get('querystring', 'not-in-context') == 'not-in-context'


def test_copy_project(db, files):
project = Project.objects.get(id=1)
Expand Down
10 changes: 0 additions & 10 deletions rdmo/projects/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,16 +272,6 @@ def send_invite_email(request, invite):
send_mail(subject, message, to=[invite.email])


def set_context_querystring_with_filter_and_page(context: dict) -> dict:
'''prepares the filter part of the querystring for the next and previous hyperlinks in the pagination'''
if context["filter"].data:
querystring = context["filter"].data.copy()
if context["filter"].data.get('page'):
del querystring['page']
context['querystring'] = querystring.urlencode()
return context


def get_upload_accept():
accept = defaultdict(set)
for import_plugin in get_plugins('PROJECT_IMPORTS').values():
Expand Down
Loading