browsercms 3.5.7 → 4.0.0.alpha

data/app/controllers/cms/tags_controller.rb

@@ -1,16 +1,16 @@
 module Cms
-class TagsController < Cms::ContentBlockController
-  def index
-    load_blocks
-    respond_to do |format| 
-      format.html { render "#{template_directory}/index" }
-      format.js { render :inline => "var tags = #{@blocks.map{|e| e.name}.to_json}" }
+  class TagsController < Cms::ContentBlockController
+    def index
+      load_blocks
+      respond_to do |format|
+        format.html
+        format.json { render :inline => @blocks.map { |e| e.name }.to_json }
+      end
     end
+
+    def show
+      redirect_to tags_path
+    end
+
   end
-  
-  def show
-    redirect_to cms_tags_url
-  end
-  
 end
-end

data/app/controllers/cms/tasks_controller.rb

@@ -1,57 +1,56 @@
 module Cms
-class TasksController < Cms::BaseController
-  
-  before_filter :set_toolbar_tab
-  before_filter :load_page, :only => [:new, :create]
-  
-  def new
-    @task = @page.tasks.build(:assigned_by => current_user)
-  end
-  
-  def create
-    @task = @page.tasks.build(params[:task])
-    @task.assigned_by = current_user
-    if @task.save
-      flash[:notice] = "Page was assigned to '#{@task.assigned_to.login}'"
-      redirect_to @page.path
-    else
-      render :action => 'new'
+  class TasksController < Cms::BaseController
+
+    before_filter :load_page, :only => [:new, :create]
+
+    def new
+      @task = @page.tasks.build(:assigned_by => current_user)
     end
-  end
-  
-  def complete
-    if params[:task_ids]
-      Task.all(:conditions => ["id in (?)", params[:task_ids]]).each do |t|
-        if t.assigned_to == current_user
-          t.mark_as_complete!
-        end
+
+    def create
+      @task = @page.tasks.build(task_params())
+      @task.assigned_by = current_user
+      if @task.save
+        flash[:notice] = "Page was assigned to '#{@task.assigned_to.login}'"
+        redirect_to @page.path
+      else
+        render :action => 'new'
       end
-      flash[:notice] = "Tasks marked as complete"
-      redirect_to dashboard_path
-    else
-      @task = Task.find(params[:id])
-      if @task.assigned_to == current_user
-        if @task.mark_as_complete!
-          flash[:notice] = "Task was marked as complete"
+    end
+
+    def complete
+      if params[:task_ids]
+        Task.where(["id in (?)", params[:task_ids]]).each do |t|
+          if t.assigned_to == current_user
+            t.mark_as_complete!
+          end
         end
+        flash[:notice] = "Tasks marked as complete"
+        redirect_to dashboard_path
       else
-        flash[:error] = "You cannot complete tasks that are not assigned to you"
+        @task = Task.find(params[:id])
+        if @task.assigned_to == current_user
+          if @task.mark_as_complete!
+            flash[:notice] = "Task was marked as complete"
+          end
+        else
+          flash[:error] = "You cannot complete tasks that are not assigned to you"
+        end
+        redirect_to @task.page.path
       end
-      redirect_to @task.page.path
+    rescue ActiveRecord::RecordNotFound
+      flash[:error] = "No tasks were marked for completion"
+      redirect_to dashboard_path
     end
-  rescue ActiveRecord::RecordNotFound
-    flash[:error] = "No tasks were marked for completion"
-    redirect_to dashboard_path
-  end
-  
-  private
+
+    private
+    def task_params
+      params.require(:task).permit(Cms::Task.permitted_params)
+    end
+
     def load_page
       @page = Page.find(params[:page_id])
     end
-  
-    def set_toolbar_tab
-      @toolbar_tab = :sitemap
-    end  
-  
-end
+
+  end
 end

data/app/controllers/cms/user_controller.rb

@@ -0,0 +1,8 @@
+module Cms
+  class UserController < Cms::ApplicationController
+    # Return information about the current user as json. Can be used by cached html pages do create interactive elements.
+    def show
+      render json: Cms::UserPresenter.new(current_user)
+    end
+  end
+end

data/app/controllers/cms/users_controller.rb

@@ -1,76 +1,94 @@
 module Cms
-class UsersController < Cms::ResourceController
-  layout 'cms/administration'
-
-  check_permissions :administrate, :except => [:show, :change_password, :update_password]
-  before_filter :only_self_or_administrator, :only => [:show, :change_password, :update_password]
-  
-  before_filter :set_menu_section
-  after_filter :update_group_membership, :only => [:update, :create]
-  after_filter :update_flash, :only => [ :update, :create ]
-  
-#  verify :method => :put, :only => [ :enable, :disable, :update_password ]
-  
-  def index
-    query, conditions = [], []
-    
-    unless params[:show_expired]
-      query << "expires_at IS NULL OR expires_at >= ?"
-      conditions << Time.now.utc
-    end
-
-    unless params[:key_word].blank?
-      query << %w(login email first_name last_name).collect { |f| "lower(#{f}) LIKE lower(?)" }.join(" OR ")
-      4.times { conditions << "%#{params[:key_word]}%" }
-    end
-    
-    unless params[:group_id].to_i == 0
-      query << "#{UserGroupMembership.table_name}.group_id = ?"
-      conditions << params[:group_id]
-    end
-    
-    query.collect! { |q| "(#{q})"}
-    conditions = conditions.unshift(query.join(" AND "))
-    per_page = params[:per_page] || 10
-    
-    @users = User.paginate(:page => params[:page], :per_page => per_page, :include => :user_group_memberships, :conditions => conditions, :order => "first_name, last_name, email")
-  end
+  class UsersController < Cms::ResourceController
+    include Cms::AdminTab
 
-  def change_password
-    user
-  end
+    check_permissions :administrate, :except => [:change_password, :update_password]
+    before_filter :only_self_or_administrator, :only => [:change_password, :update_password]
+    after_filter :update_flash, :only => [:update]
+
+
+    def index
+      @have_external_users = Cms::ExternalUser.count > 0
+
+      query, conditions = [], []
 
-  def update_password
-    if user.update_attributes(params[:user])
-      flash[:notice] = "Password for '#{user.login}' was changed"
-      redirect_to(current_user.able_to?(:administrate) ? users_path : user_path(user))
-    else
-      render :action => 'change_password'
+      unless params[:show_expired]
+        query << "expires_at IS NULL OR expires_at >= ?"
+        conditions << Time.now.utc
+      end
+
+      unless params[:key_word].blank?
+        query << %w(login email first_name last_name).collect { |f| "lower(#{f}) LIKE lower(?)" }.join(" OR ")
+        4.times { conditions << "%#{params[:key_word]}%" }
+      end
+
+      unless params[:group_id].to_i == 0
+        query << "#{UserGroupMembership.table_name}.group_id = ?"
+        conditions << params[:group_id]
+      end
+
+      query.collect! { |q| "(#{q})" }
+      conditions = conditions.unshift(query.join(" AND "))
+      per_page = params[:per_page] || 10
+
+      page_num = params[:page] ? params[:page].to_i : 1
+      @users = PersistentUser.where(conditions).paginate(page: page_num, per_page: per_page).includes(:user_group_memberships).references(:user_group_memberships).order("first_name, last_name, email")
     end
-  end
 
-  def disable
-    begin
-      user.disable!
-      flash[:notice] = "User #{user.login} disabled"
-    rescue Exception => e
-      flash[:error] = e.message
+    def new
+      @user = Cms::User.new
+    end
+
+    def create
+      @user = Cms::User.new(cms_user_params)
+      if @user.save
+        flash[:notice] = "User '#{@user.login}' was created"
+        redirect_to users_path
+      else
+        render :action => 'new'
+      end
+    end
+
+    def change_password
+      user
+    end
+
+    def update_password
+      if user.update(cms_user_params)
+        flash[:notice] = "Password for '#{user.login}' was changed"
+        redirect_to(current_user.able_to?(:administrate) ? users_path : "/")
+      else
+        render :action => 'change_password'
+      end
+    end
+
+    def disable
+      begin
+        user.disable!
+        flash[:notice] = "User #{user.login} disabled"
+      rescue Exception => e
+        flash[:error] = e.message
+      end
+      redirect_to users_path
+    end
+
+    def enable
+      user.enable!
+      redirect_to users_path
+    end
+
+    protected
+
+    def cms_user_params
+      params.require("user").permit(Cms::User.permitted_params)
     end
-    redirect_to users_path
-  end
-  
-  def enable
-    user.enable!
-    redirect_to users_path
-  end
 
-  protected
     def after_create_url
-      index_url
+      users_path
     end
 
     def after_update_url
-      index_url
+      users_path
     end
 
     def update_flash
@@ -83,20 +101,25 @@ class UsersController < Cms::ResourceController
       end
     end
 
-    def update_group_membership
-      @object.group_ids = params[:group_ids] unless params[:on_fail_action] == "change_password"
+    def resource_name
+      'PersistentUser'
     end
 
