Merge pull request browsermedia#683 from jamesprior/master

browsermedia#665 do not show remove button for sections that cannot be removed from ...

Author: peakpg

app/models/cms/section_node.rb

@@ -78,6 +78,10 @@ def page?
  def link?
  node_type == 'Cms::Link'
  end
+ 
+ def deletable?
+ !self.root? && (!section? || node.deletable?)
+ end
 
  # @param [Section] section
  # @param [Integer] position

app/views/cms/section_nodes/_row_buttons.html.erb

@@ -7,5 +7,5 @@
  <!--<li><%= link_to("Hide", "#", class: 'add-link') unless section_node.root? %></li>-->
  <li><%= link_to 'Remove', engine_aware_path(section_node.node),
  class: 'add-link http_delete confirm_with_title',
- title: "Are you sure you want to remove #{section_node.node.name}?" unless section_node.root? %></li>
+ title: "Are you sure you want to remove #{section_node.node.name}?" if section_node.deletable? %></li>
 </ul>

lib/cms/acts/cms_user.rb

@@ -100,11 +100,11 @@ def cms_access?
  # Return a list of the sections associated with this user that can be viewed.
  # Overridden from user so that able_to_view? will work correctly.
  def viewable_sections
- @viewable_sections ||= Cms::Section.find(:all, :include => :groups, :conditions => ["#{Cms::Group.table_name}.id in (?)", cms_groups.collect(&:id)])
+ @viewable_sections ||= Cms::Section.includes(:groups).where(["#{Cms::Group.table_name}.id in (?)", cms_groups.collect(&:id)])
  end
 
  def permissions
- @permissions ||= Cms::Permission.find(:all, :include => :groups, :conditions => ["#{Cms::Group.table_name}.id in (?)", cms_groups.collect(&:id)])
+ @permissions ||= Cms::Permission.includes(:groups).where(["#{Cms::Group.table_name}.id in (?)", cms_groups.collect(&:id)])
  end
 
  def able_to_edit?(section)