browsercms 3.0.6 → 3.1.0

data/app/helpers/cms/menu_helper.rb

@@ -21,8 +21,15 @@ module Cms
     # * <tt>:target</tt> - The target attribute for the link
     # * <tt>:children</tt> - An array of hashes containing the child menu items. This is where the
     #   tree structure comes in.
+    #
+    # Edge Cases:
+    #   If both @page and :items are nil/empty, this will return an empty string. This might happen if used on an CMS
+    #   rendered page, where @page isn't set.
+    #
     def render_menu(options = {})
       options[:items] ||= menu_items(options)
+      return "" unless options[:items]
+
       options[:partial] ||= "cms/menus/menu"
       options[:id] ||= "menu"
       options[:class] ||= "menu"
@@ -123,12 +130,16 @@ module Cms
           node = section_node.node
           
           item = {}
-          item[:selected] = true if selected_page == node
           item[:id] = "#{section_node.node_type.underscore}_#{section_node.node_id}"
           
           # If we are showing a section item, we want to use the path for the first page
           page = section_node.section? ? node.first_page_or_link : node
-          
+          if section_node.section? && page
+            item[:selected] = true if page.hidden? && selected_page == page
+          else
+            item[:selected] = true if selected_page == page
+          end
+         
           item[:url] = page && page.path || '#'
           item[:name] = node.name
           item[:target] = "_blank" if page.respond_to?(:new_window?) && page.new_window?

data/app/helpers/cms/page_helper.rb

@@ -34,8 +34,27 @@ module Cms
     def cms_toolbar
       instance_variable_get("@content_for_layout")
     end
-    
+
+
+    # Renders breadcrumbs based on the current_page. This will generate an unordered list representing the
+    # current page and all it's ancestors including the root name of of the site. The UL can be styled via CSS for
+    # layout purposes. Each breadcrumb except the last will be linked to the page in question.
+    #
+    # If the current_page is nil, it will return an empty string.
+    #
+    # ==== Params:
+    #   options = A hash of options which determine how the breadcrumbs will be laid out.
+    #
+    # ==== Options:
+    # * <tt>:from_top</tt> - How many below levels from the root the tree should start at.
+    #   All sections at this level will be shown.  The default is 0, which means show all
+    #   nodes that are direct children of the root.
+    # * <tt>:show_parent</tt> - Determines if the name of the page itself show be shown as a breadcrumb link. Defaults to false, meaning
+    #   that the parent section of the current page will be the 'last' breadcrumb link. (Note: This probably better renamed as 'show_page').
+    #
     def render_breadcrumbs(options={})
+      return "" unless current_page
+
       start = options[:from_top] || 0
       show_parent = options[:show_parent].nil? ? false : options[:show_parent]
       ancestors = current_page.ancestors
@@ -63,6 +82,11 @@ module Cms
         render_connectable(portlets.first)
       end
     end
-            
+
+    # Determines if the current_user is able to do specific permissions.
+    def able_to?(*perms, &block)
+      yield if current_user.able_to?(*perms)
+    end
+
   end
 end

data/app/helpers/cms/rendering_helper.rb

@@ -0,0 +1,42 @@
+##
+# Provides specific helper methods to render content blocks and connectors.
+# Split off from Cms::ApplicationController so it can be included in Cms::Acts::ContentPage
+#
+module Cms
+  module RenderingHelper
+    def render_connector_and_connectable(connector, connectable)
+      if logged_in? && @mode == "edit" && current_user.able_to_edit?(connector.page)
+        render :partial => 'cms/pages/edit_connector',
+               :locals => { :connector => connector, :connectable => connectable}
+      else
+        render_connectable(connectable)
+      end
+    end
+
+    def render_connectable(content_block)
+      if content_block
+        if content_block.class.renderable?
+          logger.info "..... Rendering connectable #{content_block.class} ##{content_block.id} #{"v#{content_block.version}" if content_block.respond_to?(:version)}"
+          content_block.perform_render(@controller)
+        else
+          logger.warn "Connectable #{content_block.class} ##{content_block.id} is not renderable"
+        end
+      else
+        logger.warn "Connectable is null"
+      end
+    rescue Exception => e
+      logger.error "Error occurred while rendering #{content_block.class}##{content_block.id}: #{e.message}\n#{e.backtrace.join("\n")}"
+      "ERROR: #{e.message}"
+    end
+
+    ##
+    # Renders the toolbar for the CMS. All page templates need to include this or they won't be editable.
+    # Typically rendered as an iframe to avoid CSS/JS conflicts.
+    #
+    # @param [Symbol] tab Which tab of the dashboard to highlight. Defaults to :dashboard.
+    #
+    def render_cms_toolbar(tab=:dashboard)
+      render :partial => 'layouts/cms_toolbar', :locals => {:tab => tab}
+    end
+  end
+end

data/app/models/forgot_password_mailer.rb

@@ -0,0 +1,12 @@
+class ForgotPasswordMailer < ActionMailer::Base
+
+  def reset_password(link, email)
+    @subject    = "Account Management"
+    @body[:url] = link
+    @recipients = email
+    @from       = 'do_not_reply@domain.com'
+    @sent_on    = Time.now
+    template "cms/forgot_password_mailer/reset_password"
+  end
+
+end

data/app/models/guest_user.rb

@@ -15,10 +15,18 @@ class GuestUser < User
     group && group.permissions.count(:conditions => ["name in (?)", name.map(&:to_s)]) > 0
   end
   
-  def able_to_view?(page)
-    group && !!(group.sections.include?(page.section))
+  # Guests never get access to the CMS.
+  # Overridden from user so that able_to_view? will work correctly.
+  def cms_access?
+    false
   end
-  
+
+  # 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
+    group.sections
+  end
+
   def able_to_edit?(section)
     false
   end

data/app/models/page.rb

@@ -42,7 +42,7 @@ class Page < ActiveRecord::Base
     end 
   }  
   
-  has_one :section_node, :as => :node
+  has_one :section_node, :as => :node, :dependent => :destroy
   
   has_many :tasks
   

data/app/models/page_template.rb

@@ -1,4 +1,5 @@
 class PageTemplate < DynamicView
+  include Templates
 
   validates_format_of :name, :with => /\A[a-z]+[a-z0-9_]*\Z/, :message => "can only contain lowercase letters, numbers and underscores and must begin with a lowercase letter"
 
@@ -14,24 +15,6 @@ class PageTemplate < DynamicView
     File.join(base_path, relative_path)
   end
   
-  def self.default_body
-    html = <<HTML
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    <title><%= page_title %></title>
-    <%= yield :html_head %>
-  </head>
-  <body>
-    <%= cms_toolbar %>
-    <%= container :main %>
-  </body>
-</html>
-HTML
-    html
-  end
-  
   def self.display_name(file_name)
     name, format, handler = file_name.split('.')
     "#{name.titleize} (#{format}/#{handler})"

data/app/models/portlet.rb

@@ -83,9 +83,11 @@ class Portlet < ActiveRecord::Base
     @default_template_path ||= "portlets/#{name.tableize.sub('_portlets','')}/render"
   end
 
+  # Called by 'render' to determine if this portlet should render itself using a file (render.html.erb) or using
+  # its 'template' attribute.
   def inline_options
     options = {}
-    options[:inline] = self.template if self.class.render_inline 
+    options[:inline] = self.template if self.class.render_inline && !(self.template.nil? || self.template.blank?)
     options[:type] = self.handler unless self.handler.blank?
     options
   end
@@ -94,6 +96,13 @@ class Portlet < ActiveRecord::Base
     define_method(:handler) { handler_type }
   end
 
+  # Determines if the template editor in the CMS UI will be enabled when creating or editing instances of this portlet
+  # If enabled, the portlet will use the template code stored in the database. If not, it will render from the render.html.erb
+  # file created.
+  def self.enable_template_editor (enabled)
+    render_inline enabled
+  end
+
   def self.render_inline(*args)
     if args.length > 0
       @render_inline = args.first

data/app/models/section.rb

@@ -1,10 +1,10 @@
 class Section < ActiveRecord::Base
 
   flush_cache_on_change
-  
+
   #The node that links this section to its parent
-  has_one :node, :class_name => "SectionNode", :as => :node
-  
+  has_one :node, :class_name => "SectionNode", :as => :node, :dependent => :destroy
+
   #The nodes that link this section to its children
   has_many :child_nodes, :class_name => "SectionNode"
   has_many :child_sections, :class_name => "SectionNode", :conditions => ["node_type = ?", "Section"], :order => 'section_nodes.position'
@@ -14,34 +14,34 @@ class Section < ActiveRecord::Base
 
   has_many :group_sections
   has_many :groups, :through => :group_sections
-  
+
   named_scope :root, :conditions => ['root = ?', true]
   named_scope :system, :conditions => {:name => 'system'}
-  
+
   named_scope :hidden, :conditions => {:hidden => true}
   named_scope :not_hidden, :conditions => {:hidden => false}
-  
+
   named_scope :named, lambda{|name| {:conditions => ['sections.name = ?', name]}}
   named_scope :with_path, lambda{|path| {:conditions => ['sections.path = ?', path]}}
-  
+
   validates_presence_of :name, :path
   #validates_presence_of :parent_id, :if => Proc.new {root.count > 0}, :message => "section is required"
-  
+
   # Disabling '/' in section name for interoperability with FCKEditor file browser
   validates_format_of :name, :with => /\A[^\/]*\Z/, :message => "cannot contain '/'"
-  
+
   validate :path_not_reserved
-  
+
   before_destroy :deletable?
-  
+
   attr_accessor :full_path
-  
+
   def visible_child_nodes(options={})
     children = child_nodes.of_type(["Section", "Page", "Link"]).all(:order => 'section_nodes.position')
     visible_children = children.select{|sn| sn.visible?}
     options[:limit] ? visible_children[0...options[:limit]] : visible_children
   end
-  
+
   def all_children_with_name
     child_sections.map do |s|
       if s.node
@@ -50,27 +50,27 @@ class Section < ActiveRecord::Base
       end
     end.flatten.compact
   end
-  
+
   def parent_id
     parent ? parent.id : nil
   end
-  
+
   def parent
     node ? node.section : nil
   end
-  
+
   def parent_id=(sec_id)
     self.parent = Section.find(sec_id)
   end
-  
+
   def parent=(sec)
     if node
       node.move_to_end(sec)
     else
       build_node(:node => self, :section => sec)
-    end      
-  end  
-  
+    end
+  end
+
   def ancestors(options={})
     ancs = node ? node.ancestors : []
     options[:include_self] ? ancs + [self] : ancs
@@ -88,27 +88,27 @@ class Section < ActiveRecord::Base
       node.move_to_end(section)
     end
   end
-  
+
   def public?
     !!(groups.find_by_code('guest'))
   end
-  
+
   def empty?
     child_nodes.reject{|n| n.orphaned?}.empty?
   end
-  
+
   def deletable?
     !root? && empty?
   end
-  
+
   def editable_by_group?(group)
     group.editable_by_section(self)
   end
-  
+
   def status
     public? ? :unlocked : :locked
   end
-  
+
   def self.find_by_name_path(name_path)
     section = Section.root.first
     children = name_path.split("/")[1..-1] || []
@@ -117,18 +117,18 @@ class Section < ActiveRecord::Base
     end
     section
   end
-  
+
   #The first page that is a decendent of this section
   def first_page_or_link
-    section_node = child_nodes.of_type(['Link','Page']).first(:order => "section_nodes.position")
+    section_node = child_nodes.of_type(['Link', 'Page']).first(:order => "section_nodes.position")
     return section_node.node if section_node
-    sections.each do |s| 
+    sections.each do |s|
       node = s.first_page_or_link
       return node if node
     end
     nil
   end
-    
+
   def actual_path
     if root?
       "/"
@@ -136,12 +136,20 @@ class Section < ActiveRecord::Base
       p = first_page_or_link
       p ? p.path : "#"
     end
