Including article name in delete confirmation message

* Included alert confirmation to delete link on content viewer and cms. * Removed the destroy page, since it was useless. Pair-programmed with: Rodrigo Souto <rodrigo@colivre.coop.br> (ActionItem1524)

Including article name in delete confirmation message
* Included alert confirmation to delete link on content viewer and cms. * Removed the destroy page, since it was useless. Pair-programmed with: Rodrigo Souto <rodrigo@colivre.coop.br> (ActionItem1524)
Larissa Reis · Rodrigo Souto
1 parent 7d22740a
Showing 6 changed files with 21 additions and 16 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/application_helper.rb
app/helpers/cms_helper.rb
app/views/content_viewer/_article_toolbar.rhtml
test/functional/cms_controller_test.rb
test/unit/cms_helper_test.rb
@@ -206,6 +206,7 @@ class CmsController &lt; MyProfileController
     @article = profile.articles.find(params[:id])
     if request.post?
       @article.destroy
+      session[:notice] = _("\"#{@article.name}\" was removed.")
       redirect_to :action => (@article.parent ? 'view' : 'index'), :id => @article.parent
     end
   end
@@ -1327,4 +1327,11 @@ module ApplicationHelper
     end
   end
+  def delete_article_message(article)
+    if article.folder?
+      _("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")
+    else
+      _("Are you sure that you want to remove the item \"#{article.name}\"?")
+    end
+  end
 end
@@ -49,12 +49,6 @@ module CmsHelper
   end
   def display_delete_button(article)
-    confirm_message = if article.folder?
-        _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!')
-      else
-        _('Are you sure that you want to remove this item?')
-      end
-
-    button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => confirm_message
+    button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
   end
 end
@@ -8,8 +8,10 @@
         <% if !(profile.kind_of?(Enterprise) && environment.enabled?('disable_cms')) %>
           <% if @page != profile.home_page && !@page.has_posts? %>
             <%= link_to content_tag( 'span', _('Delete') ),
-              profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page }),
-              :class => 'button with-text icon-delete' %>
+              profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}), 
+              :method => :post,
+              :class => 'button with-text icon-delete',
+              :confirm => delete_article_message(@page) %>
           <% end %>
           <% if !environment.enabled?('disable_cms') && !@page.folder? %>
             <% if profile.kind_of?(Person) %>
@@ -902,9 +902,8 @@ class CmsControllerTest &lt; Test::Unit::TestCase
   should 'offer confirmation to remove article' do
     a = profile.articles.create!(:name => 'my-article')
-    get :destroy, :profile => profile.identifier, :id => a.id
-    assert_response :success
-    assert_tag :tag => 'input', :attributes => {:type => 'submit', :value => 'Yes, I want.' }
+    post :destroy, :profile => profile.identifier, :id => a.id
+    assert_response :redirect
   end
   should 'display notify comments option' do
@@ -82,8 +82,9 @@ class CmsHelperTest &lt; Test::Unit::TestCase
   should 'display delete_button to folder' do
     profile = fast_create(Profile)
-    folder = fast_create(Folder, :name => 'My folder', :profile_id => profile.id)
-    confirm_message = 'Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!'
+    name = 'My folder'
+    folder = fast_create(Folder, :name => name, :profile_id => profile.id)
+    confirm_message = "Are you sure that you want to remove the folder \"#{name}\"? Note that all the items inside it will also be removed!"
     expects(:button_without_text).with(:delete, 'Delete', {:action => 'destroy', :id => folder.id}, :method => :post, :confirm => confirm_message)
     result = display_delete_button(folder)
@@ -91,8 +92,9 @@ class CmsHelperTest &lt; Test::Unit::TestCase
   should 'display delete_button to article' do
     profile = fast_create(Profile)
-    article = fast_create(TinyMceArticle, :name => 'My article', :profile_id => profile.id)
-    confirm_message = 'Are you sure that you want to remove this item?'
+    name = 'My article'
+    article = fast_create(TinyMceArticle, :name => name, :profile_id => profile.id)
+    confirm_message = "Are you sure that you want to remove the item \"#{name}\"?"
     expects(:button_without_text).with(:delete, 'Delete', {:action => 'destroy', :id => article.id}, :method => :post, :confirm => confirm_message)
     result = display_delete_button(article)
	@@ -1327,4 +1327,11 @@ module ApplicationHelper		@@ -1327,4 +1327,11 @@ module ApplicationHelper
1327	end	1327	end
1328	end	1328	end
1329		1329
		1330	+ def delete_article_message(article)
		1331	+ if article.folder?
		1332	+ _("Are you sure that you want to remove the folder \"#{article.name}\"? Note that all the items inside it will also be removed!")
		1333	+ else
		1334	+ _("Are you sure that you want to remove the item \"#{article.name}\"?")
		1335	+ end
		1336	+ end
1330	end	1337	end
	@@ -49,12 +49,6 @@ module CmsHelper		@@ -49,12 +49,6 @@ module CmsHelper
49	end	49	end
50		50
51	def display_delete_button(article)	51	def display_delete_button(article)
52	- confirm_message = if article.folder?
53	- _('Are you sure that you want to remove this folder? Note that all the items inside it will also be removed!')
54	- else
55	- _('Are you sure that you want to remove this item?')
56	- end
57	-
58	- button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => confirm_message	52	+ button_without_text :delete, _('Delete'), { :action => 'destroy', :id => article.id }, :method => :post, :confirm => delete_article_message(article)
59	end	53	end
60	end	54	end