it-logica-application-backbone 0.2.32 → 0.2.33

data/VERSION

@@ -1 +1 @@
-0.2.32
+0.2.33

data/app/views/helpers/_build_table_wrapper.html.erb

@@ -9,10 +9,10 @@
     <% if !settings[:row].blank? && !settings[:row][:functions].blank? %>
         <th></th>
     <% end %>
-    <% order_by_arr = settings[:params][:order_by].downcase.split(",") %>
+    <% order_by_arr = settings[:params][:order_by].downcase.split(",") unless  settings[:params][:order_by].blank?  %>
     <% settings[:columns].each do |col| %>
-        <% order_asc_id = (col[:table] + "___" + col[:name] + "___asc") %>
-        <% order_desc_id = (col[:table] + "___" + col[:name] + "___desc") %>
+        <% order_asc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___asc")  %>
+        <% order_desc_id = (col[:table].blank? || col[:name].blank?) ? "" : (col[:table] + "___" + col[:name] + "___desc") %>
         <th class="<%= col[:class] %>">
           <div class="th_label">
             <span><%= col[:label].html_safe %></span>

data/it-logica-application-backbone.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "it-logica-application-backbone"
-  s.version = "0.2.32"
+  s.version = "0.2.33"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ladas"]

data/lib/model_mixins/table_builder_class_methods.rb

@@ -113,7 +113,14 @@ module ModelMixins
 
         settings.merge!({:data => items_array})
       else
-        template_items = object.joins("LEFT OUTER JOIN (" + not_selected_items.uniq.select(settings[:row][:id] + " AS row_id").to_sql + ") temp_template_query ON #{settings[:row][:id]} = temp_template_query.row_id")
+        #template_items = object.joins("RIGHT OUTER JOIN (" + not_selected_items.uniq.select(settings[:row][:id] + " AS row_id").to_sql + ") temp_template_query ON #{settings[:row][:id]} = temp_template_query.row_id")
+        if object.respond_to?(:klass)
+          template_items = object.klass.joins("RIGHT OUTER JOIN (" + items.uniq.to_sql + ") temp_template_query ON #{settings[:row][:id]} = temp_template_query.row_id")
+        else
+          template_items = object.joins("RIGHT OUTER JOIN (" + items.uniq.to_sql + ") temp_template_query ON #{settings[:row][:id]} = temp_template_query.row_id")
+        end
+
+        template_items = template_items.includes(settings[:includes])
         settings.merge!({:data => template_items})
       end
       settings.merge!({:data_paginate => items})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 0.2.32
+  version: 0.2.33
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &84851190 !ruby/object:Gem::Requirement
+  requirement: &76177650 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *84851190
+  version_requirements: *76177650
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &84850670 !ruby/object:Gem::Requirement
+  requirement: &76177170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84850670
+  version_requirements: *76177170
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &84850020 !ruby/object:Gem::Requirement
+  requirement: &76176540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *84850020
+  version_requirements: *76176540
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &84849240 !ruby/object:Gem::Requirement
+  requirement: &76175710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *84849240
+  version_requirements: *76175710
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &84848680 !ruby/object:Gem::Requirement
+  requirement: &76175130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *84848680
+  version_requirements: *76175130
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &84848020 !ruby/object:Gem::Requirement
+  requirement: &76174660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *84848020
+  version_requirements: *76174660
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -563,7 +563,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -909762449
+      hash: -468190835
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: