mgabarda.com / upvcarshare
Project for the UPV to develop an app like BlaBlaCar but only for UPV people.
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'develop'

Marcos Gabarda fb6e8a11 869a94b9

+4 -4
+4 -4
upvcarshare/templates/journeys/templatetags/join_leave_button.html
··· 1 1 {% load i18n %} 2 2 {% load journeys_tags %} 3 3 {% if not journey_item.needs_driver and not journey_item|is_passenger:request.user and journey_item.are_there_free_places %} 4 - <form method="post" action="{% url "journeys:join" journey_item.pk %}" join-journey-form journey-id="{{ journey_item.pk }}"> 4 + <form method="post" action="{% url "journeys:join" journey_item.pk %}" {% if journey_item.has_recurrence %}join-journey-form journey-id="{{ journey_item.pk }}"{% endif %}> 5 5 {% csrf_token %} 6 6 <input type="hidden" name="return_to" value="{{ request.path }}"> 7 7 {% if journey_item.disabled or passenger.status == UNKNOWN or passenger.status == REJECTED %} ··· 17 17 <input type="hidden" name="join_to" value="one"> 18 18 <button type="submit" class="btn btn-success">{% trans "Unirse" %}</button> 19 19 {% else %} 20 + {# --- START modal for all or one journey --- #} 21 + {% include "journeys/blocks/join.all.one.html" %} 22 + {# --- END for all or one journey --- #} 20 23 <input type="hidden" name="join_to" ng-value="joinToValue"> 21 24 <button type="submit" class="btn btn-success">{% trans "Unirse" %}</button> 22 25 {% endif %} ··· 29 32 <button type="submit" class="btn btn-danger">{% trans "Abandonar" %}</button> 30 33 </form> 31 34 {% endif %} 32 - {# --- START modal for all or one journey --- #} 33 - {% include "journeys/blocks/join.all.one.html" %} 34 - {# --- END for all or one journey --- #}