Merged in [16092] from rcross@amsl.com:

    Remove ability to cancel a break session.  Fixes ietf-tools#2703.
 - Legacy-Id: 16105
Note: SVN reference [16092] has been migrated to Git commit b5850d5

Author: levkowetz

ietf/dbtemplate/urls.py

@@ -4,6 +4,6 @@
 from ietf.utils.urls import url
 
 urlpatterns = [
-    url(r'^(?P<acronym>[-a-z0-9]+)/$', views.template_list),
-    url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', views.template_edit),
+    url(r'^(?P<acronym>[-a-z0-9]+)/$', views.group_template_list),
+    url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', views.group_template_edit),
 ]

ietf/dbtemplate/views.py

@@ -9,7 +9,7 @@
 from ietf.ietfauth.utils import has_role
 
 
-def template_list(request, acronym):
+def group_template_list(request, acronym):
     group = get_object_or_404(Group, acronym=acronym)
     chairs = group.role_set.filter(name__slug='chair')
     if not has_role(request.user, "Secretariat") and not (request.user.id and chairs.filter(person__user=request.user).count()):
@@ -22,7 +22,7 @@ def template_list(request, acronym):
         })
 
 
-def template_edit(request, acronym, template_id, base_template='dbtemplate/template_edit.html', formclass=DBTemplateForm, extra_context=None):
+def group_template_edit(request, acronym, template_id, base_template='dbtemplate/template_edit.html', formclass=DBTemplateForm, extra_context=None):
     group = get_object_or_404(Group, acronym=acronym)
     chairs = group.role_set.filter(name__slug='chair')
     extra_context = extra_context or {}
@@ -46,7 +46,7 @@ def template_edit(request, acronym, template_id, base_template='dbtemplate/templ
     context.update(extra_context)
     return render(request, base_template, context)
 
-def template_show(request, acronym, template_id, base_template='dbtemplate/template_edit.html', extra_context=None):
+def group_template_show(request, acronym, template_id, base_template='dbtemplate/template_edit.html', extra_context=None):
     group = get_object_or_404(Group, acronym=acronym)
     chairs = group.role_set.filter(name__slug='chair')
     extra_context = extra_context or {}

ietf/nomcom/views.py

@@ -15,7 +15,7 @@
 
 
 from ietf.dbtemplate.models import DBTemplate
-from ietf.dbtemplate.views import template_edit, template_show
+from ietf.dbtemplate.views import group_template_edit, group_template_show
 from ietf.name.models import NomineePositionStateName, FeedbackTypeName
 from ietf.group.models import Group, GroupEvent 
 from ietf.message.models import Message
@@ -1027,15 +1027,15 @@ def edit_template(request, year, template_id):
     return_url = request.META.get('HTTP_REFERER', None)
 
     if nomcom.group.state_id=='conclude':
-        return template_show(request, nomcom.group.acronym, template_id,
+        return group_template_show(request, nomcom.group.acronym, template_id,
                              base_template='nomcom/show_template.html',
                              extra_context={'year': year,
                                             'return_url': return_url,
                                             'nomcom': nomcom,
                                             'is_chair_task' : True,
                                            })
     else:
-        return template_edit(request, nomcom.group.acronym, template_id,
+        return group_template_edit(request, nomcom.group.acronym, template_id,
                              base_template='nomcom/edit_template.html',
                              formclass=NomComTemplateForm,
                              extra_context={'year': year,

ietf/secr/meetings/views.py

@@ -534,7 +534,7 @@ def non_session_edit(request, meeting_id, schedule_name, slot_id):
 
     if request.method == 'POST':
         button_text = request.POST.get('submit', '')
-        if button_text == 'Cancel':
+        if button_text == 'Back':
             return redirect('ietf.secr.meetings.views.non_session', meeting_id=meeting_id, schedule_name=schedule_name)
 
         form = NonSessionForm(request.POST,meeting=meeting,session=session)

ietf/secr/templates/meetings/non_session.html

@@ -34,7 +34,11 @@ <h2>TimeSlots</h2>
             <td>{{ assignment.timeslot.show_location }}</td>
             <td>{{ assignment.timeslot.type }}</td>
             <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>
-            <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>
+            <td>
+              {% if not assignment.session.type.slug == "break" %}
+                <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>
+              {% endif %}
+            </td>
             <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>
           </tr>
         {% endfor %}

ietf/secr/templates/meetings/non_session_edit.html

@@ -10,7 +10,12 @@ <h2>Meeting - {{ meeting }}</h2>
              {{ form.as_table }}
            </table>
 
-             {% include "includes/buttons_save_cancel.html" %}
+            <div class="button-group">
+              <ul>
+                <li><button type="submit" name="submit" value="Save">Save</button></li>
+                <li><button type="submit" name="submit" value="Back">Back</button></li>
+              </ul>
+            </div> <!-- button-group -->
 
          </form>
 </div> <!-- module -->