caboose-cms 0.3.91 → 0.3.92

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWJlYWJiMWRhNDA4MjY4ZTBhNTNkZDhjMjc4OTVmYTcxNmJhZTFmYw==
+    N2I0NjQ2MWY3OGM0NDY4ODc1OTUzMmIyNzJlMjhkM2Y3ZDMyZDBhMQ==
   data.tar.gz: !binary |-
-    NWFiYTE5NGZlYmNmZGFiZTg1Y2I0ZTUxMjI1NzI3MzVmMTI2ODcyMA==
+    YWU1OGQ1MzllYjVkYTY1NjNjNWQzYjU0MWIwMTEyMGVkZDM0YzYzYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTgyNGJmMGI3ZGE2NGRmYTc4ZWZmNGU1N2E3MjYyZmQ0N2I5ODU5OTNjMzQ0
-    MWVmZmY0ZGM4NjQ0ODEzNmE2MjM5OTU4MzliY2MyNTAzNzA4OTVkMzMzZmQw
-    OTY3ZjIwNmRkMDk0NGQyZWIxODBmY2QxNjgyNTcyZjBmZWI1ZTY=
+    YzJkMmUwMmFlNmIxOWQ3OTVmMjc4NzU0YzNmMGE5YzJlMTU4NGFlYmU5NWZj
+    NmE3M2ExYzVmODAyYmYzODA0YTBmOTM0NmY3ZGQ4ZDgwY2JmZjRhNzIxNjA2
+    MzdiZDI3MTU2YzgwYjY5OTUwYjIwNWI4YmNmMmRkMzZlOTYwMTk=
   data.tar.gz: !binary |-
-    YmUzYThlZWFjNjc1YzQ2ZTU1ZjVjOTA1OWY4MjRiYzkzZWE2MjY3MGFkMjRk
-    ODgwZmVkZGE2MmNjN2M0MjU3YzBhNzIyYzk1YzJlYTQ2NTg0ODk5MzUwOTI3
-    NmYyMWNiZjY0YzYxOGMzZmIxYzUxN2E2NjY5YmVhNGM1NDBkZmU=
+    OTg4NmZmNTM3ZGE4N2QyNjc1MmFhYzg1M2MwNzViMjA5Mjg3OTFiMWEyNjQz
+    M2EyZTkzZjI4MzhhOGIxNWQ2NGFlOTk1MTJiZGI5MTY2MWJlODcxMWM4YmU0
+    YmJmYTEzMDA5MWFjNTAyMGU0YzhlYjdiM2MzZmY3Nzg2MDM0M2I=

data/app/assets/javascripts/caboose/model/bound_select.js

@@ -89,7 +89,11 @@ BoundSelect = BoundControl.extend({
           .val(option.value)
           .html(option.text);
         if (option.value == this2.attribute.value)
+        {
+          this2.attribute.text = option.text;
+          $('#'+this2.el).val(this2.attribute.text);
           opt.attr('selected', 'true');
+        }
         select.append(opt);
       });      
       $('#'+this2.el+'_container').append(select);
@@ -136,7 +140,11 @@ BoundSelect = BoundControl.extend({
   save: function() {
     this.attribute.value = $('#'+this.el).val();
     var this2 = this;
-    this.model.save(this.attribute, function(resp) {
+    this.model.save(this.attribute, function(resp) {      
+      $(this2.attribute.options).each(function(i,opt) {
+        if (opt.value == this2.attribute.value)
+          this2.attribute.text = opt.text;        
+      });
       if (this2.attribute.text)
         $('#'+this2.el).val(this2.attribute.text);        
       $('#'+this2.el+'_check a').removeClass('loading');

data/app/controllers/caboose/page_block_fields_controller.rb

@@ -62,36 +62,17 @@ module Caboose
 
       params.each do |k,v|
         case k
-          when 'page_block_type_id' 
-            field.page_block_type_id = v
-            break
-          when 'name'               
-            field.name = v
-            break
-          when 'field_type'
-            field.field_type = v
-            break
-          when 'nice_name'      
-            field.nice_name = v
-            break
-          when 'default'       
-            field.default = v
-            break
-          when 'width'       
-            field.width = v
-            break
-          when 'height'    
-            field.height = v
-            break
-          when 'fixed_placeholder'
-            field.fixed_placeholder = v
-            break
-          when 'options'            
-            field.options = v
-            break
-          when 'options_url' 
-            field.options_url = v
-            break
+          when 'page_block_type_id' then field.page_block_type_id = v
+          when 'name'               then field.name               = v
+          when 'field_type'         then field.field_type         = v
+          when 'nice_name'          then field.nice_name          = v
+          when 'default'            then field.default            = v
+          when 'width'              then field.width              = v
+          when 'height'             then field.height             = v
+          when 'fixed_placeholder'  then field.fixed_placeholder  = v
+          when 'options'            then field.options            = v
+          when 'options_function'   then field.options_function   = v
+          when 'options_url'        then field.options_url        = v
         end
       end
     
@@ -130,7 +111,9 @@ module Caboose
       return unless user_is_allowed('pages', 'edit')
       f = PageBlockField.find(params[:id])            
       options = []
-      if f.options
+      if f.options_function
+        options = f.render_options
+      elsif f.options
         options = f.options.strip.split("\n").collect { |line| { 'value' => line, 'text' => line }}
       end        
       render :json => options

data/app/models/caboose/page_block.rb

@@ -40,8 +40,7 @@ class Caboose::PageBlock < ActiveRecord::Base
     end
   end
   
-  def render_from_function(empty_text = nil, editing = false)
-    Caboose.log("editing = #{editing}")
+  def render_from_function(empty_text = nil, editing = false)    
     locals = OpenStruct.new(:block => self, :empty_text => empty_text, :editing => editing)
     erb = ERB.new(page_block_type.render_function)
     return erb.result(locals.instance_eval { binding })

data/app/models/caboose/page_block_field.rb

@@ -4,6 +4,18 @@ class Caboose::PageBlockField < ActiveRecord::Base
 
   belongs_to :page_block_type
   has_many :page_block_field_values, :dependent => :destroy
-  attr_accessible :id, :page_block_type_id, :name, :field_type, :nice_name, :default, :width, :height, :fixed_placeholder, :options, :options_url 
+  attr_accessible :id, 
+    :page_block_type_id, 
+    :name, :field_type, 
+    :nice_name, :default, 
+    :width, :height, 
+    :fixed_placeholder, 
+    :options,
+    :options_function,
+    :options_url
+    
+  def render_options(empty_text = nil)    
+    return eval(self.options_function)    
+  end
   
 end

data/app/models/caboose/schema.rb

@@ -128,6 +128,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :height               , :integer ],
         [ :fixed_placeholder    , :boolean ],
         [ :options              , :text    ],
+        [ :options_function     , :text    ],
         [ :options_url          , :string  ]
       ],
       Caboose::PageBlockFieldValue => [

data/app/views/caboose/page_block_fields/admin_edit.html.erb

@@ -11,6 +11,7 @@ block_type_id = @field.page_block_type.id
 <div id='pageblockfield_<%= @field.id %>_height'></div>
 <div id='pageblockfield_<%= @field.id %>_fixed_placeholder'></div>
 <div id='pageblockfield_<%= @field.id %>_options_url'></div>
+<div id='pageblockfield_<%= @field.id %>_options_function'></div>
 <div id='pageblockfield_<%= @field.id %>_options'></div>
 <br />
 
@@ -20,6 +21,11 @@ block_type_id = @field.page_block_type.id
 <input type='button' value='Delete Field' onclick="delete_field(<%= @field.id %>);" />
 </p>
 
+<% content_for :caboose_css do %>
+<style type='text/css'>
+#pageblockfield_<%= @field.id %>_options_function { font-family: Courier; font-size: 80%; }
+</style>
+<% end %>
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">
@@ -61,6 +67,7 @@ $(document).ready(function() {
       { name: 'height'              , nice_name: 'Height'             , type: 'text'     , value: <%= raw Caboose.json(@field.height)            %>, width: 400 },
       { name: 'fixed_placeholder'   , nice_name: 'Fixed placeholder'  , type: 'checkbox' , value: <%= raw Caboose.json(@field.fixed_placeholder) %>, width: 400 },
       { name: 'options_url'         , nice_name: 'Options URL'        , type: 'text'     , value: <%= raw Caboose.json(@field.options_url)       %>, width: 400 },
+      { name: 'options_function'    , nice_name: 'Options Function'   , type: 'textarea' , value: <%= raw Caboose.json(@field.options_function)  %>, width: 400, height: 100 },
       { name: 'options'             , nice_name: 'Options'            , type: 'textarea' , value: <%= raw Caboose.json(@field.options)           %>, width: 400, height: 100 }                         
     ]
   });

data/app/views/caboose/page_block_types/admin_edit.html.erb

@@ -32,6 +32,11 @@
 <input type='button' value='Delete Block Type' onclick="delete_block_type(<%= @block_type.id %>);" />
 </p>
 
+<% content_for :caboose_css do %>
+<style type='text/css'>
+#pageblocktype_<%= @block_type.id %>_render_function { font-family: Courier; font-size: 80%; }
+</style>
+<% end %>
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <script type="text/javascript">

data/app/views/caboose/page_blocks/admin_edit.html.erb

@@ -44,8 +44,8 @@ $(document).ready(function() {
         width: <% if f.width %><%= raw Caboose.json(f.width) %><% else %>780<% end %>,
         <% if f.height                %>height: <%=            raw Caboose.json(f.height)            %>,<% end %>
         <% if f.fixed_placeholder     %>fixed_placeholder: <%= raw Caboose.json(f.fixed_placeholder) %>,<% end %>
-        <% if f.options               %>options_url: '/admin/page-block-fields/<%= f.id %>/options',<%
-           elsif f.options_url        %>options_url: <%=       raw Caboose.json(f.options_url)       %>,<% end %>
+        <% if f.options || f.options_function %>options_url: '/admin/page-block-fields/<%= f.id %>/options',<%
+           elsif f.options_url        %>options_url: <%=       raw Caboose.json(f.options_url)   %>,<% end %>
         <% if f.field_type == 'image' %>update_url: '/admin/page-block-field-values/<%= fv.id %>/image',
         image_refresh_delay: 100,
         <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.91'
+  VERSION = '0.3.92'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.91
+  version: 0.3.92
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails