caboose-cms 0.6.33 → 0.6.34

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjgzNGU1YzAzMmJhOWNjNjg2MTc1N2M2ZTk1MTA4NjczMzExZWFkMQ==
+    ZDc5ZjY1NTljMGNjZTM5NGU2ODNlYmIyNmNkODM1OGRkNTEwZGVkYw==
   data.tar.gz: !binary |-
-    MjkyMmY2NDA0ZTYwOTUxNTEyYjljMWIyY2VhYTcwN2Y2NWZiNmNlNg==
+    Yzk1YmZmOTdhYzQyMGUyYWI3ODcwYzdiMmU2OTMzNzUxNjE2OTA4NQ==
 SHA512:
   metadata.gz: !binary |-
-    MzRmNzQwZmI3YTMxNDU3OTgzMzQ5NzBmYTA2N2VjYTQ0YWEyNTMwNTU4ZDM5
-    ZTg2OTY4OGVjMWQ3ZWQ1NzM2MTdjOGE5NmM0ZWU5OTEzNDhkZTZiOGUyOGQ4
-    NTE1NDM5MjRiNTFhM2NkMGM4M2E1Yjk1MjkyOGNkNmY0YjUyOWQ=
+    YmQzMjRiY2ExZmNjNzkyMmU0YjFkZjhhZGFiMjcwNzU3ODcyNGIyOTA3MjI5
+    ODEwZmEwNTI5MGYyMmYzZTNkYTViY2Y3ZWU1Mzg0YWVmMGFmZGZkNzhiOGRk
+    NDZiZTM1MWU3MDBhZDUyNzAxMTFlMmMyNmVhOWRlMWJlYTM0MDU=
   data.tar.gz: !binary |-
-    NzdmMzRiMDRjYzlmZjQ3ZDEyN2UwZGI2ZGQ4MjZlMmMwMGExYjJlMzQ3MGUz
-    ZWRhZTk5ZGQ2MjA1YWM3NzIwODJkOThhNzhhZjhkN2E1NmZmNjA1N2I5Y2Rm
-    ZjljMDI2N2Q0Mjg3MGM4NGZkOGFkNmVkNzJkZWMwYTM4NDYxNjA=
+    Njg5YmI2MGQyOGE2ODk1ZmQ3NTUxZTUxYmFiMTg5ZTY1NTQyYTFhMTE4NzYx
+    NDk1YjA4ZjZhMzI3MDUzYmMzOTYyNTFkZDNjNDJhZTRmOWM3YzQ2YTBjOWY4
+    YmNlYTNhNTI3MDNkMWE0NGYwYzNjNmNjNWZjMjAyOWRlMTJhOWI=

data/app/assets/javascripts/caboose/modal_integration.js

@@ -83,6 +83,8 @@ function caboose_modal_url(url)
   });
 }
 
+var caboose_modal_close_handler = function(var1){};
+
 function caboose_fix_colorbox() {
   var color = '#111';
   if (typeof COLORBOX_COLOR !== 'undefined')

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

@@ -28,7 +28,9 @@ Attribute.prototype = {
   minute_increment: 15,
   hour_increment: 1,
   show_check_all: true,
-  show_empty_option: false,  
+  show_empty_option: false,
+  quick_add_url: false,
+  quick_add_text: 'Add New',  
   
   update_url: false,
   options_url: false,
@@ -59,10 +61,10 @@ Attribute.prototype = {
 		});
   },
   
-  populate_options: function(after) {
+  populate_options: function(after, refresh) {
     if (!this.options_url)
       return;        
-    if (this.options)
+    if (this.options && !refresh)
     {
       if (after) after();
       return;

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

@@ -65,10 +65,37 @@ BoundSelect = BoundControl.extend({
         .attr('id', this2.el + '_select')
         .addClass('mb_fake')
         .css('width', $('#'+this2.el).outerWidth())        
-        .on('change', function() {
+        .on('change', function() {                
           var v = $('#'+this2.el+'_select').val();
-          $('#'+this2.el).val(v);                    
-          this2.save();                     
+          if (this2.attribute.quick_add_url && v == 'quickadd')
+          {                        
+            caboose_modal_close_handler = function(new_id) {              
+              this2.attribute.populate_options(function() {
+                var select2 = $('#' + this2.el + '_select');
+                select2.empty();
+                if (this2.attribute.show_empty_option)  select.append($('<option/>').val('').html('-- Empty --'));
+                if (this2.attribute.quick_add_url)      select.append($('<option/>').val('quickadd').html('-- ' + this2.attribute.quick_add_text + ' --'));
+                $.each(this2.attribute.options, function(i, option) {
+                  var opt = $('<option/>').val(option.value).html(option.text);
+                  if (option.value == new_id)
+                  {
+                    this2.attribute.text = option.text;
+                    $('#'+this2.el).val(this2.attribute.text);
+                    opt.attr('selected', 'true');
+                  }
+                  select.append(opt);
+                });
+                $('#'+this2.el).val(new_id);
+                this2.save();
+              }, true);
+            }
+            caboose_modal_url(this2.attribute.quick_add_url);            
+          }
+          else
+          {
+            $('#'+this2.el).val(v);                    
+            this2.save();
+          }
         });        
       // Make sure the existing value is in the list of options
       var exists = false;
@@ -87,7 +114,9 @@ BoundSelect = BoundControl.extend({
         });
       }      
       if (this2.attribute.show_empty_option)      
-        select.append($('<option/>').val('').html('-- Empty --'));        
+        select.append($('<option/>').val('').html('-- Empty --'));
+      if (this2.attribute.quick_add_url)      
+        select.append($('<option/>').val('quickadd').html('-- ' + this2.attribute.quick_add_text + ' --'));
       $.each(this2.attribute.options, function(i, option) {
         var opt = $('<option/>')
           .val(option.value)

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.33'
+  VERSION = '0.6.34'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.33
+  version: 0.6.34
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg