Merge branch 'galaRequests' into 'master'

eticketListView: product id instead of eticket id

See merge request ae/Sith!257

core/utils.py

@@ -189,9 +189,7 @@ def doku_to_markdown(text):
                 except:
                     new_text.append("> " * quote_level)
                 line = line.replace(quote.group(0), "")
-            final_quote_level = (
+            final_quote_level = quote_level  # Store quote_level to use at the end, since it will be modified during quit iteration
-                quote_level
-            )  # Store quote_level to use at the end, since it will be modified during quit iteration
             final_newline = False
             for quote in quit:  # Quit quotes (support multiple at a time)
                 line = line.replace(quote.group(0), "")
@@ -240,9 +238,7 @@ def bbcode_to_markdown(text):
                 except:
                     new_text.append("> " * quote_level)
                 line = line.replace(quote.group(0), "")
-            final_quote_level = (
+            final_quote_level = quote_level  # Store quote_level to use at the end, since it will be modified during quit iteration
-                quote_level
-            )  # Store quote_level to use at the end, since it will be modified during quit iteration
             final_newline = False
             for quote in quit:  # Quit quotes (support multiple at a time)
                 line = line.replace(quote.group(0), "")

counter/templates/counter/eticket_list.jinja

@@ -10,7 +10,7 @@
 <h3>{% trans %}Eticket list{% endtrans %}</h3>
 <ul>
     {% for t in eticket_list  %}
-    <li><a href="{{ url('counter:edit_eticket', eticket_id=t.id) }}">{{ t }}</a> (ID: {{ t.id }} | Hash: <code>{{ t.secret }}</code>)</li>
+    <li><a href="{{ url('counter:edit_eticket', eticket_id=t.id) }}">{{ t }}</a> (ID: {{ t.product.id }} | Hash: <code>{{ t.secret }}</code>)</li>
     {% endfor %}
 </ul>
 {% else %}

counter/views.py

@@ -278,8 +278,8 @@ class CounterMain(
     template_name = "counter/counter_main.jinja"
     pk_url_kwarg = "counter_id"
     form_class = (
-        GetUserForm
+        GetUserForm  # Form to enter a client code and get the corresponding user id
-    )  # Form to enter a client code and get the corresponding user id
+    )
     current_tab = "counter"
 
     def post(self, request, *args, **kwargs):

launderette/views.py

@@ -345,9 +345,7 @@ class LaunderetteMainClickView(CanEditMixin, BaseFormView, DetailView):
     model = Launderette
     pk_url_kwarg = "launderette_id"
     template_name = "counter/counter_main.jinja"
-    form_class = (
+    form_class = GetLaunderetteUserForm  # Form to enter a client code and get the corresponding user id
-        GetLaunderetteUserForm
-    )  # Form to enter a client code and get the corresponding user id
 
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()

sith/settings.py

@@ -279,9 +279,7 @@ SITH_NAME = "Sith website"
 SITH_TWITTER = "@ae_utbm"
 
 # AE configuration
-SITH_MAIN_CLUB_ID = (
+SITH_MAIN_CLUB_ID = 1  # TODO: keep only that first setting, with the ID, and do the same for the other clubs
-    1
-)  # TODO: keep only that first setting, with the ID, and do the same for the other clubs
 SITH_MAIN_CLUB = {
     "name": "AE",
     "unix_name": "ae",