browsercms 3.4.2 → 3.5.0.rc1

data/app/models/cms/category.rb

@@ -4,6 +4,9 @@ module Cms
     belongs_to :parent, :class_name => 'Cms::Category'
     has_many :children, :class_name => 'Cms::Category', :foreign_key => "parent_id"
     is_searchable
+
+    include DefaultAccessible
+
     validates_presence_of :category_type_id, :name
     validates_uniqueness_of :name, :scope => :category_type_id
 

data/app/models/cms/category_type.rb

@@ -1,5 +1,7 @@
 module Cms
   class CategoryType < ActiveRecord::Base
+    attr_accessible :name
+
     has_many :categories, :class_name => 'Cms::Category'
     validates_presence_of :name
     validates_uniqueness_of :name

data/app/models/cms/connector.rb

@@ -1,7 +1,10 @@
 module Cms
   class Connector < ActiveRecord::Base
+    include DefaultAccessible
+
     belongs_to :page, :class_name => 'Cms::Page'
     belongs_to :connectable, :polymorphic => true
+    attr_accessible :connectable
 
     acts_as_list :scope => "#{Connector.table_name}.page_id = \#{page_id} and #{Cms::Connector.table_name}.page_version = \#{page_version} and #{Cms::Connector.table_name}.container = '\#{container}'"
     alias :move_up :move_higher

data/app/models/cms/content_type.rb

@@ -1,5 +1,8 @@
 module Cms
   class ContentType < ActiveRecord::Base
+
+    attr_accessible :name, :group_name
+
     attr_accessor :group_name
     belongs_to :content_type_group, :class_name => 'Cms::ContentTypeGroup'
     validates_presence_of :content_type_group

data/app/models/cms/content_type_group.rb

@@ -1,5 +1,7 @@
 module Cms
   class ContentTypeGroup < ActiveRecord::Base
+    attr_accessible :name
+
     has_many :content_types, :order => "#{ContentType.table_name}.id", :class_name => 'Cms::ContentType'
 
     has_many :types, :order=>"priority, name", :class_name => 'Cms::ContentType'

data/app/models/cms/dynamic_view.rb

@@ -4,6 +4,10 @@ module Cms
     after_save :write_file_to_disk
     after_destroy :remove_file_from_disk
 
