caboose-cms 0.4.82 → 0.4.83

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
- MmIzZTE4MDQ1YThiMzBjZjVmMzgzMDQwM2M0NjE0MTNjZGFmMTlkNA==
4
+ YjViM2UyYjQwNGNhNjIyYzE5MzdhMTVjODg0YTFmMDA3OWEwZDQwYQ==
5
5
  data.tar.gz: !binary |-
6
- ZTJiNjI4YjZlNGU3NTg0NGM4ZjQ3ZmRiMDU0NTU4ZTc0Zjc2M2MyOQ==
6
+ OTg1NDU5M2M2NTJlNTgyYWQ5ZTM2YzBiM2M2MmI2MzIzMWU2ZDNjZg==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- ZWM4NDRiOTA2NGU5MTc3MmNkMGRhMjVhNDAzMWM5ODE3ZGQ5N2E1NjliYjI2
10
- MTg0M2I1MjhhNzMzYWMwYmVhZDk5YmQxY2Y3NDUyYzVmZDY2NzJhMDkyMzAx
11
- MmViZjMzNGRmZWVjNjhiNGZjM2E1MTM4NmQ4OTk3NjYzNDE2YTk=
9
+ YWI4YzQyOTUzNGNkNGRhMWRjZWMzM2FmOGQ3Zjk1NjNjMmVhM2UzMDY3MjJm
10
+ ZTk1MzM5Yzc4NTU1YjExZjIwZGZiZmZjZWIyMTIyZjY3MTc5ODQ2YmZkY2Qz
11
+ OTBkZTlhZDQ3MWY3NjExNjNkNzc5MWQ0MmNmNjgyM2I1YTlhNGM=
12
12
  data.tar.gz: !binary |-
13
- MDc2YTM3YTU5OWZiYjk5Y2IxYzlhNmYxNThjOGE2NzVmMDk3ZWRiMWZhYmFj
14
- MGRhNDI4NDk3MzhjNzU2MTgzY2MxM2VjYTIxZWMyZGMyZjg4ZWZjZjdlMGI5
15
- Nzg3MWJiMjJlNWQ3Yjk5MTM1MjJmNWJmNzRkZjdhMTYzNjc5NjE=
13
+ NWRkOGM1ZWQzNDkxMjE5YTlkMjNjMTEyMTkwZThmNzkxMDE1MDg0NjNlMTZi
14
+ ZmNiOGRmMmM0Y2EwY2YwNjQ5ODg4ZmIzMmE2MmE3ZDQzNGI5YmIzMDUxMzA1
15
+ ODRmZmJjNGFlM2JkNTcyNDkyZGFlMzY4YWFkZWFiMjRjODZkYTA=
@@ -3,6 +3,8 @@ require 'nokogiri'
3
3
  module Caboose
4
4
  class BlocksController < ApplicationController
5
5
 
6
+ helper :application
7
+
6
8
  #===========================================================================
7
9
  # Admin actions
8
10
  #===========================================================================
@@ -135,7 +137,10 @@ module Caboose
135
137
  :empty_text => params[:empty_text],
136
138
  :css => '|CABOOSE_CSS|',
137
139
  :js => '|CABOOSE_JAVASCRIPT|',
138
- :csrf_meta_tags => '|CABOOSE_CSRF|'
140
+ :csrf_meta_tags => '|CABOOSE_CSRF|',
141
+ :csrf_meta_tags2 => '|CABOOSE_CSRF|',
142
+ :logged_in_user => @logged_in_user,
143
+ :site => @site
139
144
  })
140
145
  }
141
146
  end
@@ -57,7 +57,7 @@ class Caboose::Block < ActiveRecord::Base
57
57
  end
58
58
 
59
59
  def child_value(name)
60
- b = child(name)
60
+ b = self.child(name)
61
61
  return nil if b.nil?
62
62
  return b.image if b.block_type.field_type == 'image'
63
63
  return b.file if b.block_type.field_type == 'file'
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.4.82'
2
+ VERSION = '0.4.83'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.82
4
+ version: 0.4.83
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-08-14 00:00:00.000000000 Z
11
+ date: 2014-08-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails