klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-26 11:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'galaRequests' into 'master'

Browse Source 
eticketListView: product id instead of eticket id

See merge request ae/Sith!257
This commit is contained in:
Antoine Bartuccio 2019-11-05 11:23:52 +01:00
commit 129f2e53ee
5 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/utils.py
View File

@ -189,9 +189,7 @@ def doku_to_markdown(text):
except: except:
new_text.append("> " * quote_level) new_text.append("> " * quote_level)
line = line.replace(quote.group(0), "") 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 final_newline = False
for quote in quit: # Quit quotes (support multiple at a time) for quote in quit: # Quit quotes (support multiple at a time)
line = line.replace(quote.group(0), "") line = line.replace(quote.group(0), "")
@ -240,9 +238,7 @@ def bbcode_to_markdown(text):
except: except:
new_text.append("> " * quote_level) new_text.append("> " * quote_level)
line = line.replace(quote.group(0), "") 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 final_newline = False
for quote in quit: # Quit quotes (support multiple at a time) for quote in quit: # Quit quotes (support multiple at a time)
line = line.replace(quote.group(0), "") line = line.replace(quote.group(0), "")

2
counter/templates/counter/eticket_list.jinja
View File

@ -10,7 +10,7 @@
<h3>{% trans %}Eticket list{% endtrans %}</h3> <h3>{% trans %}Eticket list{% endtrans %}</h3>
<ul> <ul>
{% for t in eticket_list %} {% 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 %} {% endfor %}
</ul> </ul>
{% else %} {% else %}

4
counter/views.py
View File

@ -278,8 +278,8 @@ class CounterMain(
template_name = "counter/counter_main.jinja" template_name = "counter/counter_main.jinja"
pk_url_kwarg = "counter_id" pk_url_kwarg = "counter_id"
form_class = ( 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" current_tab = "counter"
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):

4
launderette/views.py
View File

@ -345,9 +345,7 @@ class LaunderetteMainClickView(CanEditMixin, BaseFormView, DetailView):
model = Launderette model = Launderette
pk_url_kwarg = "launderette_id" pk_url_kwarg = "launderette_id"
template_name = "counter/counter_main.jinja" 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): def get(self, request, *args, **kwargs):
self.object = self.get_object() self.object = self.get_object()

4
sith/settings.py
View File

@ -279,9 +279,7 @@ SITH_NAME = "Sith website"
SITH_TWITTER = "@ae_utbm" SITH_TWITTER = "@ae_utbm"
# AE configuration # 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 = { SITH_MAIN_CLUB = {
"name": "AE", "name": "AE",
"unix_name": "ae", "unix_name": "ae",