+    include DefaultAccessible
+    # Need to explicitly define these, since during new project creation, these files aren't discoverable.
+    attr_accessible :name, :body, :format, :handler
+
     scope :with_file_name, lambda { |file_name|
       conditions = {:name => nil, :format => nil, :handler => nil}
       if file_name && (parts = file_name.split(".")).size == 3

data/app/models/cms/email_message.rb

@@ -1,6 +1,8 @@
 module Cms
   class EmailMessage < ActiveRecord::Base
 
+    include DefaultAccessible
+
     scope :undelivered, :conditions => "delivered_at is null"
     validates_presence_of :recipients
     after_create :deliver_now

data/app/models/cms/file_block.rb

@@ -1,11 +1,18 @@
 module Cms
   class FileBlock < Cms::AbstractFileBlock
 
-    acts_as_content_block :belongs_to_attachment => true, :taggable => true
+    acts_as_content_block :taggable => true
+
+    has_attachment :file
+    validates_attachment_presence :file, :message => "You must upload a file"
 
     def self.display_name
       "File"
     end
 
+    # Override default behavior to handle STI class when looking up other versions of attachments.
+    def attachable_type
+      Cms::Attachment::FILE_BLOCKS
+    end
   end
-end
+end

data/app/models/cms/group.rb

@@ -3,8 +3,7 @@
 # their permissions from all groups combined represents what they can do.
 #
 class Cms::Group < ActiveRecord::Base
-
-  GUEST_CODE = "guest"
+ GUEST_CODE = "guest"
 
   has_many :user_group_memberships, :class_name => 'Cms::UserGroupMembership'
   has_many :users, :through => :user_group_memberships, :class_name => 'Cms::User'
@@ -17,6 +16,10 @@ class Cms::Group < ActiveRecord::Base
 
   belongs_to :group_type, :class_name => 'Cms::GroupType'
 
+  # :group_type might be a bad idea, but only Admins should be modifying groups anyway
+  attr_accessible :name, :code, :group_type, :permission_ids, :section_ids
+  include Cms::DefaultAccessible
+
   validates_presence_of :name
 
   scope :named, lambda { |n| {:conditions => {:name => n}} }

data/app/models/cms/group_permission.rb

@@ -1,6 +1,8 @@
 module Cms
   class GroupPermission < ActiveRecord::Base
 
+    include DefaultAccessible
+
     belongs_to :group, :class_name => 'Cms::Group'
     belongs_to :permission, :class_name => 'Cms::Permission'
 

data/app/models/cms/group_section.rb

@@ -1,5 +1,8 @@
 module Cms
   class GroupSection < ActiveRecord::Base
+
+    include DefaultAccessible
+
     belongs_to :group, :class_name => 'Cms::Group'
     belongs_to :section, :class_name => 'Cms::Section'
   end

data/app/models/cms/group_type.rb

@@ -1,5 +1,7 @@
 module Cms
   class GroupType < ActiveRecord::Base
+    attr_accessible :name, :guest, :cms_access
+
     has_many :groups, :class_name => 'Cms::Group'
     has_many :group_type_permissions, :class_name => 'Cms::GroupTypePermission'
     has_many :permissions, :through => :group_type_permissions, :class_name => 'Cms::Permission'

data/app/models/cms/group_type_permission.rb

@@ -2,5 +2,7 @@ module Cms
   class GroupTypePermission < ActiveRecord::Base
     belongs_to :group_type, :class_name => 'Cms::GroupType'
     belongs_to :permission, :class_name => 'Cms::Permission'
+
+    include DefaultAccessible
   end
 end

data/app/models/cms/html_block.rb

@@ -3,12 +3,14 @@ module Cms
 
     acts_as_content_block :taggable => true
 
+    # This shouldn't be necessary but it is for browsercms.seeds.rb'
+    attr_accessible :name, :content
+
     validates_presence_of :name
 
     # Override of search scope from searching behavior to deal with include_body
     scope :search, lambda { |search_params|
       term = search_params.is_a?(Hash) ? search_params[:term] : search_params
-      order = search_params.is_a?(Hash) && search_params[:order] ? search_params[:order] : table_name.to_s + ".name"
       include_body = search_params.is_a?(Hash) ? search_params[:include_body] : false
       conditions = []
       columns = ["name"]
@@ -26,7 +28,6 @@ module Cms
       end
       scope = {}
       scope[:conditions] = conditions if conditions
-      scope[:order] = order if order
       scope
     }
 

data/app/models/cms/image_block.rb

@@ -1,11 +1,22 @@
 module Cms
   class ImageBlock < Cms::AbstractFileBlock
 
-    acts_as_content_block :belongs_to_attachment => true, :taggable => true
+    acts_as_content_block :taggable => true
+    has_attachment :file, :styles => {:thumb => "80x80"}
+    validates_attachment_presence :file, :message => "You must upload a file"
+
 
     def self.display_name
       "Image"
     end
 
+    def image
+      file
+    end
+
+     # Override default behavior to handle STI class when looking up other versions of attachments.
+    def attachable_type
+      Cms::Attachment::FILE_BLOCKS
+    end
   end
-end
+end

data/app/models/cms/page.rb

@@ -16,6 +16,8 @@ class Cms::Page < ActiveRecord::Base
   has_many :page_routes, :class_name => 'Cms::PageRoute'
   has_many :tasks
 
+  include Cms::DefaultAccessible
+
   scope :named, lambda { |name| {:conditions => ["#{table_name}.name = ?", name]} }
   scope :with_path, lambda { |path| {:conditions => ["#{table_name}.path = ?", path]} }
 
@@ -80,6 +82,7 @@ class Cms::Page < ActiveRecord::Base
   validates_uniqueness_of :path, :scope=>:deleted
   validate :path_not_reserved
 
+  # Implements Versioning Callback.
   def after_build_new_version(new_version)
     copy_connectors(
         :from_version_number => @copy_connectors_from_version || (new_version.version - 1),
@@ -239,8 +242,16 @@ class Cms::Page < ActiveRecord::Base
     end
   end
 
-  def layout
-    template_file_name && "templates/#{template_file_name.split('.').first}"
+  # Return the layout used to render this page. Will be something like: 'templates/subpage'
+  # @param [Symbol] version Valid values are :full and :mobile.
+  def layout(version = :full)
+    folder = (version == :mobile) ? "mobile" : "templates"
+    template_file_name && "#{folder}/#{layout_name}"
+  end
+
+  # Return the file name of the template
+  def layout_name
+    template_file_name.split('.').first
   end
 
   # This will be nil if it is a file system based template
@@ -303,7 +314,7 @@ class Cms::Page < ActiveRecord::Base
     # Cache the results of this since many projects will call it repeatly on current_page in menus.
     return @top_level_section if @top_level_section
     a = ancestors
-    @top_level_section = (a.size > 0 && a[1]) ? a[1] : Section.root.first
+    @top_level_section = (a.size > 0 && a[1]) ? a[1] : Cms::Section.root.first
   end
 
   def current_task

data/app/models/cms/page_route.rb

@@ -15,10 +15,14 @@
 # Saving a new PageRoute will reload the Rails routes.
 #
 class Cms::PageRoute < ActiveRecord::Base
+
+
   belongs_to :page, :class_name => 'Cms::Page'
   has_many :conditions, :class_name => 'Cms::PageRouteCondition'
   has_many :requirements, :class_name => 'Cms::PageRouteRequirement'
 
+  include Cms::DefaultAccessible
+
   validates_presence_of :pattern, :page_id
   validates_uniqueness_of :pattern
 

data/app/models/cms/page_route_condition.rb

@@ -1,4 +1,5 @@
 module Cms
   class PageRouteCondition < Cms::PageRouteOption
+    include DefaultAccessible
   end
 end

data/app/models/cms/page_route_option.rb

@@ -1,5 +1,7 @@
 module Cms
   class PageRouteOption < ActiveRecord::Base
     belongs_to :page_route, :class_name => 'Cms::PageRoute'
+
+    include DefaultAccessible
   end
 end

data/app/models/cms/page_route_requirement.rb

@@ -1,4 +1,5 @@
 module Cms
   class PageRouteRequirement < Cms::PageRouteOption
+    include DefaultAccessible
   end
 end

data/app/models/cms/permission.rb

@@ -1,5 +1,8 @@
 module Cms
   class Permission < ActiveRecord::Base
+
+    attr_accessible :name, :full_name, :description
+
     has_many :group_permissions, :class_name => 'Cms::GroupPermission'
     has_many :groups, :through => :group_permissions, :class_name => 'Cms::Group'
 

data/app/models/cms/portlet.rb

@@ -5,9 +5,9 @@ module Cms
 
     # These are here simply to temporarily hold these values
     # Makes it easy to pass them through the process of selecting a portlet type
-    attr_accessor :connect_to_page_id, :connect_to_container
+    attr_accessor :connect_to_page_id, :connect_to_container, :controller
+    attr_accessible :connect_to_page_id, :connect_to_container, :controller, :name
 
-    attr_accessor :controller
     delegate :request, :response, :session,
              :flash, :params, :cookies,
              :current_user, :logged_in?,

data/app/models/cms/redirect.rb

@@ -2,5 +2,7 @@ module Cms
   class Redirect < ActiveRecord::Base
     validates_presence_of :from_path, :to_path
     validates_uniqueness_of :from_path
+
+    include DefaultAccessible
   end
 end

data/app/models/cms/section.rb

@@ -2,17 +2,22 @@ module Cms
   class Section < ActiveRecord::Base
     flush_cache_on_change
 
-    #The node that links this section to its parent
 
+
+    #The node that links this section to its parent
     has_one :section_node, :class_name => 'Cms::SectionNode', :as => :node, :inverse_of => :node
     SECTION = "Cms::Section"
     PAGE = "Cms::Page"
     LINK = "Cms::Link"
     VISIBLE_NODE_TYPES = [SECTION, PAGE, LINK]
 
+    include DefaultAccessible
+    attr_accessible :allow_groups, :group_ids
+
     include Cms::Addressable
     include Cms::Addressable::NodeAccessors
 
+
     # Cannot use dependent => :destroy to do this. Ancestry's callbacks trigger before the before_destroy callback.
     #   So sections would always get deleted since deletable? would return true
     after_destroy :destroy_node
@@ -172,6 +177,15 @@ module Cms
       nil
     end
 
+    # Returns the path for this section with a trailing slash
+    def prependable_path
+      if path.ends_with?("/")
+        path
+      else
+        "#{path}/"
+      end
+    end
+
     def actual_path
       if root?
         "/"

data/app/models/cms/section_node.rb

@@ -1,6 +1,7 @@
 require 'ancestry'
 
 class Cms::SectionNode < ActiveRecord::Base
+  attr_accessible :node, :section, :parent, :node_id, :node_type
   has_ancestry
 
   # This is the parent section for this node

data/app/models/cms/site.rb

@@ -1,5 +1,8 @@
 module Cms
   class Site < ActiveRecord::Base
+
+    attr_accessible :name, :domain
+
     validates_uniqueness_of :domain
 
     before_validation :remove_www

data/app/models/cms/tag.rb

@@ -1,6 +1,8 @@
 module Cms
   class Tag < ActiveRecord::Base
+
     has_many :taggings, :class_name => 'Cms::Tagging'
+    include DefaultAccessible
 
     validates_uniqueness_of :name
 

data/app/models/cms/tagging.rb

@@ -3,6 +3,9 @@ module Cms
     belongs_to :tag, :class_name => 'Cms::Tag'
     belongs_to :taggable, :polymorphic => true, :class_name => 'Cms::Taggable', :foreign_type => 'taggable_type'
 
+    include DefaultAccessible
+    attr_accessible :tag, :taggable
+
     def content_type
       Cms::ContentType.first(:conditions => {:name => taggable_type})
     end

data/app/models/cms/task.rb

@@ -1,5 +1,6 @@
 module Cms
   class Task < ActiveRecord::Base
+
     CANT_ASSIGN_MESSAGE = "must have permission to assign tasks"
     CANT_BE_ASSIGNED_MESSAGE = "must have permission to be assigned tasks"
     include Cms::DomainSupport
@@ -7,6 +8,9 @@ module Cms
     belongs_to :assigned_to, :class_name => 'Cms::User'
     belongs_to :page, :class_name => 'Cms::Page'
 
+    include DefaultAccessible
+    attr_accessible :assigned_by, :assigned_to, :page
+
     after_create :mark_other_tasks_for_the_same_page_as_complete
     after_create :send_email
 
@@ -45,7 +49,7 @@ module Cms
       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
-        domain = SITE_DOMAIN
+        domain = Rails.configuration.cms.site_domain
         if domain =~ /^www/
           host = domain.sub(/^www\./, "#{cms_domain_prefix}.")
         else

data/app/models/cms/user.rb

@@ -2,6 +2,7 @@ require 'digest/sha1'
 
 module Cms
   class User < ActiveRecord::Base
+
     include Cms::Authentication::Model
 
     validates_presence_of :login
@@ -15,7 +16,6 @@ module Cms
     validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :message => "should be an email address, ex. xx@xx.com"
     attr_accessible :login, :email, :name, :first_name, :last_name, :password, :password_confirmation, :expires_at
 
-
     has_many :user_group_memberships, :class_name => 'Cms::UserGroupMembership'
     has_many :groups, :through => :user_group_memberships, :class_name => 'Cms::Group'
     has_many :tasks, :foreign_key => "assigned_to_id", :class_name => 'Cms::Task'