DA - change warning dialog (quiz/discussion/calendar event)

fixes CNVS-16105

test plan:
 * setup DA
 * as a teacher
 * for each of the following
   - quiz
   - discussion
   - calendar event
 - create a new one with at least one section
   without an override
 > the warning dialog should match the new one for DA
   (http://f.cl.ly/items/2C0t2w0738220R2Z3N39/Image%202014-09-30%20at%205.00.32%20PM.png)
 - edit it and make sure there is at least one section
   without an override (same as before)
 > the warning dialog should be the new one as well

 * with DA off
   - the dialog should be the old version in all cases

Change-Id: I7b8ca6d35533d7a85f11e0cd1c2582d76dc39da7
Reviewed-on: https://gerrit.instructure.com/42368
Reviewed-by: Mike Nomitch <mnomitch@instructure.com>
QA-Review: Amber Taniuchi <amber@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Hilary Scharton <hilary@instructure.com>
This commit is contained in:
Cameron Sutter 2014-10-07 14:54:14 -06:00
parent 5a3b91a25d
commit dfd74af43a
4 changed files with 7 additions and 2 deletions

View File

@ -98,6 +98,7 @@ define [
$fields = $('[name*=start_date]:visible').filter -> $(this).val() is ''
if $fields.length > 0 then $fields else true
labelFn : (input) -> $(input).parents('tr').prev().find('label').text()
da_enabled: ENV.DIFFERENTIATED_ASSIGNMENTS_ENABLED
success : ($dialog) =>
$dialog.dialog('close')
@$el.disableWhileLoading @model.save eventData, success: =>

View File

@ -207,6 +207,7 @@ htmlEscape, DiscussionTopic, Announcement, Assignment, $, preventDefault, Missin
missingDateDialog = new MissingDateDialog
validationFn: -> sections
labelFn: (section) -> section.get 'name'
da_enabled: ENV?.DIFFERENTIATED_ASSIGNMENTS_ENABLED
success: =>
missingDateDialog.$dialog.dialog('close').remove()
@model.get('assignment')?.setNullDates()

View File

@ -49,6 +49,7 @@ class CalendarEventsController < ApplicationController
add_crumb(t('crumbs.new', "New Calendar Event"), named_context_url(@context, :new_context_calendar_event_url))
@event.update_attributes!(params.slice(:title, :start_at, :end_at, :location_name, :location_address))
@editing = true
js_env(:DIFFERENTIATED_ASSIGNMENTS_ENABLED => @context.feature_enabled?(:differentiated_assignments))
authorized_action(@event, @current_user, :create)
end
@ -76,6 +77,7 @@ class CalendarEventsController < ApplicationController
@event.update_attributes!(params.slice(:title, :start_at, :end_at, :location_name, :location_address))
end
@editing = true
js_env(:DIFFERENTIATED_ASSIGNMENTS_ENABLED => @context.feature_enabled?(:differentiated_assignments))
if authorized_action(@event, @current_user, :update_content)
render :action => 'new'
end

View File

@ -1602,6 +1602,7 @@ define([
var missingDateView = new MissingDateDialog({
validationFn: function(){ return sections },
labelFn: function( section ) { return section.get('name')},
da_enabled: ENV.DIFFERENTIATED_ASSIGNMENTS_ENABLED,
success: function(){
missingDateView.$dialog.dialog('close').remove();
missingDateView.remove();
@ -3861,8 +3862,8 @@ define([
if (isShowingResults()) {
$('.show_quiz_results_options').show();
// CA options:
//
// What we'd like to do is show/hide the date-pickers based on the
//
// What we'd like to do is show/hide the date-pickers based on the
// "Let Students See The Correct Answers" option, and disable them
// if we're showing results just once ("Only Once After Each Attempt"):
correctAnswerVisibility.showDatePickers(correctAnswerVisibility.isOn());