Allow administrators to unhide diary entries, if they wish

diff --git a/app/abilities/ability.rb b/app/abilities/ability.rb
index 1106d843e8e141772ffcee162be7c1148611cca9..a663dc4becebb88c29cc3adf30b0dbe2a00199d5 100644 (file)
--- a/app/abilities/ability.rb
+++ b/app/abilities/ability.rb
@@ -51,7 +51,7 @@ class Ability
         end
 
         if user.administrator?
         end
 
         if user.administrator?

-          can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
+          can [:hide, :unhide, :hidecomment], [DiaryEntry, DiaryComment]

           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:set_status, :delete, :index], User
           can [:index, :show, :resolve, :ignore, :reopen], Issue
           can :create, IssueComment
           can [:set_status, :delete, :index], User

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index 1e113e09f8df406a36473be4b5b281019af044ae..41be0f7ea7dd0c1babe89abfa6a6474c26b803c6 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -214,6 +214,12 @@ class DiaryEntriesController < ApplicationController
     redirect_to :action => "index", :display_name => entry.user.display_name
   end
 
     redirect_to :action => "index", :display_name => entry.user.display_name
   end
 

+  def unhide
+    entry = DiaryEntry.find(params[:id])
+    entry.update(:visible => true)
+    redirect_to :action => "index", :display_name => entry.user.display_name
+  end
+

   def hidecomment
     comment = DiaryComment.find(params[:comment])
     comment.update(:visible => false)
   def hidecomment
     comment = DiaryComment.find(params[:comment])
     comment.update(:visible => false)

diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index fc1cca66e43fe7cea4217437e7c33d66d64c73cb..50b49c37f90130ebabe10477476082ce896c81ef 100644 (file)
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -39,7 +39,11 @@
 
     <% if current_user && current_user.administrator? %>
       <li>
 
     <% if current_user && current_user.administrator? %>
       <li>

-        <%= link_to t(".hide_link"), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t(".confirm") } %>
+        <% if diary_entry.visible %>
+          <%= link_to t(".hide_link"), hide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t(".confirm") } %>
+        <% else %>
+          <%= link_to t(".unhide_link"), unhide_diary_entry_path(:display_name => diary_entry.user.display_name, :id => diary_entry.id), :method => :post, :data => { :confirm => t(".confirm") } %>
+        <% end %>

       </li>
     <% end %>
   </ul>
       </li>
     <% end %>
   </ul>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 516dad37abe2b65386d7316e7f541e7a56487a33..b4cfad0912b6f78332ed4390d85e7ccc6d4e7ed8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -331,6 +331,7 @@ en:
         other: "%{count} comments"
       edit_link: Edit this entry
       hide_link: Hide this entry
         other: "%{count} comments"
       edit_link: Edit this entry
       hide_link: Hide this entry

+      unhide_link: Unhide this entry

       confirm: Confirm
       report: Report this entry
     diary_comment:
       confirm: Confirm
       report: Report this entry
     diary_comment:

diff --git a/config/routes.rb b/config/routes.rb
index 63ce061672a559ccdf87622093972ad5eac2800f..994d08550c8e08a42a039946195db0aa53cd4376 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -234,6 +234,7 @@ OpenStreetMap::Application.routes.draw do
   end
   post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/
   post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry
   end
   post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/
   post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry

+  post "/user/:display_name/diary/:id/unhide" => "diary_entries#unhide", :id => /\d+/, :as => :unhide_diary_entry

   post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment
   post "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :as => :diary_entry_subscribe, :id => /\d+/
   post "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/
   post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment
   post "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :as => :diary_entry_subscribe, :id => /\d+/
   post "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/

diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 71684c65e74366e8235010b6ba1504f479f6abee..6011de9abd3b2414c2e6cff5a832854ccdf1d858 100644 (file)
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -85,6 +85,10 @@ class DiaryEntriesControllerTest < ActionController::TestCase
       { :path => "/user/username/diary/1/hide", :method => :post },
       { :controller => "diary_entries", :action => "hide", :display_name => "username", :id => "1" }
     )
       { :path => "/user/username/diary/1/hide", :method => :post },
       { :controller => "diary_entries", :action => "hide", :display_name => "username", :id => "1" }
     )

+    assert_routing(
+      { :path => "/user/username/diary/1/unhide", :method => :post },
+      { :controller => "diary_entries", :action => "unhide", :display_name => "username", :id => "1" }
+    )

     assert_routing(
       { :path => "/user/username/diary/1/hidecomment/2", :method => :post },
       { :controller => "diary_entries", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" }
     assert_routing(
       { :path => "/user/username/diary/1/hidecomment/2", :method => :post },
       { :controller => "diary_entries", :action => "hidecomment", :display_name => "username", :id => "1", :comment => "2" }


@@ -750,6 +754,33 @@ class DiaryEntriesControllerTest < ActionController::TestCase
     assert_equal false, DiaryEntry.find(diary_entry.id).visible
   end
 
     assert_equal false, DiaryEntry.find(diary_entry.id).visible
   end
 

+  def test_unhide
+    user = create(:user)
+
+    # Try without logging in
+    diary_entry = create(:diary_entry, :user => user, :visible => false)
+    post :unhide,
+         :params => { :display_name => user.display_name, :id => diary_entry.id }
+    assert_response :forbidden
+    assert_equal false, DiaryEntry.find(diary_entry.id).visible
+
+    # Now try as a normal user
+    post :unhide,
+         :params => { :display_name => user.display_name, :id => diary_entry.id },
+         :session => { :user => user }
+    assert_response :redirect
+    assert_redirected_to :controller => :errors, :action => :forbidden
+    assert_equal false, DiaryEntry.find(diary_entry.id).visible
+
+    # Finally try as an administrator
+    post :unhide,
+         :params => { :display_name => user.display_name, :id => diary_entry.id },
+         :session => { :user => create(:administrator_user) }
+    assert_response :redirect
+    assert_redirected_to :action => :index, :display_name => user.display_name
+    assert_equal true, DiaryEntry.find(diary_entry.id).visible
+  end
+

   def test_hidecomment
     user = create(:user)
     administrator_user = create(:administrator_user)
   def test_hidecomment
     user = create(:user)
     administrator_user = create(:administrator_user)