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

Fixes #1577.  Fix Back and Cancel buttons in recording views.
 - Legacy-Id: 8889
Note: SVN reference [8855] has been migrated to Git commit 83c3393c0c

ietf/secr/proceedings/views.py

@@ -653,6 +653,10 @@ def recording_edit(request, meeting_num, name):
     meeting = get_object_or_404(Meeting, number=meeting_num)
     
     if request.method == 'POST':
+        button_text = request.POST.get('submit', '')
+        if button_text == 'Cancel':
+            return redirect("proceedings_recording", meeting_num=meeting_num)
+            
         form = RecordingEditForm(request.POST, instance=recording)
         if form.is_valid():
             # save record and rebuild proceedings

ietf/secr/templates/proceedings/recording.html

@@ -34,7 +34,12 @@
        {{ form.as_table }}
        </table>
 
-       {% include "includes/buttons_submit_back.html" %}
+        <div class="button-group">
+          <ul>
+            <li><button type="submit" name="submit" value="Submit">Submit</button></li>
+            <li><button type="button" onclick="window.location='../'">Back</button></li>
+          </ul>
+        </div> <!-- button-group -->
  
        </form>
      <div class="inline-related">