Skip to content

Commit 9af26ba

Browse files
committed
fix changing sort options in speedgrader; fixes #6002
Change-Id: I27e391b764bc5ad1b49cebed269f71b988e62200 Reviewed-on: https://gerrit.instructure.com/6263 Tested-by: Hudson <hudson@instructure.com> Tested-by: Selenium <selenium@instructure.com> Reviewed-by: Brian Palmer <brianp@instructure.com> Reviewed-by: Ryan Shaw <ryan@instructure.com>
1 parent 93db186 commit 9af26ba

2 files changed

Lines changed: 27 additions & 1 deletion

File tree

public/javascripts/speed_grader.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,9 @@ I18n.scoped('gradebook', function(I18n) {
332332
resizable: false,
333333
width: 400
334334
});
335+
// FF hack - when reloading the page, firefox seems to "remember" the disabled state of this
336+
// button. So here we'll manually re-enable it.
337+
this.elements.settings.form.find(".submit_button").removeAttr('disabled')
335338
this.elements.mute.modal.dialog({
336339
autoOpen: false,
337340
buttons: buttons,
@@ -349,7 +352,7 @@ I18n.scoped('gradebook', function(I18n) {
349352

350353
submitForm: function(e){
351354
$.store.userSet('eg_sort_by', $('#eg_sort_by').val());
352-
$.store.userSet('eg_hide_student_names', $("#hide_student_names").attr('checked').toString());
355+
$.store.userSet('eg_hide_student_names', $("#hide_student_names").prop('checked').toString());
353356
$(e.target).find(".submit_button").attr('disabled', true).text(I18n.t('buttons.saving_settings', "Saving Settings..."));
354357
window.location.reload();
355358
return false;

spec/selenium/speed_grader_spec.rb

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,4 +223,27 @@ def check_second_student
223223
find_with_jquery('#students_selectmenu #section-menu').should be_nil # doesn't get inserted into the menu
224224
end
225225

226+
it "should be able to change sorting and hide student names" do
227+
student_submission
228+
229+
get "/courses/#{@course.id}/gradebook/speed_grader?assignment_id=#{@assignment.id}"
230+
wait_for_ajaximations
231+
232+
driver.find_element(:id, "settings_link").click
233+
driver.find_element(:css, 'select#eg_sort_by option[value="submitted_at"]').click
234+
driver.find_element(:id, 'hide_student_names').click
235+
expect_new_page_load {
236+
driver.find_element(:css, '#settings_form .submit_button').click
237+
}
238+
driver.find_element(:css, '#combo_box_container .ui-selectmenu .ui-selectmenu-item-header').text.should == "Student 1"
239+
240+
# make sure it works a second time too
241+
driver.find_element(:id, "settings_link").click
242+
driver.find_element(:css, 'select#eg_sort_by option[value="alphabetically"]').click
243+
expect_new_page_load {
244+
driver.find_element(:css, '#settings_form .submit_button').click
245+
}
246+
driver.find_element(:css, '#combo_box_container .ui-selectmenu .ui-selectmenu-item-header').text.should == "Student 1"
247+
end
248+
226249
end

0 commit comments

Comments
 (0)