qui-index-table 0.0.8 → 0.0.9

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gemspec.email = "marcin@saepia.net"
     gemspec.homepage = "http://q.saepia.net"
     gemspec.authors = ["Marcin Lewandowski"]
-    gemspec.version = "0.0.8"
+    gemspec.version = "0.0.9"
     gemspec.files = Rake::FileList.new [ "MIT-LICENSE", "Rakefile",  "public/stylesheets/qui/*", "lib/*", "rails/*", "README.rdoc" ]
   end
 rescue LoadError

data/lib/qui-index-table-main-helper.rb

@@ -34,12 +34,24 @@ module QUI
               end
               
               if klass
-                concat content_tag(:th, klass.human_attribute_name(h.to_s[1..-1]))
+                attribute = h.to_s[1..-1]
+                
+                sort_sql = nil
+                if klass.respond_to? :generic_fields
+                  generic_field = klass.generic_fields[:index].detect{ |f| f[:name] == attribute.to_sym }
+                  sort_sql = true if generic_field and generic_field[:options][:sort_sql]
+                end
+                  
+                if klass.columns_hash.has_key? attribute or sort_sql
+                  concat index_table_th(klass.human_attribute_name(attribute).mb_chars.upcase, :sort_by => attribute, :sort_order => (params[:sort_by] == attribute and params[:sort_order] == "A" ? "D" : "A"))
+                else
+                  concat index_table_th(klass.human_attribute_name(attribute).mb_chars.upcase)
+                end
               else
-                concat content_tag(:th, t(h))
+                concat index_table_th t(h)
               end
             else
-              concat content_tag(:th, t(h))
+              concat index_table_th t(h)
             end
 
           elsif h.is_a? Hash
@@ -78,16 +90,21 @@ module QUI
           end
           
           concat "<tr class=\"#{cycle("even", "odd", :name => options[:id])}\">"
-          b.call row
+          concat b.call(row)
           concat "</tr>"
         end
         
         concat "</tbody></table>"
 
-        concat pagination(data) if data.is_a? WillPaginate::Collection if defined?(WillPaginate) and defined?(pagination)
-                
+        if defined?(WillPaginate) and data.is_a?(WillPaginate::Collection) 
+          concat pagination(data) if defined?(pagination)
+          concat pagination_per_page_selector(data) if defined?(pagination_per_page_selector)
+        end
+        
         @index_table_count += 1
-      end
+        ""
+      end      
+
 
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qui-index-table
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Marcin Lewandowski
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 +02:00
+date: 2011-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: []