From f284170b7df04ae6c411bc8f875c20df118d25a3 Mon Sep 17 00:00:00 2001 From: gromdimon Date: Mon, 29 Apr 2024 18:24:44 +0200 Subject: [PATCH 1/7] Form proper names for category/project update links --- projectroles/tests/test_templatetags.py | 2 +- projectroles/utils.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projectroles/tests/test_templatetags.py b/projectroles/tests/test_templatetags.py index 4e37a91c..8af7d582 100644 --- a/projectroles/tests/test_templatetags.py +++ b/projectroles/tests/test_templatetags.py @@ -689,7 +689,7 @@ def test_get_sidebar_links_project_detail_view(self): }, { 'name': 'project-update', - 'url': f'/project/update/{self.project.sodar_uuid}', + 'url': f'/project/project/update/{self.project.sodar_uuid}', 'label': 'Update Project', 'icon': 'mdi:lead-pencil', 'active': False, diff --git a/projectroles/utils.py b/projectroles/utils.py index 2ff39bba..d58d284c 100644 --- a/projectroles/utils.py +++ b/projectroles/utils.py @@ -191,7 +191,7 @@ def get_project_app_links( 'projectroles:detail', kwargs={'project': project.sodar_uuid}, ), - 'label': 'Project Overview', + 'label': 'Overview', 'icon': ( 'mdi:rhombus-split' if project.type == PROJECT_TYPE_CATEGORY @@ -249,7 +249,7 @@ def get_project_app_links( 'projectroles:update', kwargs={'project': project.sodar_uuid}, ), - 'label': 'Update Project', + 'label': f'Update {get_display_name(project.type)}', 'icon': 'mdi:lead-pencil', 'active': self._is_active_projectroles( link_names=['update'], From e2cd178fcb90511e2a03dad0e14584302d0a61cc Mon Sep 17 00:00:00 2001 From: gromdimon Date: Mon, 29 Apr 2024 18:26:36 +0200 Subject: [PATCH 2/7] add blank line --- projectroles/tests/test_templatetags.py | 1 + 1 file changed, 1 insertion(+) diff --git a/projectroles/tests/test_templatetags.py b/projectroles/tests/test_templatetags.py index 8af7d582..392125b9 100644 --- a/projectroles/tests/test_templatetags.py +++ b/projectroles/tests/test_templatetags.py @@ -34,6 +34,7 @@ ) + app_settings = AppSettingAPI() site = import_module(settings.SITE_PACKAGE) From 17f2da580b3fab8aa0d08b42e906f4bb3e561e88 Mon Sep 17 00:00:00 2001 From: gromdimon Date: Thu, 2 May 2024 12:27:38 +0200 Subject: [PATCH 3/7] fix the failing tests --- projectroles/tests/test_views_ajax.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projectroles/tests/test_views_ajax.py b/projectroles/tests/test_views_ajax.py index 4a2e8433..6f039186 100644 --- a/projectroles/tests/test_views_ajax.py +++ b/projectroles/tests/test_views_ajax.py @@ -537,7 +537,7 @@ def test_get(self): }, { 'name': 'project-update', - 'url': f'/project/update/{self.project.sodar_uuid}', + 'url': f'/project/project/update/{self.project.sodar_uuid}', 'label': 'Update Project', 'icon': 'mdi:lead-pencil', 'active': False, @@ -603,7 +603,7 @@ def test_get_app_links(self): }, { 'name': 'project-update', - 'url': f'/project/update/{self.project.sodar_uuid}', + 'url': f'/project/project/update/{self.project.sodar_uuid}', 'label': 'Update Project', 'icon': 'mdi:lead-pencil', 'active': False, From 9d1353facf535e637d43a93126925657b92d8291 Mon Sep 17 00:00:00 2001 From: gromdimon Date: Mon, 6 May 2024 13:51:46 +0200 Subject: [PATCH 4/7] new changes --- projectroles/tests/test_templatetags.py | 1 - projectroles/utils.py | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/projectroles/tests/test_templatetags.py b/projectroles/tests/test_templatetags.py index 392125b9..8af7d582 100644 --- a/projectroles/tests/test_templatetags.py +++ b/projectroles/tests/test_templatetags.py @@ -34,7 +34,6 @@ ) - app_settings = AppSettingAPI() site = import_module(settings.SITE_PACKAGE) diff --git a/projectroles/utils.py b/projectroles/utils.py index d58d284c..6698cadd 100644 --- a/projectroles/utils.py +++ b/projectroles/utils.py @@ -191,7 +191,7 @@ def get_project_app_links( 'projectroles:detail', kwargs={'project': project.sodar_uuid}, ), - 'label': 'Overview', + 'label': f'{get_display_name(project.type, title=True)} Overview', 'icon': ( 'mdi:rhombus-split' if project.type == PROJECT_TYPE_CATEGORY @@ -249,7 +249,7 @@ def get_project_app_links( 'projectroles:update', kwargs={'project': project.sodar_uuid}, ), - 'label': f'Update {get_display_name(project.type)}', + 'label': f'Update {get_display_name(project.type, title=True)}', 'icon': 'mdi:lead-pencil', 'active': self._is_active_projectroles( link_names=['update'], @@ -274,7 +274,7 @@ def get_project_app_links( 'projectroles:create', kwargs={'project': project.sodar_uuid}, ), - 'label': 'Create Project or Category', + 'label': f'Create {get_display_name(PROJECT_TYPE_PROJECT, title=True)} or {get_display_name(PROJECT_TYPE_CATEGORY, title=True)}', 'icon': 'mdi:plus-thick', 'active': self._is_active_projectroles( link_names=['create'], @@ -291,7 +291,7 @@ def get_project_app_links( { 'name': 'project-create', 'url': reverse('projectroles:create'), - 'label': 'Create Project', + 'label': f'Create {get_display_name(PROJECT_TYPE_PROJECT, title=True)}', 'icon': 'mdi:plus-thick', 'active': self._is_active_projectroles( link_names=['create'], @@ -309,7 +309,7 @@ def get_project_app_links( { 'name': 'home-project-create', 'url': reverse('projectroles:create'), - 'label': 'Create Category', + 'label': f'Create {get_display_name(PROJECT_TYPE_CATEGORY, title=True)}', 'icon': 'mdi:plus-thick', 'active': self._is_active_projectroles( link_names=['create'], From 4c8164534db797df6a1ebed3ce677b3d6a9326ea Mon Sep 17 00:00:00 2001 From: gromdimon Date: Mon, 6 May 2024 14:00:13 +0200 Subject: [PATCH 5/7] rebase tests wip --- projectroles/tests/test_templatetags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projectroles/tests/test_templatetags.py b/projectroles/tests/test_templatetags.py index 8af7d582..4e37a91c 100644 --- a/projectroles/tests/test_templatetags.py +++ b/projectroles/tests/test_templatetags.py @@ -689,7 +689,7 @@ def test_get_sidebar_links_project_detail_view(self): }, { 'name': 'project-update', - 'url': f'/project/project/update/{self.project.sodar_uuid}', + 'url': f'/project/update/{self.project.sodar_uuid}', 'label': 'Update Project', 'icon': 'mdi:lead-pencil', 'active': False, From fc3dafa608b2ba08f57641f018d3f74bc1bdbf33 Mon Sep 17 00:00:00 2001 From: gromdimon Date: Mon, 6 May 2024 15:43:43 +0200 Subject: [PATCH 6/7] fix test --- projectroles/tests/test_views_ajax.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projectroles/tests/test_views_ajax.py b/projectroles/tests/test_views_ajax.py index 6f039186..4a2e8433 100644 --- a/projectroles/tests/test_views_ajax.py +++ b/projectroles/tests/test_views_ajax.py @@ -537,7 +537,7 @@ def test_get(self): }, { 'name': 'project-update', - 'url': f'/project/project/update/{self.project.sodar_uuid}', + 'url': f'/project/update/{self.project.sodar_uuid}', 'label': 'Update Project', 'icon': 'mdi:lead-pencil', 'active': False, @@ -603,7 +603,7 @@ def test_get_app_links(self): }, { 'name': 'project-update', - 'url': f'/project/project/update/{self.project.sodar_uuid}', + 'url': f'/project/update/{self.project.sodar_uuid}', 'label': 'Update Project', 'icon': 'mdi:lead-pencil', 'active': False, From 1e3106c17cf3912089dac3efd325e8e978fa3987 Mon Sep 17 00:00:00 2001 From: gromdimon Date: Thu, 6 Jun 2024 18:29:33 +0200 Subject: [PATCH 7/7] update strins in utils.py --- projectroles/utils.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/projectroles/utils.py b/projectroles/utils.py index 6698cadd..d52645d3 100644 --- a/projectroles/utils.py +++ b/projectroles/utils.py @@ -183,6 +183,7 @@ def get_project_app_links( ret = [] # Add project related links if project: + project_display_name = get_display_name(project.type, title=True) # Add project overview link ret.append( { @@ -191,7 +192,7 @@ def get_project_app_links( 'projectroles:detail', kwargs={'project': project.sodar_uuid}, ), - 'label': f'{get_display_name(project.type, title=True)} Overview', + 'label': f'{project_display_name} Overview', 'icon': ( 'mdi:rhombus-split' if project.type == PROJECT_TYPE_CATEGORY @@ -249,7 +250,7 @@ def get_project_app_links( 'projectroles:update', kwargs={'project': project.sodar_uuid}, ), - 'label': f'Update {get_display_name(project.type, title=True)}', + 'label': f'Update {project_display_name}', 'icon': 'mdi:lead-pencil', 'active': self._is_active_projectroles( link_names=['update'], @@ -274,7 +275,9 @@ def get_project_app_links( 'projectroles:create', kwargs={'project': project.sodar_uuid}, ), - 'label': f'Create {get_display_name(PROJECT_TYPE_PROJECT, title=True)} or {get_display_name(PROJECT_TYPE_CATEGORY, title=True)}', + 'label': 'Create ' + f'{get_display_name(PROJECT_TYPE_PROJECT, title=True)} ' + f'or {get_display_name(PROJECT_TYPE_CATEGORY, title=True)}', 'icon': 'mdi:plus-thick', 'active': self._is_active_projectroles( link_names=['create'], @@ -291,7 +294,8 @@ def get_project_app_links( { 'name': 'project-create', 'url': reverse('projectroles:create'), - 'label': f'Create {get_display_name(PROJECT_TYPE_PROJECT, title=True)}', + 'label': 'Create ' + f'{get_display_name(PROJECT_TYPE_PROJECT, title=True)}', 'icon': 'mdi:plus-thick', 'active': self._is_active_projectroles( link_names=['create'], @@ -309,7 +313,8 @@ def get_project_app_links( { 'name': 'home-project-create', 'url': reverse('projectroles:create'), - 'label': f'Create {get_display_name(PROJECT_TYPE_CATEGORY, title=True)}', + 'label': 'Create ' + f'{get_display_name(PROJECT_TYPE_CATEGORY, title=True)}', 'icon': 'mdi:plus-thick', 'active': self._is_active_projectroles( link_names=['create'],