-  private
+    def variable_name
+      'user'
+    end
+
+    private
     def user
-      @user ||= User.find(params[:id])
+      @user ||= PersistentUser.find(params[:id])
     end
+
     def set_menu_section
       @menu_section = 'users'
     end
-    
+
     def only_self_or_administrator
       raise Cms::Errors::AccessDenied if !current_user.able_to?(:administrate) && params[:id].to_i != current_user.id
     end
-end
+  end
 end

data/app/helpers/cms/application_helper.rb

@@ -2,6 +2,15 @@
 module Cms
   module ApplicationHelper
 
+    # Generate the proper link to Preview a Page or Addressable content block (based on type)
+    def preview_content_path(content)
+      if content.class == Cms::Page
+        cms.preview_page_path(content)
+      else
+        content.path
+      end
+    end
+
     # Help with deprecations messages
     # @deprecated
     def cms_handler_path(*args)
@@ -30,6 +39,19 @@ module Cms
       text
     end
 
+    # Generate HTML for draft icon for content that are in draft
+    # @param [Object] content
+    # @param [Object] options
+    # @option options [Boolean] :force (false) If we should force show :publish icon. In many cases, its the 'default' so it doesn't make sense to show.
+    # @return [String] HTML (HTML safe)
+    def draft_icon_tag(content, options={})
+      if content.respond_to?(:draft?) && content.draft?
+        '<span class="draft">Draft</span>'.html_safe
+      elsif options[:force]
+        '<span class="published">Published</span>'.html_safe
+      end
+    end
+
     def action_icon_src(name)
       "cms/icons/actions/#{name}.png"
     end
@@ -60,11 +82,11 @@ module Cms
         html = <<HTML
 jQuery(function($) {
   $('a##{check_id}').click(function() {
-    $('#{selector}').attr('checked', true);
+    $('#{selector}').prop('checked', true);
   });
 
   $('a##{uncheck_id}').click(function() {
-    $('#{selector}').attr('checked', false);
+    $('#{selector}').prop('checked', false);
   });
 })
 HTML
@@ -110,21 +132,10 @@ HTML
       content_tag :span, content
     end
 
-    def lt_button_wrapper(content)
-      button = <<LBW
-  <div class="lt_button">
-    #{image_tag "cms/lt_button_l.gif"}
-    <div class="lt_button_content">
-      <span>#{ content }</span>
-    </div>
-    #{image_tag "cms/lt_button_r.gif", :style => "margin-right: 10px;"}
-  </div>
-LBW
-      button.html_safe
-    end
+
 
     def dk_button_wrapper(content)
-      lt_button_wrapper(content).gsub("lt_button_", "dk_button_")
+      (content).gsub("lt_button_", "dk_button_")
     end
 
     def group_ids
@@ -132,10 +143,19 @@ LBW
     end
 
     def group_filter
-      select_tag("group_id", options_from_collection_for_select(Group.all.insert(0, Group.new(:id => nil, :name => "Show All Groups")), "id", "name", params[:group_id].to_i))
+      select_tag("group_id",
+                 options_from_collection_for_select(Group.all.to_a.insert(0, Group.new(:id => nil, :name => "Show All Groups")),
+                                                    "id",
+                                                    "name",
+                                                    params[:group_id].to_i),
+                class: 'group_filter'
+      )
     end
 
-    # Fetches a list of categories for a cms_drop_down. Will prompt users to create Categories/Categories types if the proper ones don't exist.
+    # Fetches a list of categories for a cms_drop_down. Will prompt users to create Categories/Categories types if
+    # the proper ones don't exist.
+    #
+    # @deprecated Use <%= f.association :categories %> instead.
     def categories_for(category_type_name, order="name")
       cat_type = CategoryType.named(category_type_name).first
       categories = cat_type ? cat_type.category_list(order) : [Category.new(:name => "-- You must first create a 'Category Type' named '#{category_type_name}'")]
@@ -145,19 +165,20 @@ LBW
     # Generates the HTML to render a paging control, if there is more than one page to be shown.
     #
     # @param [Array] collection List of content to be shown
-    # @param [Cms::ContentType] content_type The content type of the collection (used to generate links to Previous/Next)
+    # @param [Cms::ContentType || Class] content_type The content type of the collection (used to generate links to Previous/Next)
     # @param [Hash] options
     def render_pagination(collection, content_type, options={})
       if collection.blank?
         content_tag(:div, "No Content", :class => "pagination")
       else
-        render :partial => "cms/shared/pagination", :locals => {
+        model_class = content_type.instance_of?(Class) ? content_type : content_type.model_class
+        render :partial => "pagination", :locals => {
             :collection => collection,
-            :first_page_path => cms_connectable_path(content_type, {:page => 1}.merge(options)),
-            :previous_page_path => cms_connectable_path(content_type, {:page => collection.previous_page ? collection.previous_page : 1}.merge(options)),
-            :current_page_path => cms_connectable_path(content_type, options),
-            :next_page_path => cms_connectable_path(content_type, {:page => collection.next_page ? collection.next_page : collection.current_page}.merge(options)),
-            :last_page_path => cms_connectable_path(content_type, {:page => collection.total_pages}.merge(options))
+            :first_page_path => polymorphic_path(engine_aware_path(model_class), {:page => 1}.merge(options)),
+            :previous_page_path => polymorphic_path(engine_aware_path(model_class), {:page => collection.previous_page ? collection.previous_page : 1}.merge(options)),
+            :current_page_path => polymorphic_path(engine_aware_path(model_class), options),
+            :next_page_path => polymorphic_path(engine_aware_path(model_class), {:page => collection.next_page ? collection.next_page : collection.current_page}.merge(options)),
+            :last_page_path => polymorphic_path(engine_aware_path(model_class), {:page => collection.total_pages}.merge(options))
         }
       end
     end
@@ -186,53 +207,38 @@ LBW
       end
     end
 
-    # Render a CMS styled 'X Delete' button. This button will appear on tool bars, typically set apart visually from other buttons.
-    # Has a 'confirm?' popup attached to it as well.
-    # Assumes that javascript code to handle the 'confirm' has already been included in the page.
-    #
-    # @param [Hash] options The options for this tag
-    # @option options [String or Boolean] :title Title for 'confirm' popup. If specified as 'true' or with a string value a standard 'confirm yes/no' window should be used. If true is specified, its assume that the javascript popup handles the title.
-    # @option options [Path] :path The path or URL to link_to. Takes same types at url_for or link_to. Defaults to '#' if not specified.
-    # @option options [Boolean] :enabled If false, the button will be marked disabled. Default to false.
-    def delete_button(options={})
-      classes = "button"
-      classes << " disabled" if !options[:enabled]
-      classes << " delete_button"
-      classes << " http_delete confirm_with_title" if options[:title]
-
-      link_to_path = options[:path] ? options[:path] : "#"
-
-      span_options = {:id => 'delete_button', :class => classes}
-      span_options[:title] = options[:title] if (!options[:title].blank? && options[:title].class == String)
-      link_to span_tag("<span class=\"delete_img\">&nbsp;</span>Delete".html_safe), link_to_path, span_options
-    end
-
     # Render a CMS styled 'Edit' button. This button will appear on tool bars, typically set apart visually from other buttons.
-    #
+    # @deprecated Use link_to
     # @param [Hash] options The options for this tag
     # @option options [Path] :path The path or URL to link_to. Takes same types at url_for or link_to. Defaults to '#' if not specified.
     # @option options [Boolean] :enabled If false, the button will be marked disabled. Default to false.
-    def edit_button(options={})
-      classes = "button"
+    def edit_button(options={bootstrap: false})
+
+      label = options[:bootstrap]? "Edit" : span_tag("&nbsp;Edit&nbsp;".html_safe)
+      classes = styles_for_button(options)
       classes << " disabled" if !options[:enabled]
 
       link_to_path = options[:path] ? options[:path] : "#"
       span_options = {:id => 'edit_button', :class => classes}
-      link_to span_tag("&nbsp;Edit&nbsp;".html_safe), link_to_path, span_options
+      link_to label, link_to_path, span_options
 
     end
 
     # Render a CMS styled 'Add' button. This button will appear on tool bars, typically set apart visually from other buttons.
     #
     # @param [Path] The path or URL to link_to. Takes same types at url_for or link_to.
-    def add_button(path, options={})
-      classes = "button"
+    def add_button(path, options={bootstrap: false})
+      classes = styles_for_button(options)
+      label = options[:bootstrap]? "Add" : span_tag("&nbsp;Add&nbsp;".html_safe)
       span_options = {:class => classes}
-      link_to span_tag("&nbsp;Add&nbsp;".html_safe), path, span_options
+      link_to label, path, span_options
     end
 
     private
 
+    def styles_for_button(options)
+      options[:bootstrap] ? "btn btn-primary pull-left": "button"
+    end
     # Converts a CSS jQuery selector into something that can be suitably used as a CSS id element.
     def to_id(selector, suffix=nil)
       id = selector.gsub(".", "_")