caboose-cms 0.3.76 → 0.3.77

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NTYzNGQ4OWJkYWNiOTQ3MzY1ODA4YzhiMWZiN2ZiY2NmMzNhZGE0ZA==
4
+ NTU5Y2M3ODlkMmY0N2ExMTcxMDU0MjAzZGI1ZTAyM2M1YWIwYWVjZA==
5
5
  data.tar.gz: !binary |-
6
- MmJmNzkyZDBjMWVjZWRjZGFmODcwNDY4ZTI3NmJhZjVkY2NiMGM0ZQ==
6
+ YWNlYzM3NjI1NmZiYzhjNWEzNTQ5YzI1NWQ2NzA0OTU3NDYyMzUwNA==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- NWU4YWE4MjQwOTMxZDUwYzFlMmRhYWYzYjAzMWVjMDgxYjAwODQ1ZDk0N2Fk
10
- ZDVlNDA3YTllYjI2YmJjNzc0NGUyYTdkMTY1ZmEwYWI0ZjkxNTJhZjBhNGZl
11
- NzZhNmJiMzY1MDg2N2FiNzM2N2JlMGNhYzcyMmE3NDc4NTQxOGY=
9
+ NmQ0YjBkNjdkMDU2ZTE3OWRjZmM2MGU3MmZkYTllMGFkM2M5MmI0MDRiMjVm
10
+ MDA5MDQ0YzFjYjg2MDlmMjc5Y2ViOTAzYWNhOTg2ZjVjMWZkNmRlNjgyNmQ4
11
+ NmMyNWJlZmQzNjlkZTQ5ZGE1MmQxOGE3ZDM5NmY3M2Y4YjU2NmI=
12
12
  data.tar.gz: !binary |-
13
- MzExOTc0NGQxMDk3MTcwMGE0YjE0NGU5YmFkYjFkZmVmMWM0M2Y5ZjUwNWU5
14
- ZmUwMzVlM2Y3MTkwMWU1NDZmNzIzNGVkOGQ0ZjgzYzcyNWI4ODVlMjA0M2M5
15
- MzY2ZDczZmZmMTM2MDYwMjFlYWQ2NDhjMTUxNTRhNTYwNDVmMmU=
13
+ YjM4ZDZlYmM3YmM1Y2Y2MDA0YzU0MzA2YjM0ZWZiZWQ1YzUwZWMzOWRiZGQ5
14
+ NzRhMjc3MzU4OTI3NDc4YTJiZjZiZTI0NWQ3NmYxNDg1NTBlMmY2ZDA0MGU2
15
+ YjM2OGZmMDdjNDBjNjQxYjgwNzgyZDQyYWQ3ZjU5ZDc3NTBjNzI=
@@ -47,7 +47,8 @@ module Caboose
47
47
  :partial => "caboose/page_blocks/#{b.page_block_type.name}",
48
48
  :locals => {
49
49
  :block => b,
50
- :empty_text => params[:empty_text]
50
+ :empty_text => params[:empty_text],
51
+ :editing => true
51
52
  }
52
53
  })
53
54
  end
@@ -67,11 +68,11 @@ module Caboose
67
68
  end
68
69
  html = nil
69
70
  if bt.use_render_function && bt.render_function
70
- html = b.render_from_function(params[:empty_text])
71
+ html = b.render_from_function(params[:empty_text], true)
71
72
  else
72
73
  html = render_to_string({
73
74
  :partial => "caboose/page_blocks/#{bt.name}",
74
- :locals => { :block => b, :empty_text => params[:empty_text] }
75
+ :locals => { :block => b, :empty_text => params[:empty_text], :editing => true }
75
76
  })
76
77
  end
77
78
  {
@@ -40,7 +40,8 @@ class Caboose::PageBlock < ActiveRecord::Base
40
40
  end
41
41
  end
42
42
 
43
- def render_from_function(empty_text = nil, editing = false)
43
+ def render_from_function(empty_text = nil, editing = false)
44
+ Caboose.log("editing = #{editing}")
44
45
  locals = OpenStruct.new(:block => self, :empty_text => empty_text, :editing => editing)
45
46
  erb = ERB.new(page_block_type.render_function)
46
47
  return erb.result(locals.instance_eval { binding })
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.3.76'
2
+ VERSION = '0.3.77'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.76
4
+ version: 0.3.77
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry