browsercms-artirix 4.0.3 → 4.0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a8519377c9ccb8b8a859b530a35f64c6b5b1ae7
-  data.tar.gz: 7b927f07488aface1218361eb8283d0fc3978ae9
+  metadata.gz: b7ebf48beb3eb5d352f11e7160027c949dc330b3
+  data.tar.gz: 143fd2e19e2a92d576ca3bf2088a92b22456e353
 SHA512:
-  metadata.gz: 646599f5f4ef3c5ea175ded8171175895ba98895e857fd4dd15fdfe54935e010536cc941da66f33591ee06f01ab7c827f65df0fa048f8ac18d0d09ee95d4fb48
-  data.tar.gz: 144bfe4a7340d108fc64c42cff99c5dcdee949a6b922732f62e411c036e9700d9b2f955b072686e3d5cd9c0cab3655c5e3cbebd122e3ab38266bc2b7cbbe9f4a
+  metadata.gz: bbf4a8304f91d36f34c2ddaf3d3831e38367169e4f4b1f48a11483f137e82f08603bf3db9d455b5d7029e11d70aacd9b5c7115e1f6951e80eb6c46cbf41c0dad
+  data.tar.gz: d214c2e335b0b1b01dbcffee34810482260471c9ff4efee4317f88ebdb0f406678f05ad7899721622ebbdfbe440462ccbaa348b7bc7996287294c5a09c0af3d8

data/app/controllers/cms/content_block_controller.rb

@@ -23,12 +23,12 @@ module Cms
     end
 
     def bulk_update
-      ids = params[:content_id] || []
+      ids    = params[:content_id] || []
       models = ids.collect do |id|
         model_class.find(id.to_i)
       end
       if params[:commit] == 'Delete'
-        deleted = models.select do |m|
+        deleted        = models.select do |m|
           m.destroy
         end
         flash[:notice] = "Deleted #{deleted.size} records."
@@ -128,7 +128,7 @@ module Cms
       do_command("deleted") { @block.destroy }
       respond_to do |format|
         format.html { redirect_to_first params[:_redirect_to], engine_aware_path(@block.class) }
-        format.json { render :json => {:success => true} }
+        format.json { render :json => { :success => true } }
       end
 
     end
@@ -200,6 +200,7 @@ module Cms
     def model_form_name
       content_type.param_key
     end
+
     alias :resource_param :model_form_name
 
     def resource
@@ -209,25 +210,43 @@ module Cms
     # methods for loading one or a collection of blocks
 
     def load_blocks
-      @search_filter = SearchFilter.build(params[:search_filter], model_class)
+      scope                  = load_blocks_scope
+      @total_number_of_items = scope.count
+
+      scope   = add_scope_pagination(scope)
+      @blocks = scope
 
+      check_permissions
+    end
+
+    def add_scope_pagination(scope)
+      scope.paginate(pagination_options)
+    end
+
+    def pagination_options
       options = {}
 
-      options[:page] = params[:page]
+      options[:page]  = params[:page]
       options[:order] = model_class.default_order if model_class.respond_to?(:default_order)
       options[:order] = params[:order] unless params[:order].blank?
 
+      options
+    end
+
+    def search_filter
+      @search_filter ||= SearchFilter.build(params[:search_filter], model_class)
+    end
+    helper_method :search_filter
+
+    def load_blocks_scope
       scope = model_class.respond_to?(:list) ? model_class.list : model_class
       if scope.searchable?
-        scope = scope.search(@search_filter.term)
+        scope = scope.search(search_filter.term)
       end
       if params[:section_id] && model_class.respond_to?(:with_parent_id)
         scope = scope.with_parent_id(params[:section_id])
       end
-      @total_number_of_items = scope.count
-      @blocks = scope.paginate(options)
-      check_permissions
-
+      scope
     end
 
     def load_block
@@ -275,7 +294,7 @@ module Cms
     end
 
     def after_create_on_success
-      block = @block.class.versioned? ? @block.draft : @block
+      block          = @block.class.versioned? ? @block.draft : @block
       flash[:notice] = "#{content_type.display_name} '#{block.name}' was created"
       if @block.class.connectable? && @block.connected_page
         redirect_to @block.connected_page.path
@@ -308,7 +327,7 @@ module Cms
     # Returns the parameters for the block to be saved.
     # Handles defaults as well as eventually 'strong_params'
     def model_params
-      defaults = {"publish_on_save" => false}
+      defaults     = { "publish_on_save" => false }
       model_params = params[model_form_name]
       defaults.merge(model_params)
     end
@@ -358,14 +377,14 @@ module Cms
     # are connected to.
     def check_permissions
       case action_name
-        when "index", "show", "new", "create", "version", "versions"
-          # Allow
-        when "edit", "update", "inline"
-          raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@block)
-        when "destroy", "publish", "revert_to"
-          raise Cms::Errors::AccessDenied unless current_user.able_to_publish?(@block)
-        else
-          raise Cms::Errors::AccessDenied
+      when "index", "show", "new", "create", "version", "versions"
+        # Allow
+      when "edit", "update", "inline"
+        raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@block)
+      when "destroy", "publish", "revert_to"
+        raise Cms::Errors::AccessDenied unless current_user.able_to_publish?(@block)
+      else
+        raise Cms::Errors::AccessDenied
       end
     end
 
@@ -394,7 +413,7 @@ module Cms
     end
 
     def render_toolbar_and_iframe
-      @page = @block
+      @page       = @block
       @page_title = @block.page_title
       render "show", :layout => 'cms/page_editor'
     end

data/app/views/cms/content_block/index.html.erb

@@ -18,9 +18,11 @@
     <span class="span9 top-buttons">
         <%= submit_tag "Publish", class: "right btn btn-small btn-primary primary-cta" if content_type.model_class.publishable? %>
 
-        <div class="btn-group right">
-          <%= submit_tag "Delete", class: 'btn btn-small', data: {confirm: 'Are you sure you want to delete all these records?'} %>
-        </div>
+        <% unless content_type.readonly? %>
+          <div class="btn-group right">
+            <%= submit_tag "Delete", class: 'btn btn-small', data: {confirm: 'Are you sure you want to delete all these records?'} %>
+          </div>
+        <% end %>
 
         <%= yield :bulk_actions if content_for?(:bulk_actions) %>
         <h4 class="right"><%= @total_number_of_items %> ITEMS</h4>

data/lib/cms/version.rb

@@ -2,7 +2,7 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = '4.0.3'
+  VERSION = '4.0.3.1'
 
   # Return the current version of the CMS.
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms-artirix
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.3.1
 platform: ruby
 authors:
 - BrowserMedia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails