Show ID from preferences was not respected in the plugin

galette · Jul 9, 2024 · 70b985f · 70b985f
1 parent 933b0de
commit 70b985f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,16 @@
-* 2021-101-29 - 1.5.0
-* Galette 0.9.6 compatible
-* Few fixes
+* 2024-07-09 - 2.1.2
+- Fix bookings filtering
+- Fix adding group on event
+- Fix editing events with an ID > 9
+
+* 2024-06-07 - 2.1.0
+- Galette 1.1.0 compatible
+
+* 2023-12-07 - 2.0.0
+
+* 2021-11-29 - 1.5.0
+- Galette 0.9.6 compatible
+- Few fixes
 
 * 2021-10-23 - 1.4.1
 - Translations

diff --git a/templates/default/activities.html.twig b/templates/default/activities.html.twig
@@ -65,7 +65,13 @@
 {% block body %}
     {% for ordre, activity in activities %}
         <tr class="{{ loop.index is odd ? 'odd' : 'even' }}">
-            <td class="right" data-scope="id">{{ ordre + 1 + (filters.current_page - 1) * numrows }}</td>
+            <td class="right" data-scope="id">
+                {% if preferences.pref_show_id %}
+                    {{ activity.getId() }}
+                {% else %}
+                    {{ ordre + 1 + (filters.current_page - 1) * numrows }}
+                {% endif %}
+            </td>
             <td class="nowrap username_row" data-scope="row">
                 {% set aid = activity.getId() %}
                 <a href="{{ url_for("events_activity_edit", {"id": aid}) }}">{{ activity.getName() }}</a>

diff --git a/templates/default/bookings.html.twig b/templates/default/bookings.html.twig
@@ -157,7 +157,13 @@
     {% for ordre, booking in bookings_list %}
         {% set rclass = booking.getRowClass() %}
                 <tr>
-                    <td class="{{ rclass }} right" data-scope="id">{{ ordre + 1 + (filters.current_page - 1) * numrows }}</td>
+                    <td class="{{ rclass }} right" data-scope="id">
+                        {% if preferences.pref_show_id %}
+                            {{ booking.getId() }}
+                        {% else %}
+                            {{ ordre + 1 + (filters.current_page - 1) * numrows }}
+                        {% endif %}
+                    </td>
                     <td class="{{ rclass }} nowrap username_row" data-scope="row">
                         {% set bid = booking.getId() %}
         {% if login.isAdmin() or login.isStaff() or (login.isGroupManager() and booking.getEvent().getGroup() in login.managed_groups) %}

diff --git a/templates/default/events.html.twig b/templates/default/events.html.twig
@@ -68,7 +68,11 @@
         {% for ordre, event in events %}
     <tr class="{{ loop.index is odd ? 'odd' : 'even' }}">
         <td class="right" data-scope="id">
-            {{ ordre + 1 + (filters.current_page - 1) * numrows }}
+            {% if preferences.pref_show_id %}
+                {{ event.getId() }}
+            {% else %}
+                {{ ordre + 1 + (filters.current_page - 1) * numrows }}
+            {% endif %}
         </td>
         <td class="nowrap username_row" data-scope="row">
             {% set eid = event.getId() %}