express_admin 1.7.24 → 1.7.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd9ac1eda63fbbe8d3c7730b963ab6ce4c3010d1
-  data.tar.gz: b518962a086923b836ad72a6202ae43b9fba04a3
+  metadata.gz: ead2f7234d30986e7ae5191a3b2ab0e52255f4e1
+  data.tar.gz: 12034e77823a4c1f6c5235366b1cca85397320e1
 SHA512:
-  metadata.gz: fd1b549d3cf7ac097f4053f04c54d0a466217925ea6d8ad9cd3a5bd003a9f1034ed3d0818e5753027fa602d61e4960559042121efc6e667227d4a4495d79e2db
-  data.tar.gz: 5a04a5f5e20eef582b15263c084bacb0ed0e0b38debe7007c74357925cbd8fff4a70f7f079d56138b059239ae96aca24ec0ac55d1b8264a20c490797f034b57d
+  metadata.gz: 41eeca514e5102d7d5fd3df73296e49142c1b5eee4c450cd466408ed77d37528ba6f6e755c9ec726d2ed696cfd71dc8bf52424fe14d34eb9d758ed5ed8b31e3f
+  data.tar.gz: 162968e3617a7c3db30d5e626887e8e6e3dba6672098aa2f7f2edd5651dcddb198a2c68b84474e67f59130f97953241b7daf2840cbab0e75a984a07d7cfeb566

data/app/assets/stylesheets/express_admin/sections/_main_region.sass

@@ -6,7 +6,8 @@
     @include grid-size(8)
   @include breakpoint(large)
     @include grid-size(9)
-
+  @include breakpoint(xlarge)
+    @include grid-size(10)
   border:
     right: 1px solid $border-color
 

data/app/assets/stylesheets/express_admin/sections/_page_body.sass

@@ -6,4 +6,4 @@
     @include grid-orient(horizontal)
     @include grid-size(10)
   @include breakpoint(xlarge)
-    @include grid-size(11)
+    @include grid-size(10)

data/app/assets/stylesheets/express_admin/sections/_page_sidebar.sass

@@ -5,5 +5,5 @@
   @include breakpoint(medium)
     @include grid-size(2)
   @include breakpoint(xlarge)
-    @include grid-size(1)
+    @include grid-size(2)
   border-right: #dedede 1px solid

data/app/assets/stylesheets/express_admin/sections/_sidebar_region.sass

@@ -6,3 +6,6 @@
     @include grid-size(4)
   @include breakpoint(large)
     @include grid-size(3)
+  @include breakpoint(xlarge)
+    @include grid-size(2)
+

data/app/components/express_admin/smart_table.rb

@@ -190,7 +190,9 @@ module ExpressAdmin
                     end
                   elsif attrib = accessor.to_s.match(COLUMN_REGEX_LIST[:link]).try(:[], 1)
                     # TODO: only works with non-namespaced routes
-                    helpers.link_to item.send(attrib), resource_path(item)
+                    if item.send(attrib).present?
+                      helpers.link_to item.send(attrib), resource_path(item)
+                    end
                   elsif attrib = accessor.to_s.match(COLUMN_REGEX_LIST[:checkmark]).try(:[], 1)
                     "<i class='ion-checkmark-round'></i>".html_safe if item.send(attrib)
                   elsif attrib = accessor.to_s.match(COLUMN_REGEX_LIST[:in_words]).try(:[], 1)

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.24"
+  VERSION = "1.7.25"
 end

data/test/dummy/test/components/smart_table_test.rb

@@ -91,6 +91,15 @@ module Components
       assert_match /column3.*href="\/widgets\/(\d+)/, fragment
     end
 
+    test '_link does not generate a link when nil' do
+      fragment = arbre(widgets: Widget.all) {
+          smart_table(:widgets, columns: {
+              'A link column' => :column3_link
+            })
+        }
+      assert_match "<td class=\"column3_link\"></td>", fragment
+    end
+
     test 'timestamp accessor appeneded with _in_words generates code that uses time_ago_in_words' do
       fragment = arbre(widget: Widget.first, widgets: Widget.all) {
           smart_table(:widgets, columns: {

data/test/fixtures/widgets.yml

@@ -18,3 +18,11 @@ two:
   column5: false
   column6: MyString
   column7: 1
+
+three:
+  category: tools
+  column2: Hammer
+  column3: ''
+  column4: 2015-05-25 15:12:06
+  column5: false
+  column6: MyString

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.24
+  version: 1.7.25
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: express_templates