datatablesnet 1.1.5 → 1.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    datatablesnet (1.1.4)
+    datatablesnet (1.1.5)
 
 GEM
   remote: http://rubygems.org/

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

@@ -30,7 +30,7 @@
     - if options[:show_actions].to_b
       %th Actions
     - if options[:server_side].to_b
-      %th
+      %th.hidden
   %tbody
     - unless options[:data_url].present?
       - rows.each do |row|

data/lib/datatablesnet/datatable.rb

@@ -66,7 +66,7 @@ module Datatable
                    :auto_scroll => "bScrollInfinite",
                    :pagination_type => "sPaginationType",
                    :paginate => "bPaginate",
-                   :save_state => "bStateSave"
+                   :save_state => "bStateSave",
                    }
 
 
@@ -74,11 +74,14 @@ module Datatable
       {
         :show_actions       => false,
         :per_page           => 25,
-        :toolbar_external   => false
+        :toolbar_external   => false,
+        :show_only_when_searched => false
       }.merge(options)
 
-    url = URI::split(options[:data_url]);
-
+    if options[:data_url].present?
+      url = URI::split(options[:data_url])
+    end
+    
     index = 0
     columns.each do |column|
       column[:label] = field_to_label(column[:field]) unless column[:label].present?
@@ -94,6 +97,10 @@ module Datatable
       index += 1
     end
 
+    if options[:show_only_when_searched]
+      options[:data_url] << "&show_only_when_searched=true"
+    end
+
     if options[:toolbar].present? or options[:toolbar_external]
       options[:dom]='<"toolbar">lfrtip'
     end
@@ -105,6 +112,11 @@ module Datatable
       end
     end
 
+    if options[:language].present?
+      puts "language present"
+      table_options["oLanguage"] = datatable_get_language_defs(options[:language])
+    end
+
     table_options["fnInfoCallback"] = NoEscape.new(options[:info_callback]) if options[:info_callback].present?
 
     table_options["aoColumns"] = datatable_get_column_defs(options,columns)
@@ -115,6 +127,21 @@ module Datatable
     render :partial => "datatablesnet/table", :locals => { :table_id => id, :columns => columns, :rows => rows, :config => config}
   end
 
+  def datatable_get_language_defs options
+    language_options_map = {:info_empty => "sInfoEmpty",
+                            :info_filtered => "sInfoFiltered",
+                            :empty_table => "sEmptyTable",
+                            :zero_records => "sZeroRecords"}
+
+    language_options = {}
+    language_options_map.each do |k,v|
+      if options[k].present?
+        language_options[v] = options[k]
+      end
+    end
+    language_options
+  end
+
   def datatable_get_column_defs options, columns
     column_defs = []
     column_options_map = {:width => "sWidth",
@@ -201,6 +228,13 @@ module Datatable
     columns = []
     order_by = {}
     filter_by = {}
+
+    if params["show_only_when_searched"].present?
+      grid_options[:show_only_when_searched] = true
+    else
+      grid_options[:show_only_when_searched] = false
+    end
+
     (0..params[:iColumns].to_i-2).each do |index|
       column = {}
       column[:field] = params["column_field_#{index}"]
@@ -340,6 +374,16 @@ module Datatable
       end
     end
 
+    if grid_options[:show_only_when_searched]
+      if grid_options[:search_by].empty?
+        json_data = {:sEcho => params[:sEcho],
+             :iTotalRecords =>  0,
+             :iTotalDisplayRecords => 0,
+             :aaData => []}
+        return json_data
+      end
+    end
+
     # Build filter by
     options[:conditions] = build_condition_internal(klass, grid_options, options[:conditions].present? ? options[:conditions] : nil)
 

data/lib/datatablesnet/version.rb

@@ -1,3 +1,3 @@
 module Datatablesnet
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Matt Fields
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 +03:00
+date: 2011-09-30 00:00:00 +03:00
 default_executable: 
 dependencies: []