datatablesnet 1.1.2 → 1.1.3

data/app/views/datatablesnet/_table.html.haml

@@ -11,6 +11,9 @@
     }
   });
 
+
+
+
 -if options[:toolbar].present?
   %div{:id => table_id + "_toolbar", :style => "display:none"}
     - options[:toolbar].each do |toolbar_item|

data/lib/datatablesnet/datatable.rb

@@ -134,7 +134,7 @@ module Datatable
       column_options["fnRender"] = NoEscape.new(options[:render]) if column[:render].present?
       column_options["fnRender"] = NoEscape.new("function (obj) {return #{column[:format]}(obj.aData[#{column_index}])}") if column[:format].present?
       if column[:view_link].present? and options[:server_side]
-        column_options["fnRender"] = NoEscape.new("function (obj) {return '<a href = ' + obj.aData[#{columns.length}]['urls']['#{column[:field]}'] + '>' + obj.aData[#{column_index}] + '</a>'}")
+        column_options["fnRender"] = NoEscape.new("function (obj) {if(obj.aData[#{columns.length}]['urls']['#{column[:field]}']!=null) {return '<a href = ' + obj.aData[#{columns.length}]['urls']['#{column[:field]}'] + '>' + obj.aData[#{column_index}] + '</a>'} else {return obj.aData[#{column_index}]} }")
       end
 
       unless column_options.empty?
@@ -175,7 +175,12 @@ module Datatable
       if column[:view_link] == "."
         return link_to(obj, row)
       else
-        return link_to(obj, row.send(column[:view_link]))
+        link_obj = row.send(column[:view_link])
+        if link_obj
+          return link_to(obj, link_obj)
+        else
+          return obj
+        end
       end
     else
       return obj
@@ -376,7 +381,12 @@ module Datatable
         if view_link == "."
           url = url_helper.url_for(row)
         else
-          url = url_helper.url_for(row.send(view_link))
+          link_obj = row.send(view_link)
+          if link_obj
+            url = url_helper.url_for(link_obj)
+          else
+            url = nil
+          end
         end
         meta[:urls][column[:field]] = url
       end

data/lib/datatablesnet/version.rb

@@ -1,3 +1,3 @@
 module Datatablesnet
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Matt Fields
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-25 00:00:00 +03:00
+date: 2011-08-31 00:00:00 +03:00
 default_executable: 
 dependencies: []