browsercms-artirix 4.0.3 → 4.0.3.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4a8519377c9ccb8b8a859b530a35f64c6b5b1ae7
4
- data.tar.gz: 7b927f07488aface1218361eb8283d0fc3978ae9
3
+ metadata.gz: b7ebf48beb3eb5d352f11e7160027c949dc330b3
4
+ data.tar.gz: 143fd2e19e2a92d576ca3bf2088a92b22456e353
5
5
  SHA512:
6
- metadata.gz: 646599f5f4ef3c5ea175ded8171175895ba98895e857fd4dd15fdfe54935e010536cc941da66f33591ee06f01ab7c827f65df0fa048f8ac18d0d09ee95d4fb48
7
- data.tar.gz: 144bfe4a7340d108fc64c42cff99c5dcdee949a6b922732f62e411c036e9700d9b2f955b072686e3d5cd9c0cab3655c5e3cbebd122e3ab38266bc2b7cbbe9f4a
6
+ metadata.gz: bbf4a8304f91d36f34c2ddaf3d3831e38367169e4f4b1f48a11483f137e82f08603bf3db9d455b5d7029e11d70aacd9b5c7115e1f6951e80eb6c46cbf41c0dad
7
+ data.tar.gz: d214c2e335b0b1b01dbcffee34810482260471c9ff4efee4317f88ebdb0f406678f05ad7899721622ebbdfbe440462ccbaa348b7bc7996287294c5a09c0af3d8
@@ -23,12 +23,12 @@ module Cms
23
23
  end
24
24
 
25
25
  def bulk_update
26
- ids = params[:content_id] || []
26
+ ids = params[:content_id] || []
27
27
  models = ids.collect do |id|
28
28
  model_class.find(id.to_i)
29
29
  end
30
30
  if params[:commit] == 'Delete'
31
- deleted = models.select do |m|
31
+ deleted = models.select do |m|
32
32
  m.destroy
33
33
  end
34
34
  flash[:notice] = "Deleted #{deleted.size} records."
@@ -128,7 +128,7 @@ module Cms
128
128
  do_command("deleted") { @block.destroy }
129
129
  respond_to do |format|
130
130
  format.html { redirect_to_first params[:_redirect_to], engine_aware_path(@block.class) }
131
- format.json { render :json => {:success => true} }
131
+ format.json { render :json => { :success => true } }
132
132
  end
133
133
 
134
134
  end
@@ -200,6 +200,7 @@ module Cms
200
200
  def model_form_name
201
201
  content_type.param_key
202
202
  end
203
+
203
204
  alias :resource_param :model_form_name
204
205
 
205
206
  def resource
@@ -209,25 +210,43 @@ module Cms
209
210
  # methods for loading one or a collection of blocks
210
211
 
211
212
  def load_blocks
212
- @search_filter = SearchFilter.build(params[:search_filter], model_class)
213
+ scope = load_blocks_scope
214
+ @total_number_of_items = scope.count
215
+
216
+ scope = add_scope_pagination(scope)
217
+ @blocks = scope
213
218
 
219
+ check_permissions
220
+ end
221
+
222
+ def add_scope_pagination(scope)
223
+ scope.paginate(pagination_options)
224
+ end
225
+
226
+ def pagination_options
214
227
  options = {}
215
228
 
216
- options[:page] = params[:page]
229
+ options[:page] = params[:page]
217
230
  options[:order] = model_class.default_order if model_class.respond_to?(:default_order)
218
231
  options[:order] = params[:order] unless params[:order].blank?
219
232
 
233
+ options
234
+ end
235
+
236
+ def search_filter
237
+ @search_filter ||= SearchFilter.build(params[:search_filter], model_class)
238
+ end
239
+ helper_method :search_filter
240
+
241
+ def load_blocks_scope
220
242
  scope = model_class.respond_to?(:list) ? model_class.list : model_class
221
243
  if scope.searchable?
222
- scope = scope.search(@search_filter.term)
244
+ scope = scope.search(search_filter.term)
223
245
  end
224
246
  if params[:section_id] && model_class.respond_to?(:with_parent_id)
225
247
  scope = scope.with_parent_id(params[:section_id])
226
248
  end
227
- @total_number_of_items = scope.count
228
- @blocks = scope.paginate(options)
229
- check_permissions
230
-
249
+ scope
231
250
  end
232
251
 
233
252
  def load_block
@@ -275,7 +294,7 @@ module Cms
275
294
  end
276
295
 
277
296
  def after_create_on_success
278
- block = @block.class.versioned? ? @block.draft : @block
297
+ block = @block.class.versioned? ? @block.draft : @block
279
298
  flash[:notice] = "#{content_type.display_name} '#{block.name}' was created"
280
299
  if @block.class.connectable? && @block.connected_page
281
300
  redirect_to @block.connected_page.path
@@ -308,7 +327,7 @@ module Cms
308
327
  # Returns the parameters for the block to be saved.
309
328
  # Handles defaults as well as eventually 'strong_params'
310
329
  def model_params
311
- defaults = {"publish_on_save" => false}
330
+ defaults = { "publish_on_save" => false }
312
331
  model_params = params[model_form_name]
313
332
  defaults.merge(model_params)
314
333
  end
@@ -358,14 +377,14 @@ module Cms
358
377
  # are connected to.
359
378
  def check_permissions
360
379
  case action_name
361
- when "index", "show", "new", "create", "version", "versions"
362
- # Allow
363
- when "edit", "update", "inline"
364
- raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@block)
365
- when "destroy", "publish", "revert_to"
366
- raise Cms::Errors::AccessDenied unless current_user.able_to_publish?(@block)
367
- else
368
- raise Cms::Errors::AccessDenied
380
+ when "index", "show", "new", "create", "version", "versions"
381
+ # Allow
382
+ when "edit", "update", "inline"
383
+ raise Cms::Errors::AccessDenied unless current_user.able_to_edit?(@block)
384
+ when "destroy", "publish", "revert_to"
385
+ raise Cms::Errors::AccessDenied unless current_user.able_to_publish?(@block)
386
+ else
387
+ raise Cms::Errors::AccessDenied
369
388
  end
370
389
  end
371
390
 
@@ -394,7 +413,7 @@ module Cms
394
413
  end
395
414
 
396
415
  def render_toolbar_and_iframe
397
- @page = @block
416
+ @page = @block
398
417
  @page_title = @block.page_title
399
418
  render "show", :layout => 'cms/page_editor'
400
419
  end
@@ -18,9 +18,11 @@
18
18
  <span class="span9 top-buttons">
19
19
  <%= submit_tag "Publish", class: "right btn btn-small btn-primary primary-cta" if content_type.model_class.publishable? %>
20
20
 
21
- <div class="btn-group right">
22
- <%= submit_tag "Delete", class: 'btn btn-small', data: {confirm: 'Are you sure you want to delete all these records?'} %>
23
- </div>
21
+ <% unless content_type.readonly? %>
22
+ <div class="btn-group right">
23
+ <%= submit_tag "Delete", class: 'btn btn-small', data: {confirm: 'Are you sure you want to delete all these records?'} %>
24
+ </div>
25
+ <% end %>
24
26
 
25
27
  <%= yield :bulk_actions if content_for?(:bulk_actions) %>
26
28
  <h4 class="right"><%= @total_number_of_items %> ITEMS</h4>
data/lib/cms/version.rb CHANGED
@@ -2,7 +2,7 @@
2
2
  # Allows the precise version of BrowserCMS to be determined programatically.
3
3
  #
4
4
  module Cms
5
- VERSION = '4.0.3'
5
+ VERSION = '4.0.3.1'
6
6
 
7
7
  # Return the current version of the CMS.
8
8
  def self.version
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: browsercms-artirix
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.3
4
+ version: 4.0.3.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - BrowserMedia
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-10-14 00:00:00.000000000 Z
12
+ date: 2015-10-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails