browsercms 3.5.7 → 4.0.0.alpha

data/app/controllers/cms/forms_controller.rb

@@ -0,0 +1,35 @@
+class Cms::FormsController < Cms::ContentBlockController
+
+  before_filter :associate_form_fields, only: [:create, :update]
+  before_filter :strip_new_entry_params, only: [:create, :update]
+
+  helper do
+    # For new forms, if the user doesn't complete and save them, we need to delete them from the database.
+    # The reason :new creates a form object (which is not conventional) is to allow AJAX FormField creation/association.
+    def cleanup_before_abandoning
+      ["new", "create"].include? action_name
+    end
+  end
+
+  def new
+    super
+    @block.confirmation_text = "Thanks for filling out this form."
+    @block.save!
+  end
+
+  protected
+
+  # Split the space separated list of ids into an actual array of ids.
+  # Rails might have a more conventional way to do this, but I couldn't figure it out.'
+  def associate_form_fields
+    field_ids = params[:field_ids].split(" ")
+    params[:form][:field_ids] = field_ids
+  end
+
+
+  # params[:form][:new_entry] is just a garbage parameter that exists to make displaying forms work.
+  # We want to ignore anything submitted here
+  def strip_new_entry_params
+    params[:form].delete(:new_entry)
+  end
+end

data/app/controllers/cms/groups_controller.rb

@@ -1,21 +1,18 @@
 module Cms
-class GroupsController < Cms::ResourceController
-  layout 'cms/administration'
-  
-  check_permissions :administrate
-  before_filter :set_menu_section
-  
-  def index
-    @groups = Group.paginate(
-      :include => :group_type,
-      :page => params[:page], 
-      :order => params[:order] || "#{Group.table_name}.name")
-  end
-  
-  protected
+  class GroupsController < Cms::ResourceController
+    include Cms::AdminTab
+
+    check_permissions :administrate
+
+    def index
+      @groups = Group.includes(:group_type).paginate(:page => params[:page]).order(params[:order] || :name)
+    end
+
+    protected
     def after_create_url
       index_url
     end
+
     def after_update_url
       index_url
     end
@@ -23,6 +20,6 @@ class GroupsController < Cms::ResourceController
     def set_menu_section
       @menu_section = 'groups'
     end
-    
-end
+
+  end
 end

data/app/controllers/cms/html_blocks_controller.rb

@@ -1,4 +1,4 @@
 module Cms
-class HtmlBlocksController < Cms::ContentBlockController
-end
+  class HtmlBlocksController < Cms::ContentBlockController
+  end
 end

data/app/controllers/cms/inline_content_controller.rb

@@ -0,0 +1,48 @@
+module Cms
+  class InlineContentController < Cms::BaseController
+    respond_to :js
+
+    def update
+      content_block = Content.find_draft(params[:content_name], params[:id])
+      content_block.update_attributes(filtered_content(content_block))
+      @page = Page.find_draft(params[:page_id].to_i)
+      if (!@page.live?)
+        page_status = "draft"
+        status_label = "This page is in draft status"
+      else
+        page_status = "published"
+        status_label = "Published"
+      end
+
+      # After a page update, all the connector ids change. So we need to send
+      # the new move up/down/remove paths to client so they will work after an inline update.
+      connectors = @page.current_connectors(params[:container].to_sym)
+      routes = []
+      connectors.each do |c|
+        routes << {
+            move_up: cms.move_up_connector_path(c, format: :json),
+            move_down: cms.move_down_connector_path(c, format: :json),
+            remove: cms.connector_path(c, format: :json)
+        }
+      end
+      results = {
+          page_status: page_status,
+          status_label: status_label,
+          page_title: @page.title,
+          container: params[:container].to_s,
+          routes: routes
+      }
+      render json: results, layout: false
+    end
+
+    private
+
+    def filtered_content(content_block)
+      ContentFilter.new.filter(content_params(content_block))
+    end
+
+    def content_params(content)
+      params.require(:content).permit(content.class.permitted_params)
+    end
+  end
+end

data/app/controllers/cms/links_controller.rb

@@ -1,50 +1,66 @@
 module Cms
-class LinksController < Cms::BaseController
+  class LinksController < Cms::BaseController
 
-  before_filter :set_toolbar_tab
-  before_filter :load_section, :only => [:new, :create, :move_to]
-  before_filter :load_link, :only => [:destroy, :update]
-  before_filter :load_draft_link, :only => [:edit]
-  
-  def new
-    @link = Link.new(:section => @section)
-  end
+    before_filter :load_section, :only => [:new, :create, :move_to]
+    before_filter :load_link, :only => [:destroy, :update]
+    before_filter :load_draft_link, :only => [:edit]
+
+    include Cms::PublishWorkflow
 
-  def create
-    @link = Link.new(params[:link])
-    @link.section = @section
-    if @link.save
-      flash[:notice] = "Link was '#{@link.name}' created."
-      redirect_to @section
-    else
-      render :action => "new"
+    def resource
+      @link
     end
-  end
-  
-  def update
-    if @link.update_attributes(params[:link])
-      flash[:notice] = "Link '#{@link.name}' was updated"
-      redirect_to @link.section
-    else
-      render :action => 'edit'
-    end      
-  end
-  
-  def destroy
-    respond_to do |format|
-      if @link.destroy
-        message = "Link '#{@link.name}' was deleted."
-        format.html { flash[:notice] = message; redirect_to(sitemap_url) }
-        format.json { render :json => {:success => true, :message => message } }
+
+    def resource_param
+      :link
+    end
+
+    def show
+      redirect_to sitemap_path
+    end
+
+    def new
+      @link = Link.new(:section => @section)
+    end
+
+    def create
+      @link = Link.new(link_params)
+      @link.section = @section
+      if @link.save
+        flash[:notice] = "Link was '#{@link.name}' created."
+        redirect_to @section
       else
-        message = "Link '#{@link.name}' could not be deleted"
-        format.html { flash[:error] = message; redirect_to(sitemap_url) }
-        format.json { render :json => {:success => false, :message => message } }
+        render :action => "new"
       end
-    end    
-  end
+    end
 
-  protected
+    def update
+      if @link.update_attributes(link_params)
+        flash[:notice] = "Link '#{@link.name}' was updated"
+        redirect_to @link.section
+      else
+        render :action => 'edit'
+      end
+    end
+
+    def destroy
+      respond_to do |format|
+        if @link.destroy
+          message = "Link '#{@link.name}' was deleted."
+          format.html { flash[:notice] = message; redirect_to(sitemap_url) }
+          format.json { render :json => {:success => true, :message => message} }
+        else
+          message = "Link '#{@link.name}' could not be deleted"
+          format.html { flash[:error] = message; redirect_to(sitemap_url) }
+          format.json { render :json => {:success => false, :message => message} }
+        end
+      end
+    end
+
+    protected
+    def link_params
+      params.require(:link).permit(Cms::Link.permitted_params)
+    end
 
     def load_section
       @section = Section.find(params[:section_id])
@@ -55,15 +71,11 @@ class LinksController < Cms::BaseController
       @link = Link.find(params[:id])
       raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@link)
     end
-    
+
     def load_draft_link
       load_link
       @link = @link.as_of_draft_version
     end
 
-    def set_toolbar_tab
-      @toolbar_tab = :sitemap
-    end
-
-end
+  end
 end

data/app/controllers/cms/page_components_controller.rb

@@ -0,0 +1,20 @@
+module Cms
+  class PageComponentsController < Cms::ApplicationController
+    layout false
+    respond_to :json
+
+    def new
+      @default_type = Cms::ContentType.default
+      @content_types = Cms::ContentType.other_connectables
+    end
+
+    def update
+      @page_component = PageComponent.new(params[:id], params[:content])
+      if @page_component.save
+        respond_with(@page_component)
+      else
+        respond_with(@page_component.errors, :status => :unprocessable_entity)
+      end
+    end
+  end
+end

data/app/controllers/cms/page_routes_controller.rb

@@ -1,47 +1,51 @@
 module Cms
-class PageRoutesController < Cms::BaseController
-  
-  before_filter :load_page_route, :only => [:show, :edit, :update, :destroy]
-  layout 'cms/administration'
-  
-  def index
-    @page_routes = PageRoute.paginate(:order => "name", :page => params[:page])
-  end
-  
-  def new
-    @page_route = PageRoute.new
-  end
-  
-  def create
-    @page_route = PageRoute.new(params[:page_route])
-    if @page_route.save
-      flash[:notice] = "Page Route Created"
-      redirect_to page_route_url(@page_route)
-    else
-      render :action => "new"
+  class PageRoutesController < Cms::BaseController
+
+    before_filter :load_page_route, :only => [:edit, :update, :destroy]
+
+    def index
+      @page_routes = PageRoute.paginate(:page => params[:page]).order("name")
     end
-  end
-  
-  def update
-    if @page_route.update_attributes(params[:page_route])
-      flash[:notice] = "Page Route Updated"
-      redirect_to page_route_url(@page_route)
-    else
-      render :action => "new"
+
+    def new
+      @page_route = PageRoute.new
     end
-    
-  end
-  
-  def destroy
-    @page_route.destroy
-    flash[:notice] = "Page Route Deleted"
-    redirect_to page_routes_url
-  end
-  
-  protected
+
+    def create
+      @page_route = PageRoute.new(page_route_params)
+      if @page_route.save
+        flash[:notice] = "Page Route Created"
+        redirect_to page_routes_path
+      else
+        render :action => "new"
+      end
+    end
+
+    def update
+      if @page_route.update(page_route_params)
+        flash[:notice] = "Page Route Updated"
+        redirect_to page_routes_path
+      else
+        render :action => "new"
+      end
+
+    end
+
+    def destroy
+      @page_route.destroy
+      flash[:notice] = "Page Route Deleted"
+      redirect_to page_routes_url
+    end
+
+    protected
     def load_page_route
       @page_route = PageRoute.find(params[:id])
     end
-  
-end
+
+    private
+    def page_route_params
+      params.require(:page_route).permit(Cms::PageRoute.permitted_params)
+    end
+
+  end
 end

data/app/controllers/cms/pages_controller.rb

@@ -1,108 +1,126 @@
 module Cms
-class PagesController < Cms::BaseController
- 
-  before_filter :set_toolbar_tab
-  before_filter :load_section, :only => [:new, :create]
-  before_filter :load_page, :only => [:versions, :version, :revert_to, :destroy]
-  before_filter :load_draft_page, :only => [:edit, :update]
-  before_filter :hide_toolbar, :only => [:new, :create]
-  before_filter :strip_publish_params, :only => [:create, :update]
-
-  helper Cms::RenderingHelper
-  
-  def new
-    @page = Page.new(:section => @section, :cacheable => true)
-    if @section.child_nodes.count < 1
-      @page.name = "Overview"
-      @page.path = @section.path
+  class PagesController < Cms::BaseController
+
+    helper Cms::RenderingHelper
+
+    before_filter :load_section, :only => [:new, :create]
+    before_filter :load_page, :only => [:versions, :version, :revert_to, :destroy]
+    before_filter :load_draft_page, :only => [:edit, :update]
+    before_filter :hide_toolbar, :only => [:new, :create]
+    before_action :strip_visibility_params, :only => [:create, :update]
+
+    include Cms::PublishWorkflow
+
+    def resource
+      @page
     end
-  end
 
-  def show
-    redirect_to Page.find(params[:id]).path
-  end
- 
-  def create
-    @page = Page.new(params[:page])
-    @page.section = @section
-    if @page.save
-      flash[:notice] = "Page was '#{@page.name}' created."
-      redirect_to @page
-    else
-      render :action => "new"
+    def resource_param
+      :page
     end
-  end
 
-  def update
-    if @page.update_attributes(params[:page])
-      flash[:notice] = "Page was '#{@page.name}' updated."
-      redirect_to @page
-    else
-      render :action => "edit"
+    def new
+      @page = Page.new(:section => @section, :cacheable => true)
+      if @section.child_nodes.count < 1
+        @page.name = "Overview"
+        @page.path = @section.path
+      end
+    end
+
+    def show
+      redirect_to Page.find(params[:id]).path
     end
-  rescue ActiveRecord::StaleObjectError => e
-    @other_version = @page.class.find(@page.id)
-    render :action => "edit"
-  end
 
-  def destroy
-    respond_to do |format|
-      if @page.destroy
-        message = "Page '#{@page.name}' was deleted."
-        format.html { flash[:notice] = message; redirect_to(sitemap_url) }
-        format.json { render :json => {:success => true, :message => message } }
+    def create
+      @page = Page.new(page_params)
+      @page.section = @section
+      if @page.save
+        flash[:notice] = "Page was '#{@page.name}' created."
+        redirect_to @page
       else
-        message = "Page '#{@page.name}' could not be deleted"
-        format.html { flash[:error] = message; redirect_to(sitemap_url) }
-        format.json { render :json => {:success => false, :message => message } }
+        render :action => "new"
       end
     end
-  end
- 
-  #status actions
-  {:publish => "published", :hide => "hidden", :archive => "archived"}.each do |status, verb|
-    define_method status do
-      if params[:page_ids]
-        @pages = params[:page_ids].map { |id| Page.find(id) }
-        raise Cms::Errors::AccessDenied unless @pages.all? { |page| current_user.able_to_edit?(page) }
-        @pages.each { |page| page.send(status) }
-        flash[:notice] = "#{params[:page_ids].size} pages #{verb}"
-        redirect_to dashboard_url
+
+    def update
+      if @page.update(page_params)
+        flash[:notice] = "Page was '#{@page.name}' updated."
+        redirect_to @page
       else
-        load_page
-        if @page.send(status)
-          flash[:notice] = "Page '#{@page.name}' was #{verb}"
+        render :action => "edit"
+      end
+    rescue ActiveRecord::StaleObjectError => e
+      @other_version = @page.class.find(@page.id)
+      render :action => "edit"
+    end
+
+    def destroy
+      respond_to do |format|
+        if @page.destroy
+          message = "Page '#{@page.name}' was deleted."
+          format.html { flash[:notice] = message; redirect_to(sitemap_url) }
+          format.json { render :json => {:success => true, :message => message} }
+        else
+          message = "Page '#{@page.name}' could not be deleted"
+          format.html { flash[:error] = message; redirect_to(sitemap_url) }
+          format.json { render :json => {:success => false, :message => message} }
         end
-        redirect_to @page.path
       end
     end
-  end
- 
-  def version
-    @page = @page.as_of_version(params[:version])
-    @show_toolbar = true
-    @show_page_toolbar = true
-    @_connectors = @page.connectors.for_page_version(@page.version)
-    @_connectables = @_connectors.map(&:connectable_with_deleted)   
-    render :layout => @page.layout, :template => 'cms/content/show'
-  end 
- 
-  def revert_to
-    if @page.revert_to(params[:version])
-      flash[:notice] = "Page '#{@page.name}' was reverted to version #{params[:version]}"
-    end
-   
-    respond_to do |format|
-      format.html { redirect_to @page.path }
-      format.js { render :template => 'cms/shared/show_notice' }
-    end   
-  end
- 
-  private
-    def strip_publish_params
+
+    #status actions
+    {:publish => "published", :hide => "hidden", :archive => "archived"}.each do |status, verb|
+      define_method status do
+        if params[:page_ids]
+          @pages = params[:page_ids].map { |id| Page.find(id) }
+          raise Cms::Errors::AccessDenied unless @pages.all? { |page| current_user.able_to_edit?(page) }
+          @pages.each { |page| page.send(status) }
+          flash[:notice] = "#{params[:page_ids].size} pages #{verb}"
+          redirect_to dashboard_url
+        else
+          load_page
+          if @page.send(status)
+            flash[:notice] = "Page '#{@page.name}' was #{verb}"
+          end
+          redirect_to @page.path
+        end
+      end
+    end
+
+    def version
+      @page = @page.as_of_version(params[:version])
+      @show_toolbar = true
+      @show_page_toolbar = true
+      @_connectors = @page.current_connectors
+      @_connectables = @page.contents
+      render :layout => @page.layout, :template => 'cms/content/show'
+    end
+
+    def revert_to
+      if @page.revert_to(params[:version])
+        flash[:notice] = "Page '#{@page.name}' was reverted to version #{params[:version]}"
+      end
+
+      respond_to do |format|
+        format.html { redirect_to @page.path }
+        format.js { render :template => 'cms/shared/show_notice' }
+      end
+    end
+
+    protected
+
+
+    private
+
+    def page_params
+      params.require(:page).permit(Cms::Page.permitted_params)
+    end
+
+    def strip_visibility_params
       unless current_user.able_to?(:publish_content)
         params[:page].delete :hidden
         params[:page].delete :archived
+        params[:page].delete :visibility
       end
     end
 
@@ -110,28 +128,24 @@ class PagesController < Cms::BaseController
       @page = Page.find(params[:id])
       raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@page)
     end
-   
+
     def load_draft_page
       load_page
       @page = @page.as_of_draft_version
     end
- 
+
     def load_section
       @section = Section.find(params[:section_id])
       raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@section)
     end
-   
+
     def hide_toolbar
       @hide_page_toolbar = true
     end
 
-    def set_toolbar_tab
-      @toolbar_tab = :sitemap
-    end
-   
     def load_templates
       @templates = PageTemplate.options
     end
-   
-end
+
+  end
 end