bhf 0.2.0 → 0.2.1

data/app/controllers/bhf/entries_controller.rb

@@ -1,6 +1,6 @@
 class Bhf::EntriesController < Bhf::ApplicationController
   before_filter :load_platform, :load_model, :set_page, :set_quick_edit
-  before_filter :load_object, :except => [:create, :new]
+  before_filter :load_object, :except => [:create, :new, :sort]
 
   def new
     @object = @model.new
@@ -54,6 +54,17 @@ class Bhf::EntriesController < Bhf::ApplicationController
     end
   end
 
+  def sort
+    return unless @platform.sortable
+    
+    sortable = @platform.sortable.to_sym
+
+    params[:order].each_with_index do |id, index|
+      object = @model.find(id[1].gsub("_#{@platform.name}", ''))
+      object.update_attribute(sortable, index)
+    end
+  end
+
   def destroy
     @object.destroy
     redirect_back_or_default(bhf_root_url, :notice => set_message('destory.success', @model))

data/app/controllers/bhf/pages_controller.rb

@@ -15,7 +15,7 @@ class Bhf::PagesController < Bhf::ApplicationController
     @platforms = platform_options.each_with_object([]) do |opts, obj|
       platform = Bhf::Platform.new(opts, @page, current_account)
       platform.pagination = Bhf::Pagination.new(platform.entries_per_page)
-      platform.paginated_objects = paginate_platform_objects(platform)
+      paginate_platform_objects(platform)
       obj << platform
     end
   end
@@ -30,7 +30,7 @@ class Bhf::PagesController < Bhf::ApplicationController
       @platform = @config.find_platform(platform_name, current_account)
 
       @platform.pagination = Bhf::Pagination.new(@platform.entries_per_page)
-      @platform.paginated_objects = paginate_platform_objects(@platform)
+      paginate_platform_objects(@platform)
 
       render '_platform', :layout => false
     end

data/app/views/bhf/_footer.haml

@@ -1,4 +1,4 @@
-- if defined?(current_account)
+- if defined?(current_account) && current_account
   -# TODO: i18n and custom logout path
   %p.user
     You are logged in as

data/app/views/bhf/entries/form/column/_date.haml

@@ -1,2 +1,2 @@
 = node f, field do
-  = f.text_field field.name, :class => 'date'
+  = f.text_field field.name, :class => "datepicker #{field.type}", :value => f.object.send(field.name).to_i

data/app/views/bhf/pages/_platform.haml

@@ -1,5 +1,5 @@
 - @platform.pagination.template = self
-%table{:class => (@platform.custom_columns? ? 'custom_columns' : 'default_columns')}
+%table{:id => "#{@platform.name}_platform", :class => (@platform.custom_columns? ? 'custom_columns' : 'default_columns')}
   %caption
     %h4= @platform.title
     %p.info= @platform.pagination.info @platform, :entry_name => 'entry'
@@ -15,6 +15,8 @@
 
   %thead
     %tr
+      - if @platform.sortable
+        %th
       - @platform.columns.each do |column|
         %th{:class => "#{column.field.macro} #{column.field.display_type} #{order_class(column.name, @platform.name)}"}
           - column_name = @platform.model.human_attribute_name(column.name)
@@ -24,23 +26,25 @@
       %th.action
   %tfoot
     %tr
-      %td{:colspan => @platform.columns.count+1}
-        = @platform.pagination.paginate @platform
-  %tbody
-    - if @platform.paginated_objects.any?
-      - @platform.paginated_objects.each do |object|
+      %td{:colspan => @platform.columns_count}
+        = @platform.pagination.create(@platform) unless @platform.sortable
+  %tbody{:class => ('sortable' if @platform.sortable), :'data-sort-url' => sort_bhf_entries_path(@platform.name)}
+    - if @platform.objects.any?
+      - @platform.objects.each do |object|
         - edit_link = edit_bhf_entry_path(@platform.name, object)
-        %tr
+        %tr{:id => "#{object.id}_#{@platform.name}"}
+          - if @platform.sortable
+            %td
+              %span.handle  
           - @platform.columns.each do |column|
             %td{:class => "#{column.field.macro} #{column.field.display_type}", :'data-column-name' => column.name}
-              - unless column.field.macro == :column && object.send(column.name).blank?
-                - p = "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}"
-                - a = render :partial => p, :locals => {:column => column, :object => object}
-                = column.field.overwrite_display_type ? a : link_to(a.html_safe, edit_link, :class => 'quick_edit')
+              - p = "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}"
+              - a = object.send(column.name).blank? ? ' ' : render(:partial => p, :locals => {:column => column, :object => object})
+              = column.field.overwrite_display_type ? a.html_safe : link_to(a.html_safe, edit_link, :class => 'quick_edit')
           %td.action
             = link_to edit_t(@platform), edit_link, :class => 'edit'
             = link_to delete_t(@platform), bhf_entry_path(@platform.name, object), :method => :delete, :confirm => t('bhf.helpers.promts.confirm'), :class => 'delete'
     - else
-      %td.no_entries{:colspan => @platform.columns.count+1}
+      %td.no_entries{:colspan => @platform.columns_count}
         = t 'bhf.pagination.info.nothing_found', :name => t('bhf.pagination.entry').pluralize
         = link_to new_t(@platform), new_bhf_entry_path(@platform.name)

data/app/views/layouts/bhf/application.haml

@@ -7,7 +7,7 @@
     %link{:href => '/favicon.ico', :rel => 'icon', :type => 'image/x-icon'}
     = stylesheet_link_tag(['bhf'] + Bhf::Engine.config.css.to_a)
     = javascript_include_tag 'bhf'
-    =# javascript_include_tag 'mootools-core-1.3-full-nocompat-yc.js', 'mootools-more', 'mootools_rails_driver-0.4.1.js', 'class/BrowserUpdate', 'class/Ajaxify', 'class/AjaxEdit', 'class/MooEditable', 'bhf_application'
+    =# javascript_include_tag 'mootools-core-1.3.1-full-compat-yc.js', 'mootools-more-1.3.1.1.js', 'mootools_rails_driver-0.4.1.js', 'class/BrowserUpdate', 'class/Ajaxify', 'class/AjaxEdit', 'class/MooEditable', 'class/Datepicker', 'bhf_application'
   %body
     %header
       -# TODO: logo as css bg for better cache and no jumping?

data/config/routes.rb

@@ -6,7 +6,11 @@ Rails.application.routes.draw do
     get 'page/:page', :to => 'pages#show', :as => :page
     
     scope ':platform' do
-      resources :entries, :except => [:index, :show]
+      resources :entries, :except => [:index, :show] do
+        collection do 
+          get :sort
+        end
+      end
     end
 
   end

data/lib/bhf/pagination.rb

@@ -10,17 +10,17 @@ module Bhf
       @offset_to_add = offset_to_add
     end
 
-    def paginate(platform)
+    def create(platform)
       platform_params = template.params[platform.name] || {}
 
-      if page_links = template.will_paginate(platform.paginated_objects, {
+      if page_links = template.will_paginate(platform.objects, {
         :previous_label => I18n.t('bhf.pagination.previous_label'),
         :next_label => I18n.t('bhf.pagination.next_label'),
         :renderer => LinkRenderer.new(self, platform),
         :container => false
       })
         links = "#{load_more(platform)} #{page_links}"
-      elsif platform.paginated_objects.total_pages == 1 && platform.paginated_objects.size > @offset_to_add
+      elsif platform.objects.total_pages == 1 && platform.objects.size > @offset_to_add
         links = load_less(platform)
       end
 
@@ -30,7 +30,11 @@ module Bhf
     end
 
     def info(platform, options = {})
-      collection = platform.paginated_objects
+      collection = platform.objects
+      
+      unless collection.respond_to?(:total_pages)
+        collection = collection.paginate({:page => 1, :per_page => collection.count+1})
+      end
 
       entry_name = options[:entry_name] ||
         (collection.empty?? I18n.t('bhf.pagination.entry') : collection.first.class.model_name.human)

data/lib/bhf/platform.rb

@@ -1,11 +1,11 @@
 module Bhf
   class Platform
 
-    attr_accessor :paginated_objects, :pagination
-    attr_reader :name, :title, :page_name
+    attr_accessor :pagination
+    attr_reader :name, :objects, :title, :page_name
 
     def initialize(options, page_name, user = nil)
-      @paginated_objects = []
+      @objects = []
 
       if options.is_a?(String)
         options = {options => nil}
@@ -46,22 +46,25 @@ module Bhf
         chain = @user.send(table_options(:user_scope).to_sym)
       else
         chain = model
-        chain = chain.unscoped if options[:order]
-        chain = chain.send(data_source) if data_source
+        chain = chain.send data_source if data_source
       end
 
       if options[:order]
-        chain = chain.order("#{options[:order]} #{options[:direction]}")
+        chain = chain.except(:order).order("#{options[:order]} #{options[:direction]}")
       end
 
       if search? && options[:search].present?
         chain = do_search(chain, options[:search])
       end
 
-      if paginate_options
+      if paginate_options && !sortable
         chain = chain.paginate(paginate_options)
       end
-
+      
+      if chain == model
+        chain = chain.all
+      end
+      
       @objects = chain
     end
 
@@ -110,6 +113,14 @@ module Bhf
       end
     end
 
+    def columns_count
+      columns.count + (sortable ? 2 : 1)
+    end
+
+    def sortable
+      table_options 'sortable'
+    end
+
     private
 
       def do_search(chain, search_term)
@@ -135,7 +146,7 @@ module Bhf
             @collection.select{ |field| attr_name == field.name }[0] ||
             Bhf::Data::AbstractField.new({
               :name => attr_name,
-              :type => form_options(:types, attr_name) || attr_name,
+              :type => table_options(:types, attr_name) || attr_name,
               :info => I18n.t("bhf.platforms.#{@name}.infos.#{attr_name}", :default => '')
             })
           )
@@ -146,6 +157,7 @@ module Bhf
         all = {}
 
         model.columns_hash.each_pair do |name, props|
+          next if name == sortable
           all[name] = Bhf::Data::Field.new(props, {
             :overwrite_type => form_options(:types, name),
             :overwrite_display_type => table_options(:types, name),
@@ -174,7 +186,7 @@ module Bhf
         id = []
         static_dates = []
         output = []
-      
+
         attrs.each_pair do |key, value|
           if key == model.primary_key
             id << value
@@ -196,25 +208,23 @@ module Bhf
             return false
           end
         end
-        true      
+        true
       end
 
       def form_options(key, attribute = nil)
-        if form
-          if attribute == nil
-            form[key.to_s]
-          elsif form[key.to_s]
-            form[key.to_s][attribute.to_s]
-          end
-        end
+        lookup_options form, key, attribute
       end
 
       def table_options(key, attribute = nil)
-        if table
+        lookup_options table, key, attribute
+      end
+
+      def lookup_options(main_key, key, attribute = nil)
+        if main_key
           if attribute == nil
-            table[key.to_s]
-          elsif table[key.to_s]
-            table[key.to_s][attribute.to_s]
+            main_key[key.to_s]
+          elsif main_key[key.to_s]
+            main_key[key.to_s][attribute.to_s]
           end
         end
       end