caboose-cms 0.7.7 → 0.7.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8cabbe7518c75a074f2ce3c8dfc4cf4f9e1ed349
4
- data.tar.gz: bf108c32cd8e7fb629f3d4fa046a2d9dcff9f8e8
3
+ metadata.gz: 2a672e82c544b160af5f8f7aa355f01eed9299d7
4
+ data.tar.gz: 5199417e578ff0f20cbc84e6aca74d460a26644c
5
5
  SHA512:
6
- metadata.gz: 472eaae0630a52bf0ec2e2c90f4d242c4afa71d545f549c60a7e69ca1bb7c464d7a37fed88db71ec38d4e5012f6998ca76ae83ad2761bbe22f8ed141d3e19bbb
7
- data.tar.gz: 4a17b18fe6b3a5e48bb0b81112f018bbc6a1db4c8cced97e863ccbd1c153c86b8980ea79df1033264b2803bb812015f07577c835872bdb817969e72ad66d1d68
6
+ metadata.gz: 6b3311b085feffa254dde3c901e96b0d1310150321beb948088348afa96cb75314f0148d02aa00ab245a2d78c546a75a6e21868b6eed29ee2b82d34fc9054afa
7
+ data.tar.gz: da90055337c5229dc604cd911ea32c59caff945c24a90002e2f5437033d9abfc541bf767de4fb6bfc43ee631bab86af98cb73be4c323d6eb8b2ed0f064c521ab
@@ -61,7 +61,7 @@ BoundDate = BoundControl.extend({
61
61
  // onSelect: function() { this2.save(); }
62
62
  //});
63
63
  $('#'+this.el).datetimepicker({
64
- format: 'm/d/Y',
64
+ format: this2.attribute.date_format ? this2.attribute.date_format : 'm/d/Y',
65
65
  //formatDate: 'm/d/Y',
66
66
  timepicker: false,
67
67
  //formatTime: 'g:i a', // 12-hour format without leading zeros + lowercase am/pm
@@ -89,7 +89,10 @@ BoundSelect = BoundControl.extend({
89
89
  this2.save();
90
90
  }, true);
91
91
  }
92
- caboose_modal_url(this2.attribute.quick_add_url);
92
+ if (typeof this2.attribute.quick_add_url == 'string')
93
+ caboose_modal_url(this2.attribute.quick_add_url);
94
+ else
95
+ caboose_modal_url(this2.attribute.quick_add_url(this2.model));
93
96
  }
94
97
  else
95
98
  {
@@ -311,8 +311,8 @@ IndexTable.prototype = {
311
311
  $.each(that.fields, function(j, field) {
312
312
  if (field.show && field.editable)
313
313
  {
314
- var attrib = $.extend({}, field);
315
- attrib['value'] = field.value(m);
314
+ var attrib = $.extend({}, field);
315
+ attrib['value'] = field.value(m);
316
316
  attrib['fixed_placeholder'] = false;
317
317
  attrib['after_update'] = function() { that.refresh_single(m.id); };
318
318
  new ModelBinder({
data/lib/caboose.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  require 'caboose/engine'
2
2
  require 'asset_sync'
3
3
  require 'delayed_job_active_record'
4
+ require 'awesome_print'
4
5
 
5
6
  module Caboose
6
7
 
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.7.7'
2
+ VERSION = '0.7.8'
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.7.7
4
+ version: 0.7.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-14 00:00:00.000000000 Z
11
+ date: 2015-10-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pg