Download as
Browse Code »

Commit 4d7446b107cc4ae0f5947efbbeac48f3df7220eb

Authored by Antonio Terceiro
2 parents b78517b8 2e0c06a0
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'fix-id-passing-content-viewer' into 'stable' 

Fix id passing on content viewer

See merge request !329
Showing 1 changed file with 3 additions and 3 deletions   Show diff stats
app/views/content_viewer/_article_toolbar.rhtml
  Diff comments   View file @4d7446b
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 10
11 <% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) && !remove_content_button(:delete)%> 11 <% if @page != profile.home_page && !@page.has_posts? && @page.allow_delete?(user) && !remove_content_button(:delete)%>
12 <% content = content_tag( 'span', _('Delete') ) %> 12 <% content = content_tag( 'span', _('Delete') ) %>
13 - <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page}) %> 13 + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'destroy', :id => @page.id}) %>
14 <% options = {:method => :post, :confirm => delete_article_message(@page)} %> 14 <% options = {:method => :post, :confirm => delete_article_message(@page)} %>
15 <%= expirable_button @page, :delete, content, url, options %> 15 <%= expirable_button @page, :delete, content, url, options %>
16 <% end %> 16 <% end %>
@@ -19,9 +19,9 @@ @@ -19,9 +19,9 @@
19 <% content = content_tag( 'span', _('Spread this') ) %> 19 <% content = content_tag( 'span', _('Spread this') ) %>
20 <% url = nil %> 20 <% url = nil %>
21 <% if profile.kind_of?(Person) %> 21 <% if profile.kind_of?(Person) %>
22 - <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page }) %> 22 + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish', :id => @page.id }) %>
23 <% elsif profile.kind_of?(Community) && environment.portal_community %> 23 <% elsif profile.kind_of?(Community) && environment.portal_community %>
24 - <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page }) %> 24 + <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'publish_on_portal_community', :id => @page.id }) %>
25 <% end %> 25 <% end %>
26 <%= expirable_button @page, :spread, content, url if url %> 26 <%= expirable_button @page, :spread, content, url if url %>
27 <% end %> 27 <% end %>