it-logica-application-backbone 1.3.6 → 1.3.7

data/VERSION

@@ -1 +1 @@
-1.3.6
+1.3.7

data/it-logica-application-backbone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "1.3.6"
+  s.version = "1.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]
-  s.date = "2012-12-18"
+  s.date = "2013-01-03"
   s.description = "longer description of your gem"
   s.email = "ladislav.smola@it-logica.cz"
   s.extra_rdoc_files = [

data/lib/table_settings.rb

@@ -53,14 +53,14 @@ class TableSettings
   #
   # @return [TableSettings::Column]
   #
-  def add_column( name,
-                  label                 = nil,
-                  table                 = @default_table)
+  def add_column(name,
+      label = nil,
+      table = @default_table)
 
     column = ::TableSettings::StandardColumn.new(self, @column_index)
 
     label = default_label(name) if label.nil?
-    column.params( name, label, table)
+    column.params(name, label, table)
 
     yield(column) if block_given?
 
@@ -81,22 +81,22 @@ class TableSettings
   #
   # @return [TableSettings::Column]
   #
-  def add_custom_column( name,
-                         label,
-                         column_method,
-                         column_class   = nil,
-                         column_params  = nil
+  def add_custom_column(name,
+      label,
+      column_method,
+      column_class = nil,
+      column_params = nil
 
   )
     column = ::TableSettings::CustomColumn.new(self, @column_index)
 
 
     label = default_label(name) if label.nil?
-    column.params( name,
-                   label,
-                   column_method,
-                   column_class,
-                   column_params
+    column.params(name,
+                  label,
+                  column_method,
+                  column_class,
+                  column_params
     )
     yield(column) if block_given?
 
@@ -139,9 +139,13 @@ class TableSettings
     self
   end
 
-  def order_by(row_name = "id", table_name = @default_table)
-    @settings[:default][:order_by] = table_name.to_s+"."+row_name.to_s
-
+  def order_by(row_name = "id", table_name = @default_table, use_table_name = true)
+    if use_table_name && !table_name.nil?
+      @settings[:default][:order_by] = table_name.to_s+"."+row_name.to_s
+    else
+      @settings[:default][:order_by] = row_name.to_s
+      order_by_direction("")
+    end
     self
   end
 
@@ -172,6 +176,7 @@ class TableSettings
 
     self
   end
+
   #  Metoda, ze ktere se filtruje tabulka
   def filter_method(name)
     @settings[:filter_method] = name
@@ -183,6 +188,7 @@ class TableSettings
     @settings[:show_table_method] = name
     self
   end
+
   ##
   # ID tagu (napr. <div>), do ktereho se ma prekreslit cela tabulka
   # (napr. pro tlacitko "Smazat filtr")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-18 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &71481370 !ruby/object:Gem::Requirement
+  requirement: &69814360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *71481370
+  version_requirements: *69814360
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &71480810 !ruby/object:Gem::Requirement
+  requirement: &69813830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *71480810
+  version_requirements: *69813830
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &71479920 !ruby/object:Gem::Requirement
+  requirement: &69812880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *71479920
+  version_requirements: *69812880
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &71478220 !ruby/object:Gem::Requirement
+  requirement: &69811180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *71478220
+  version_requirements: *69811180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &74062430 !ruby/object:Gem::Requirement
+  requirement: &72674710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *74062430
+  version_requirements: *72674710
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &74061400 !ruby/object:Gem::Requirement
+  requirement: &72673650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *74061400
+  version_requirements: *72673650
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &74060470 !ruby/object:Gem::Requirement
+  requirement: &72672710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74060470
+  version_requirements: *72672710
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -632,7 +632,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 840342835
+      hash: 119602029
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: