Revert "lock the description if the discussion is locked"

This reverts commit aa0c0c9. Change-Id: Ic8f2c7a50bdb01586451e42e5116a92540603c6b Reviewed-on: https://gerrit.instructure.com/77785 Reviewed-by: Joel Hough <[email protected]> Product-Review: Joel Hough <[email protected]> QA-Review: Joel Hough <[email protected]> Tested-by: Joel Hough <[email protected]>
amulgarg · Apr 23, 2016 · 48701f2 · 48701f2
1 parent 96181d2
commit 48701f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/discussion_topics/show.html.erb b/app/views/discussion_topics/show.html.erb
@@ -206,7 +206,7 @@
         </header>
 
         <div class="discussion-section message_wrapper">
-          <div data-bind="message" class="message user_content"><%= user_content(@topic.message) unless @locked %></div>
+          <div data-bind="message" class="message user_content"><%= user_content(@topic.message) %></div>
           <% if @unlock_at && @unlock_at > Time.now && @topic.is_a?(Announcement) %>
             <div class="discussion-fyi">
               <%= t 'announcement_locked', 'The content of this announcement will not be visible to users until %{date}', :date => datetime_string(@unlock_at) %>

diff --git a/spec/integration/context_module_spec.rb b/spec/integration/context_module_spec.rb
@@ -144,7 +144,7 @@ def progression_testing(progress_by_item_link)
         get @test_url
         expect(response).to be_success
         html = Nokogiri::HTML(response.body)
-        expect(html.css('#test_content').length).to eq(0)
+        expect(html.css('#test_content').length).to eq(@test_content_length || 0)
 
         # complete first module's requirements
         p1 = @mod1.evaluate_for(@student)