Skip to content
This repository was archived by the owner on Nov 26, 2025. It is now read-only.

Commit 18ada1e

Browse files
authored
Add conversations count to feedback icons (#442)
* Add conversations count to feedback icons * Reset the feedback button color when all tasks are completed
1 parent d095a5b commit 18ada1e

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

qgis-app/plugins/templates/plugins/plugin_detail.html

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,21 @@ <h2>{{ object.name }}
329329
<td>{{ version.created_on|local_timezone }}</td>
330330
{% if user.is_staff or user in version.plugin.approvers or user in version.plugin.editors %}<td><form method="post" action="{% url "version_manage" object.package_name version.version %}">{% csrf_token %}
331331
{% if user.is_staff or user in version.plugin.approvers %}
332-
{% if not version.approved %}<button class="btn btn-success btn-mini" type="submit" name="version_approve" id="version_approve"title="{% trans "Approve" %}"><i class="icon-thumbs-up icon-white"></i></button>{% else %}<button class="btn btn-warning btn-mini" type="submit" name="version_unapprove" id="version_unapprove" title="{% trans "Unapprove" %}"><i class="icon-thumbs-down icon-white"></i></button>{% endif %}
332+
{% if not version.approved %}
333+
<button class="btn btn-success btn-mini" type="submit" name="version_approve" id="version_approve"title="{% trans "Approve" %}">
334+
<i class="icon-thumbs-up icon-white"></i>
335+
</button>
336+
{% else %}
337+
<button class="btn btn-warning btn-mini" type="submit" name="version_unapprove" id="version_unapprove" title="{% trans "Unapprove" %}">
338+
<i class="icon-thumbs-down icon-white"></i></button>
339+
{% endif %}
333340
{% endif %}
334-
<a class="btn {% if version.feedback.exists %}btn-warning{% else %}btn-primary{% endif %} btn-mini"
335-
href="{% url "version_feedback" object.package_name version.version %}" title="{% trans "Feedback" %}"><i class="icon-comments icon-white"></i>
341+
<a class="btn {% if version.feedback|feedbacks_not_completed|length >= 1 %}btn-warning{% else %}btn-primary{% endif %} btn-mini"
342+
href="{% url "version_feedback" object.package_name version.version %}" title="{% trans "Feedback" %}">
343+
<i class="icon-comments icon-white"></i>
344+
{% if version.feedback|feedbacks_not_completed|length >= 2 %}
345+
{{ version.feedback|feedbacks_not_completed|length }}
346+
{% endif %}
336347
</a>
337348
{% if user.is_staff or user in version.plugin.editors %}
338349
<a class="btn btn-primary btn-mini" href="{% url "version_update" object.package_name version.version %}" title="{% trans "Edit" %}"><i class="icon-pencil icon-white"></i></a>&nbsp;<a class="btn btn-danger btn-mini delete" href="{% url "version_delete" object.package_name version.version %}" title="{% trans "Delete" %}"><i class="icon-remove icon-white"></i></a>{% endif %}</form>

qgis-app/plugins/templatetags/plugin_utils.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,7 @@ def _validate_image(file_path):
5656
return True
5757
except (FileNotFoundError, UnidentifiedImageError):
5858
return False
59+
60+
@register.filter
61+
def feedbacks_not_completed(feedbacks):
62+
return feedbacks.filter(is_completed=False)

0 commit comments

Comments
 (0)