it-logica-application-backbone 1.0.4 → 1.0.5

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/app/assets/javascripts/backbone_js/ladas_loading.js

@@ -238,7 +238,7 @@ function parse_link_and_load_page(element) {
     var settings = {};
     settings['url'] = element.attr("href");
     settings['symlink_remote'] = true;
-    if (element.data("content_id").length > 0) {
+    if (typeof(element.data("content_id")) != 'undefined') {
         settings['content_id'] = element.data("content_id");
     }
     load_page(settings);
@@ -250,7 +250,7 @@ function parse_link_and_post(element) {
     settings['symlink_remote'] = true;
     settings['data'] = element.data("post");
     settings['method'] = "post";
-    if (element.data("content_id").length > 0) {
+    if (typeof(element.data("content_id")) != 'undefined') {
         settings['content_id'] = element.data("content_id");
     }
 

data/app/assets/javascripts/backbone_js/ladas_table_builder.js.coffee

@@ -53,6 +53,8 @@ class TableBuilder
           # its just string
           text = ""
           text = row[col.table + '_' + col.name] if row[col.table + '_' + col.name]?
+          text = row[col.name] if row[col.name]? && text? && text.length <= 0
+
           sliced_text = text
           if (col.max_text_length)
             max = col.max_text_length - 3
@@ -64,6 +66,8 @@ class TableBuilder
           # its something else eg. number cant be sliced, or its probably aliens Kveigars
           text = ""
           text = row[col.table + '_' + col.name] if row[col.table + '_' + col.name]?
+          text = row[col.name] if row[col.name]? && text? && text.length <= 0
+          console.log[text]
 
           TableBuilder.html += '<span title="' + text + '">' + text + '</span>'
 

data/it-logica-application-backbone.gemspec

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

data/lib/model_mixins/table_builder_class_methods.rb

@@ -133,8 +133,16 @@ module ModelMixins
       settings[:columns].each do |col|
         col[:table] = "unknown" if col[:table].blank?
         if col[:column_method].blank? && col[:row_method].blank? && !col[:name].blank?
-          select_string += ", " unless select_string.blank?
-          select_string += "#{col[:table]}.#{col[:name]} AS #{col[:table]}_#{col[:name]}"
+          if col[:sql_expression].blank?
+            # I am selection col[:name]
+            select_string += ", " unless select_string.blank?
+            select_string += "#{col[:table]}.#{col[:name]} AS #{col[:table]}_#{col[:name]}"
+          else
+            # Iam selecting col[:expression] and col[:name] is alias
+            # the expression can be sql expression
+            select_string += ", " unless select_string.blank?
+            select_string += "#{col[:sql_expression]} AS #{col[:name]}"
+          end
         end
 
         # for select more data in combination with filter_method (etc full_name of user))

data/lib/table_settings.rb

@@ -1,6 +1,8 @@
 require 'table_settings/table_column.rb'
 require 'table_settings/table_action.rb'
 require 'table_settings/detail_table.rb'
+require 'table_settings/table_button.rb'
+
 
 class TableSettings
 

data/lib/table_settings/table_button.rb

@@ -24,7 +24,7 @@ class TableSettings
     end
 
     def add_button(row_id, label, url_path = nil)
-      row = add_row(row_id) if @rows[row_id].nil?
+      row = @rows[row_id].nil? ? add_row(row_id) : @rows[row_id]
 
       button = row.add_button(label, url_path)
 

data/lib/table_settings/table_column.rb

@@ -28,6 +28,14 @@ class TableSettings
       self
     end
 
+    ##
+    # Defines select expression for column (ie. select count(id) as counter)
+    #
+    def sql_expresssion(expression)
+      @column_hash[:sql_expression] = expression
+      self
+    end
+
     def filter_data(array)
       @column_hash[:filter_data] = array
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: it-logica-application-backbone
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &74326790 !ruby/object:Gem::Requirement
+  requirement: &78953680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *74326790
+  version_requirements: *78953680
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &74311020 !ruby/object:Gem::Requirement
+  requirement: &77670010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74311020
+  version_requirements: *77670010
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &74310720 !ruby/object:Gem::Requirement
+  requirement: &77669710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *74310720
+  version_requirements: *77669710
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &74310450 !ruby/object:Gem::Requirement
+  requirement: &77669430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *74310450
+  version_requirements: *77669430
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &74310170 !ruby/object:Gem::Requirement
+  requirement: &77669150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *74310170
+  version_requirements: *77669150
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &74309850 !ruby/object:Gem::Requirement
+  requirement: &77668840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *74309850
+  version_requirements: *77668840
 description: longer description of your gem
 email: ladislav.smola@it-logica.cz
 executables: []
@@ -570,7 +570,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 866527727
+      hash: 539010931
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: