Skip to content

Commit b5850d5

Browse files
committed
Remove ability to cancel a break session. Fixes ietf-tools#2703. Commit ready for merge.
- Legacy-Id: 16092
1 parent 4196612 commit b5850d5

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

ietf/secr/meetings/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@ def non_session_edit(request, meeting_id, schedule_name, slot_id):
534534

535535
if request.method == 'POST':
536536
button_text = request.POST.get('submit', '')
537-
if button_text == 'Cancel':
537+
if button_text == 'Back':
538538
return redirect('ietf.secr.meetings.views.non_session', meeting_id=meeting_id, schedule_name=schedule_name)
539539

540540
form = NonSessionForm(request.POST,meeting=meeting,session=session)

ietf/secr/templates/meetings/non_session.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ <h2>TimeSlots</h2>
3434
<td>{{ assignment.timeslot.show_location }}</td>
3535
<td>{{ assignment.timeslot.type }}</td>
3636
<td><a href="{% url "ietf.secr.meetings.views.non_session_edit" meeting_id=meeting.number schedule_name=schedule.name slot_id=assignment.timeslot.id %}">Edit</a></td>
37-
<td><a href="{% url "ietf.secr.meetings.views.non_session_cancel" meeting_id=meeting.number schedule_name=schedule.name slot_id=assignment.timeslot.id %}">Cancel</a></td>
37+
<td>
38+
{% if not assignment.session.type.slug == "break" %}
39+
<a href="{% url "ietf.secr.meetings.views.non_session_cancel" meeting_id=meeting.number schedule_name=schedule.name slot_id=assignment.timeslot.id %}">Cancel</a>
40+
{% endif %}
41+
</td>
3842
<td><a href="{% url "ietf.secr.meetings.views.non_session_delete" meeting_id=meeting.number schedule_name=schedule.name slot_id=assignment.timeslot.id %}">Delete</a></td>
3943
</tr>
4044
{% endfor %}

ietf/secr/templates/meetings/non_session_edit.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ <h2>Meeting - {{ meeting }}</h2>
1010
{{ form.as_table }}
1111
</table>
1212

13-
{% include "includes/buttons_save_cancel.html" %}
13+
<div class="button-group">
14+
<ul>
15+
<li><button type="submit" name="submit" value="Save">Save</button></li>
16+
<li><button type="submit" name="submit" value="Back">Back</button></li>
17+
</ul>
18+
</div> <!-- button-group -->
1419

1520
</form>
1621
</div> <!-- module -->

0 commit comments

Comments
 (0)