From 2506838d743d4c5bcbaa6bc5e0505cbb964d535b Mon Sep 17 00:00:00 2001 From: AlmubdyMutaikhan Date: Thu, 27 Mar 2025 10:15:53 +0500 Subject: [PATCH 1/5] fix: add methods to actions for UI --- ckanext/issues/plugin.py | 3 ++- dev-requirements.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ckanext/issues/plugin.py b/ckanext/issues/plugin.py index 5a491113..6d974a31 100644 --- a/ckanext/issues/plugin.py +++ b/ckanext/issues/plugin.py @@ -8,7 +8,7 @@ from ckan.lib.plugins import DefaultTranslation from ckan.plugins import implements, toolkit from ckan.lib.helpers import ckan_version -from ckanext.issues.logic.action.action import issue_search, issue_create, issue_delete, issue_comment_create, issue_show, issue_update, issue_comment_report, issue_comment_search, issue_report, issue_report_clear, organization_users_autocomplete +from ckanext.issues.logic.action.action import issue_search, issue_create, issue_delete, issue_comment_create, issue_show, issue_update, issue_comment_report, issue_report_show, issue_comment_search, issue_report, issue_report_clear, organization_users_autocomplete from ckanext.issues.views.issues import issues from ckanext.issues.views.moderation import moderation @@ -89,6 +89,7 @@ def get_blueprint(self): def get_actions(self): return { 'issue_search': issue_search, + 'issue_report_show': issue_report_show, 'issue_delete': issue_delete, 'issue_show': issue_show, 'issue_create': issue_create, diff --git a/dev-requirements.txt b/dev-requirements.txt index d06448ec..23793b8b 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,3 +1,4 @@ beautifulsoup4 lxml pytest-ckan +mock \ No newline at end of file From 0ac79cd51d386ab6a847a6f776d8c78b431747f9 Mon Sep 17 00:00:00 2001 From: Luccas Mateus Date: Mon, 5 May 2025 16:08:49 -0300 Subject: [PATCH 2/5] Rm dataset import --- ckanext/issues/auth.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ckanext/issues/auth.py b/ckanext/issues/auth.py index 859244aa..e059223a 100644 --- a/ckanext/issues/auth.py +++ b/ckanext/issues/auth.py @@ -1,4 +1,3 @@ -from ckanext.issues.tests.logic.action.test_issue import dataset from ckan import model import ckan.plugins as p from ckanext.issues import model as issue_model From a9df3d635d15cbe20eccb9599a1ca7ab036ed8a8 Mon Sep 17 00:00:00 2001 From: Luccas Mateus Date: Wed, 14 May 2025 11:04:38 -0300 Subject: [PATCH 3/5] Fix issues page --- .../templates/issues/email/new_comment.html | 18 ++-- .../templates/issues/email/new_issue.html | 16 +-- ckanext/issues/templates/issues/show.html | 101 +++++++++--------- 3 files changed, 69 insertions(+), 66 deletions(-) diff --git a/ckanext/issues/templates/issues/email/new_comment.html b/ckanext/issues/templates/issues/email/new_comment.html index 6e70dec8..52e8ec95 100644 --- a/ckanext/issues/templates/issues/email/new_comment.html +++ b/ckanext/issues/templates/issues/email/new_comment.html @@ -7,7 +7,7 @@ > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -За да одговорите на коментарот, Ве молиме видете го проблемот тука: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'. +За да одговорите на коментарот, Ве молиме видете го проблемот тука: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'. Ви благодариме, @@ -15,8 +15,8 @@ -- -Проблем: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} -Податочен сет: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} +Проблем: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +Податочен сет: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }} --- @@ -28,7 +28,7 @@ > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -Për t'ju përgjigjur komentit, ju lutemi shihni çështjen në: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, kliko 'Çështja e mbylljes'. +Për t'ju përgjigjur komentit, ju lutemi shihni çështjen në: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, kliko 'Çështja e mbylljes'. Faleminderit, @@ -37,8 +37,8 @@ -- -Problem: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} -Dataset: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} +Problem: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }} --- @@ -51,7 +51,7 @@ > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -In order to respond to the comment, please see the issue at: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. +In order to respond to the comment, please see the issue at: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. Thank you, @@ -59,5 +59,5 @@ -- -Issue: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} -Dataset: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} \ No newline at end of file +Issue: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }} diff --git a/ckanext/issues/templates/issues/email/new_issue.html b/ckanext/issues/templates/issues/email/new_issue.html index 98e4e61a..fb5a35ff 100644 --- a/ckanext/issues/templates/issues/email/new_issue.html +++ b/ckanext/issues/templates/issues/email/new_issue.html @@ -14,8 +14,8 @@ -- -Проблем: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} -Податочен сет: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} +Проблем: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +Податочен сет: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }} Корисник: {{ user.fullname or user.name }} --- @@ -25,7 +25,7 @@ Përdoruesi {{site_title}} raporton një problem me një nga grupet e të dhënave në organizatën '{{recipient.organization_title}}', në të cilën jeni {{recipient.capacity}} Seti i të dhënave është: {{ dataset.title }} -Problemi është: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} +Problemi është: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }} Përdorues: {{ user.fullname or user.name }} > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }} @@ -39,8 +39,8 @@ -- -Issue: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} -Dataset: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} +Issue: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }} User: {{ user.fullname or user.name }} --- @@ -62,6 +62,6 @@ -- -Issue: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} -Dataset: {{ h.url_for('dataset_read', id=dataset.name, qualified=True) }} -User: {{ user.fullname or user.name }} \ No newline at end of file +Issue: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }} +User: {{ user.fullname or user.name }} diff --git a/ckanext/issues/templates/issues/show.html b/ckanext/issues/templates/issues/show.html index 994155d0..42728520 100644 --- a/ckanext/issues/templates/issues/show.html +++ b/ckanext/issues/templates/issues/show.html @@ -160,7 +160,57 @@ {% endmacro %} -{% block primary_content %} +{% block secondary_content %} +
+
+
+

{{ dataset.name }}

+
+
+
+

+ + {{ _('Assignee') }} +

+
+ {% if issue.assignee %} + {{ h.gravatar((issue.assignee.email_hash), size=22) }} + {{ issue.assignee.name }} + {% elif issue.assignee_id %} + {{ _('This issue has been assigned to an administrator for the publisher') }} + {% else %} + {{ _('No one') }} + {% endif %} +
+ {% block assignee_form %} + {% if is_publisher %} +

+ + {{ _('Change Assignee') }} +

+
+
+ + {% else %} + data-module-source="/api/3/action/user_autocomplete?q=?"> + {% endif %} +
+
+ +
+
+ {% endif %} + {% endblock %} +
+
+{% endblock %} + +{% block primary_content_inner %}
@@ -238,51 +288,4 @@

{% endblock %} -{% block secondary_content %} -
-
-
-

{{ dataset.name }}

-
-
-
-

- - {{ _('Assignee') }} -

-
- {% if issue.assignee %} - {{ h.gravatar((issue.assignee.email_hash), size=22) }} - {{ issue.assignee.name }} - {% elif issue.assignee_id %} - {{ _('This issue has been assigned to an administrator for the publisher') }} - {% else %} - {{ _('No one') }} - {% endif %} -
- {% block assignee_form %} - {% if is_publisher %} -

- - {{ _('Change Assignee') }} -

