Skip to content

fix: add methods to actions for UI #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amautadev wants to merge 5 commits into
base: ckan-2.11
Choose a base branch
from
Open

fix: add methods to actions for UI #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2506838
fix: add methods to actions for UI
amautadev Mar 27, 2025
0ac79cd
Rm dataset import
luccasmmg May 5, 2025
a9df3d6
Fix issues page
luccasmmg May 14, 2025
8256752
Fix url endpoint
luccasmmg May 14, 2025
ffca5ee
Fix url
luccasmmg May 14, 2025
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
1 change: 0 additions & 1 deletion ckanext/issues/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion ckanext/issues/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
18 changes: 9 additions & 9 deletions ckanext/issues/templates/issues/email/new_comment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@

> {{ 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_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'.

Ви благодариме,

Тимот на {{ site_title }}

--

Проблем: {{ 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) }}

---

Expand All @@ -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_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Sapo çështja të jetë zgjidhur, kliko 'Çështja e mbylljes'.

Faleminderit,

Expand All @@ -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_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}
Dataset: {{ h.url_for('dataset.read', id=dataset.name, qualified=True) }}

---

Expand All @@ -51,13 +51,13 @@

> {{ 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_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'.

Thank you,

The {{ site_title }} team

--

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) }}
22 changes: 11 additions & 11 deletions ckanext/issues/templates/issues/email/new_issue.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
> {{ 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) }}. Штом проблемот е разрешен, кликнете 'Затвори проблем'.

Ви благодариме,

Тимот на {{ site_title }}

--

Проблем: {{ 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 }}

---
Expand All @@ -25,22 +25,22 @@
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) }}
> {{ 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,

{{ site_title }} ekip

--

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 }}

---
Expand All @@ -54,14 +54,14 @@
> {{ 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.show_issue', dataset_id=dataset.name, issue_number=issue.number, qualified=True) }}. Once the issue has been resolved, click 'Close issue'.

Thank you,

The {{ site_title }} team

--

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 }}
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 }}
101 changes: 52 additions & 49 deletions ckanext/issues/templates/issues/show.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,57 @@
</div>
{% endmacro %}

{% block primary_content %}
{% block secondary_content %}
<div class="module module-narrow module-shallow">
<div class="module context-info">
<div class="module-content">
<h1 class="heading">{{ dataset.name }}</h1>
<div class="nums" />
</div>
</div>
<h2 class="module-heading">
<i class="fa fa-user"></i>
{{ _('Assignee') }}
</h2>
<div id='ckanext-issues-assignee' class="module-content">
{% 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 %}
</div>
{% block assignee_form %}
{% if is_publisher %}
<h2 class="module-heading">
<i class="fa fa-edit"></i>
{{ _('Change Assignee') }}
</h2>
<form id='ckanext-issues-assign' class="dataset-form form-horizontal add-member-form" method='post' action="{{ h.url_for('issues.assign', issue_number=issue.number, dataset_id=dataset.id) }}">
<div class="controls">
<input id="assignee" type="text" name="assignee" placeholder="{{ _('Username') }}"
value="" class="control-medium" data-module="autocomplete-action-api"
{% if dataset['owner_org'] %}
data-module-source="/api/3/action/organization_users_autocomplete?organization_id={{ dataset['owner_org']}}&q=?">
{% else %}
data-module-source="/api/3/action/user_autocomplete?q=?">
{% endif %}
</div>
<div>
<button class="btn btn-sm btn-success" type="submit" name="assign">
{{ _('Assign') }}
</button>
</div>
</form>
{% endif %}
{% endblock %}
</div>
</div>
{% endblock %}

{% block primary_content_inner %}
<section class="module issue-show">
<div class="module-content">
<div class="issue-header">
Expand Down Expand Up @@ -238,51 +288,4 @@ <h1 class="page-heading">
</section>
{% endblock %}

{% block secondary_content %}
<div class="module module-narrow module-shallow">
<div class="module context-info">
<div class="module-content">
<h1 class="heading">{{ dataset.name }}</h1>
<div class="nums" />
</div>
</div>
<h2 class="module-heading">
<i class="fa fa-user"></i>
{{ _('Assignee') }}
</h2>
<div id='ckanext-issues-assignee' class="module-content">
{% 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 %}
</div>
{% block assignee_form %}
{% if is_publisher %}
<h2 class="module-heading">
<i class="fa fa-edit"></i>
{{ _('Change Assignee') }}
</h2>
<form id='ckanext-issues-assign' class="dataset-form form-horizontal add-member-form" method='post' action="{{ h.url_for('issues.assign', issue_number=issue.number, dataset_id=dataset.id) }}">
<div class="controls">
<input id="assignee" type="text" name="assignee" placeholder="{{ _('Username') }}"
value="" class="control-medium" data-module="autocomplete-action-api"
{% if dataset['owner_org'] %}
data-module-source="/api/3/action/organization_users_autocomplete?organization_id={{ dataset['owner_org']}}&q=?">
{% else %}
data-module-source="/api/3/action/user_autocomplete?q=?">
{% endif %}
</div>
<div>
<button class="btn btn-sm btn-success" type="submit" name="assign">
{{ _('Assign') }}
</button>
</div>
</form>
{% endif %}
{% endblock %}
{% endblock %}
n

1 change: 1 addition & 0 deletions dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
beautifulsoup4
lxml
pytest-ckan
mock