caboose-cms 0.4.118 → 0.4.119

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTZmMTJmMzc3ZmZmMmNiYjJkY2I3MDk3NmMyZWJjOTZiZTZiM2NhMg==
+    YzMxZTViNWM5MWI1ZmI0OTE3NDA4N2Q1ZDJhNTAyZGI4NjU5NzMyMg==
   data.tar.gz: !binary |-
-    Mzg2OTJjZDFmM2NjOGNkZmQ1YjMwOWVjMTE0OTFmZTVkMWNiOTg2Mg==
+    NmE0MTNmZDkxNWNhMWM5ODY3NTE1MjU5ZTZkM2QwMjVhMDliOWJhYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTE3NmE3MWUyN2Y2MmU3ZDhjMWE4OTI2ZWQwNGU0OTFiZDg1Y2Y3ZWY3Mzg4
-    MTNlNzdmMzA1ODdmZjllYmQ1NGI3NzZmZjY2NWRiYzAwNjJiN2ZlN2E0MjI0
-    MjgxOGQ4MTI5MTBkNzE5MjVhMTdhMDJmODVlNmYxODMzZjk2OWM=
+    YjViNjJlOTUyZWQyMTYwMzY5YmFhNjhjZWE4ZjQ5MzUxYmUwM2U5MDEwZjky
+    NzgzZGRmMDk5MjZiOGJjZGExNGRhMGQ0ZWU2MmQzNjJhMTc5ZjMyZTJhMzA5
+    MGNmMmUxODE5ZWFiMTcxMGJjM2U1YTk5MGYxMTExMmNkZGM3ODc=
   data.tar.gz: !binary |-
-    MjBhYzg5ODA3ZGFiNTU1YzI1ZTEzY2Y3Mzk2NDhlMDBlODE1YzhjOTYwYzkw
-    NTdiNmU2ZTU5N2NjZDlkNmY3NDNmM2Y4NWEyMzQ2OTlhMDcyNzNmZTA5NWJl
-    M2IxY2IyZjBjYzQ5MWQ1N2E1NDdjZWJiNjdlYTc1MGEyNTI1ZjU=
+    MTExMzBjODA3Y2Y0Mjk5NmY0YjQ2YzFlOWZmNDZiYmI2M2VmZDAyZDlkNjFl
+    NjFmZGRmMGU3NDRkMDVhNTI3MTAyMDljMWJmODQyMzY1MTY3MzM0ZmRkNWY5
+    ODAzNGI5NTRjZWFmMGZjYjZiYzk0OTRjNjlkNWE4NTg4YTkzNjU=

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

@@ -237,12 +237,11 @@ IndexTable.prototype = {
     $.each(this.fields, function(i, field) {
       if (field.show)
       {
-        var arrow = that.pager_params.sort == field.sort ? (parseInt(that.pager_params.desc) == 1 ? ' ↑' : ' ↓') : '';
-        //var link = url + "sort=" + field.sort + "&desc=" + (that.pager_params.sort == field.sort ? (parseInt(that.pager_params.desc) == 1 ? '0' : '1') : '0');
-        //var link = that.pager_url({
+        var s = field.sort ? field.sort : field.name;
+        var arrow = that.pager_params.sort == s ? (parseInt(that.pager_params.desc) == 1 ? ' ↑' : ' ↓') : '';                
         var link = that.pager_hash({
-          sort: field.sort,
-          desc: (that.pager_params.sort == field.sort ? (parseInt(that.pager_params.desc) == 1 ? '0' : '1') : '0')
+          sort: s,
+          desc: (that.pager_params.sort == s ? (parseInt(that.pager_params.desc) == 1 ? '0' : '1') : '0')
         });
                 
         var input = $('<input/>').attr('type', 'checkbox').attr('id', 'quick_edit_' + field.name).val(field.name)            
@@ -255,7 +254,7 @@ IndexTable.prototype = {
         tr.append($('<th/>').append(input).append('<br/>')
           .append($('<a/>')
             .attr('href', link)            
-            .data('sort', field.sort)                        
+            .data('sort', s)                        
             .html(field.nice_name + arrow)            
           )
         );

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.118'
+  VERSION = '0.4.119'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.118
+  version: 0.4.119
 platform: ruby
 authors:
 - William Barry