Download as
Browse Code »

Commit 4fc10504003b0caa91f53bdd2774360784514ca1

Authored by Antonio Terceiro
1 parent 84cf9e58
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

ActionItem862: don't allow to remove homepage from public view

Showing 2 changed files with 10 additions and 1 deletions   Show diff stats
app/views/content_viewer/view_page.rhtml
  Diff comments   View file @4fc1050
... ... @@ -36,9 +36,11 @@
36 36 { :controller => 'cms', :action => 'edit', :id => @page },
37 37 :class => 'button with-text icon-edit' %>
38 38 <% if !(profile.kind_of?(Enterprise) && environment.enabled?('disable_cms')) %>
39   - <%= link_to content_tag( 'span', _('Delete') ),
  39 + <% if @page != profile.home_page %>
  40 + <%= link_to content_tag( 'span', _('Delete') ),
40 41 { :controller => 'cms', :action => 'destroy', :id => @page },
41 42 :class => 'button with-text icon-delete' %>
  43 + <% end %>
42 44 <% if profile.kind_of?(Person) && !environment.enabled?('disable_cms') %>
43 45 <%= link_to content_tag( 'span', _('Spread this') ),
44 46 { :controller => 'cms', :action => 'publish', :id => @page },
... ...
test/functional/content_viewer_controller_test.rb
  Diff comments   View file @4fc1050
... ... @@ -596,6 +596,13 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
596 596 assert_tag :tag => 'a', :content => 'Delete', :attributes => {:href => "/myprofile/#{profile.identifier}/cms/destroy/#{t.id}"}
597 597 end
598 598  
  599 + should 'not display delete button for homepage' do
  600 + login_as(profile.identifier)
  601 + page = profile.home_page
  602 + get :view_page, :profile => profile.identifier, :page => page.explode_path
  603 + assert_no_tag :tag => 'a', :content => 'Delete', :attributes => { :href => "/myprofile/#{profile.identifier}/cms/destroy/#{page.id}" }
  604 + end
  605 +
599 606 should 'add meta tag to rss feed on view blog' do
600 607 login_as(profile.identifier)
601 608 a = Blog.create!(:name => 'article folder', :profile => profile)
... ...