-  end  
-  
+  end
+
   def path_not_reserved
     if Cms.reserved_paths.include?(path)
       errors.add(:path, "is invalid, '#{path}' a reserved path")
     end
   end
-      
+
+  ##
+  # Set which groups are allowed to access this section.
+  # @params [Symbol] code Set of groups to allow (Options :all, :none) Defaults to :none
+  def allow_groups=(code=:none)
+    if code == :all
+      self.groups = Group.all
+    end
+  end
 end

data/app/models/task.rb

@@ -1,4 +1,5 @@
 class Task < ActiveRecord::Base
+  include Cms::DomainSupport
   belongs_to :assigned_by, :class_name => "User"
   belongs_to :assigned_to, :class_name => "User"
   belongs_to :page
@@ -27,41 +28,46 @@ class Task < ActiveRecord::Base
   end
   
   protected
-    def mark_other_tasks_for_the_same_page_as_complete
-      self.class.other_than(self).incomplete.all.each do |t|
-        t.mark_as_complete!
-      end
+  def mark_other_tasks_for_the_same_page_as_complete
+    self.class.for_page(self.page_id.to_i).other_than(self).incomplete.all.each do |t|
+      t.mark_as_complete!
     end
+  end
   
-    def send_email
-      #Hmm... what if the assign_by or assign_to don't have email addresses?
-      #For now we'll say just don't send an email and log that as a warning
-      if assigned_by.email.blank?
-        logger.warn "Can't send email for task because assigned by user #{assigned_by.login}:#{assigned_by.id} has no email address"
-      elsif assigned_to.email.blank?
-        logger.warn "Can't send email for task because assigned to user #{assigned_to.login}:#{assigned_to.id} has no email address"
+  def send_email
+    #Hmm... what if the assign_by or assign_to don't have email addresses?
+    #For now we'll say just don't send an email and log that as a warning
+    if assigned_by.email.blank?
+      logger.warn "Can't send email for task because assigned by user #{assigned_by.login}:#{assigned_by.id} has no email address"
+    elsif assigned_to.email.blank?
+      logger.warn "Can't send email for task because assigned to user #{assigned_to.login}:#{assigned_to.id} has no email address"
+    else
+      if SITE_DOMAIN =~ /^www/
+        host = SITE_DOMAIN.sub(/^www\./, "#{cms_domain_prefix}.")
       else
-        email = EmailMessage.create(
-          :sender => assigned_by.email,
-          :recipients => assigned_to.email,
-          :subject => "Page '#{page.name}' has been assigned to you",
-          :body => "http://#{SITE_DOMAIN}#{page.path}\n\n#{comment}"
-        )
+        host = "#{cms_domain_prefix}.#{SITE_DOMAIN}"
       end
-      true #don't accidently return false and halt the chain
+      email = EmailMessage.create(
+                                  :sender => assigned_by.email,
+                                  :recipients => assigned_to.email,
+                                  :subject => "Page '#{page.name}' has been assigned to you",
+                                  :body => "http://#{host}#{page.path}\n\n#{comment}"
+                                  )
     end
+    true #don't accidently return false and halt the chain
+  end
   
-    def assigned_by_is_able_to_edit_or_publish_content
-      if assigned_by && !assigned_by.able_to_edit_or_publish_content?
-        errors.add(:assigned_by_id, "cannot assign tasks")
-      end
+  def assigned_by_is_able_to_edit_or_publish_content
+    if assigned_by && !assigned_by.able_to_edit_or_publish_content?
+      errors.add(:assigned_by_id, "cannot assign tasks")
     end
+  end
 
-    def assigned_to_is_able_to_edit_or_publish_content
-      if assigned_to && !assigned_to.able_to_edit_or_publish_content?
-        errors.add(:assigned_to_id, "cannot be assigned tasks")
-      end
+  def assigned_to_is_able_to_edit_or_publish_content
+    if assigned_to && !assigned_to.able_to_edit_or_publish_content?
+      errors.add(:assigned_to_id, "cannot be assigned tasks")
     end
+  end
 
   
 end