-
-
- - {% else %} - data-module-source="/api/3/action/user_autocomplete?q=?"> - {% endif %} -
-
- -
-
- {% endif %} - {% endblock %} -{% endblock %} -n \ No newline at end of file + From 8256752206e4f8e9e3b1a4b1aa80cb0f8ecaf8ff Mon Sep 17 00:00:00 2001 From: Luccas Mateus Date: Wed, 14 May 2025 11:27:48 -0300 Subject: [PATCH 4/5] Fix url endpoint --- ckanext/issues/templates/issues/email/new_issue.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ckanext/issues/templates/issues/email/new_issue.html b/ckanext/issues/templates/issues/email/new_issue.html index fb5a35ff..80a3942f 100644 --- a/ckanext/issues/templates/issues/email/new_issue.html +++ b/ckanext/issues/templates/issues/email/new_issue.html @@ -6,7 +6,7 @@ > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }} > {{ issue.description|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -Ве молиме корегирајте го проблемот или додадете коментар за проблемот на следиот линк: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'. +Ве молиме корегирајте го проблемот или додадете коментар за проблемот на следиот линк: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'. Ви благодариме, @@ -31,7 +31,7 @@ > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }} > {{ issue.description|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -Korrigjoni problemin ose shtoni një koment fillestar për çështjen këtu: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, klikoni butonin 'Mbyll problemin'. +Korrigjoni problemin ose shtoni një koment fillestar për çështjen këtu: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, klikoni butonin 'Mbyll problemin'. Faleminderit, @@ -54,7 +54,7 @@ > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }} > {{ issue.description|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -Please correct the problem or add an initial comment about the issue at: {{ h.url_for('issues_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. +Please correct the problem or add an initial comment about the issue at: {{ h.url_for('issues.issue_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. Thank you, From ffca5eef22136245e662cb92fd6da50f2b60f5cf Mon Sep 17 00:00:00 2001 From: Luccas Mateus Date: Wed, 14 May 2025 11:52:11 -0300 Subject: [PATCH 5/5] Fix url --- .../issues/templates/issues/email/new_comment.html | 12 ++++++------ ckanext/issues/templates/issues/email/new_issue.html | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ckanext/issues/templates/issues/email/new_comment.html b/ckanext/issues/templates/issues/email/new_comment.html index 52e8ec95..f51d9420 100644 --- a/ckanext/issues/templates/issues/email/new_comment.html +++ b/ckanext/issues/templates/issues/email/new_comment.html @@ -7,7 +7,7 @@ > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -За да одговорите на коментарот, Ве молиме видете го проблемот тука: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'. +За да одговорите на коментарот, Ве молиме видете го проблемот тука: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'. Ви благодариме, @@ -15,7 +15,7 @@ -- -Проблем: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +Проблем: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} Податочен сет: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }} --- @@ -28,7 +28,7 @@ > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -Për t'ju përgjigjur komentit, ju lutemi shihni çështjen në: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, kliko 'Çështja e mbylljes'. +Për t'ju përgjigjur komentit, ju lutemi shihni çështjen në: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, kliko 'Çështja e mbylljes'. Faleminderit, @@ -37,7 +37,7 @@ -- -Problem: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +Problem: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }} --- @@ -51,7 +51,7 @@ > {{ comment.comment|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -In order to respond to the comment, please see the issue at: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. +In order to respond to the comment, please see the issue at: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. Thank you, @@ -59,5 +59,5 @@ -- -Issue: {{ h.url_for('issues.show_issues', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} +Issue: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }} Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }} diff --git a/ckanext/issues/templates/issues/email/new_issue.html b/ckanext/issues/templates/issues/email/new_issue.html index 80a3942f..efce3c15 100644 --- a/ckanext/issues/templates/issues/email/new_issue.html +++ b/ckanext/issues/templates/issues/email/new_issue.html @@ -54,7 +54,7 @@ > {{ issue_subject|wordwrap(width=76)|replace('\n', '\n> '|safe) }} > {{ issue.description|wordwrap(width=76)|replace('\n', '\n> '|safe) }} -Please correct the problem or add an initial comment about the issue at: {{ h.url_for('issues.issue_show', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. +Please correct the problem or add an initial comment about the issue at: {{ h.url_for('issues.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'. Thank you,