properly persist disable announcement comments setting.

fixes CNVS-3810

when re-enabling comments on course announcements, properly
persist that change.

test plan:
  * disable announcement comments on a course;
  * re-enable announcement comments on a course;
  * verify that the setting persists across page loads.

Change-Id: I8c89ca793bc7baa97e0ce11056f739917de4300f
Reviewed-on: https://gerrit.instructure.com/17632
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>

Author: zachpendleton

app/controllers/courses_controller.rb

@@ -1311,7 +1311,7 @@ def update
       params[:course][:event] = :offer if params[:offer].present?
 
       lock_announcements = params[:course].delete(:lock_all_announcements)
-      if lock_announcements
+      if value_to_boolean(lock_announcements)
         @course.lock_all_announcements = true
         Announcement.update_all(['workflow_state = ?', 'locked'],
           :context_type => 'Course', :context_id => @course.id, :workflow_state => 'active')

app/models/announcement.rb

@@ -39,7 +39,7 @@ def infer_content
   def respect_context_lock_rules
     lock if active? &&
             context.is_a?(Course) &&
-            context.settings[:lock_all_announcements]
+            context.lock_all_announcements?
   end
   protected :respect_context_lock_rules
 

app/views/courses/settings.html.erb

@@ -208,16 +208,6 @@ TEXT
           </div>
         </td>
       </tr>
-      <tr>
-        <th scope="row" style="width: 10%;">
-          <%= before_label('announcements', 'Announcements') %>
-        </th>
-        <td>
-          <div class="course_info announcement_lock_set">
-            <%= @context.settings[:lock_all_announcements] ? t(:comments_disabled, 'Comments disabled') : t(:comments_enabled, 'Comments enabled') %>
-          </div>
-        </td>
-      </tr>
       <tr>
         <th scope="row" style="vertical-align: top; width: 10%;"><%= f.blabel :license, :en => "License" %></th>
         <td colspan="3">
@@ -260,15 +250,13 @@ TEXT
           </span>
           <a href="#" class="course_form course_form_more_options_link" style="padding-left: 20px;"><%= t('links.more_options', %{more options}) %></a>
           <div class="course_form_more_options" style="display: none; padding-left: 20px;">
-            <% f.fields_for :settings do |settings| %>
-              <% if @context.self_enrollment_allowed? %>
-                <%= f.check_box :self_enrollment, :class => 'self_enrollment_checkbox' %>
-                <%= f.label :self_enrollment, :en => "Let students self-enroll by sharing with them a secret URL or code" %><br/>
-                <div class="open_enrollment_holder" style="display: none;">
-                <%= f.check_box :open_enrollment %>
-                <%= f.label :open_enrollment, :en => "Add a \"Join this Course\" link to the course home page" %><br/>
-                </div>
-              <% end %>
+            <% if @context.self_enrollment_allowed? %>
+              <%= f.check_box :self_enrollment, :class => 'self_enrollment_checkbox' %>
+              <%= f.label :self_enrollment, :en => "Let students self-enroll by sharing with them a secret URL or code" %><br/>
+              <div class="open_enrollment_holder" style="display: none;">
+              <%= f.check_box :open_enrollment %>
+              <%= f.label :open_enrollment, :en => "Add a \"Join this Course\" link to the course home page" %><br/>
+              </div>
             <% end %>
             <%= f.check_box :allow_student_forum_attachments %>
             <%= f.label :allow_student_forum_attachments, :en => "Let students attach files to discussions" %><br/>
@@ -282,7 +270,7 @@ TEXT
             <%= f.label :hide_final_grades, :en => "Hide totals in student grades summary" %><br/>
             <%= f.check_box :hide_distribution_graphs %>
             <%= f.label :hide_distribution_graphs, :en => "Hide grade distribution graphs from students" %><br/>
-            <%= check_box_tag 'course[lock_all_announcements]', 1, @context.settings[:lock_all_announcements], :class => 'lock_all_announcements' %>
+            <%= f.check_box :lock_all_announcements %>
             <%= label_tag :course_lock_all_announcements, :en => 'Disable comments on announcements' %><br />
             <label for="course_default_wiki_editing_roles">
               <%= f.select :default_wiki_editing_roles, [

spec/controllers/courses_controller_spec.rb

@@ -689,7 +689,7 @@
       course_with_teacher_logged_in(:active_all => true)
       @course.lock_all_announcements = true
       @course.save!
-      put 'update', :id => @course.id, :course => { }
+      put 'update', :id => @course.id, :course => { :lock_all_announcements => 0 }
       assigns[:course].lock_all_announcements.should be_false
     end