bhf 0.8.0 → 0.8.2

data/app/controllers/bhf/embed_entries_controller.rb

@@ -18,12 +18,8 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
       manage_many_to_many
       after_save
       
-      extra_data = {
-        edit_path: edit_entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object),
-        delete_path: entry_embed_path(@platform.name, @model.get_embedded_parent(params[:entry_id]), @object)
-      }
       if @quick_edit
-        render json: object_to_bhf_display_hash.merge(extra_data), status: :ok
+        render json: object_to_bhf_hash, status: :ok
       else
         redirect_after_save(notice: set_message('update.success', @model))
       end
@@ -43,7 +39,7 @@ class Bhf::EmbedEntriesController < Bhf::EntriesController
       after_save
 
       if @quick_edit
-        render json: object_to_bhf_display_hash, status: :ok
+        render json: object_to_bhf_hash, status: :ok
       else
         redirect_after_save(notice: set_message('update.success', @model))
       end

data/app/controllers/bhf/entries_controller.rb

@@ -33,7 +33,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
       after_save
 
       if @quick_edit
-        render json: object_to_bhf_display_hash, status: :ok
+        render json: object_to_bhf_hash, status: :ok
       else
         redirect_after_save(notice: set_message('create.success', @model), referral_entry: {id: @object.id, platform: @platform.name})
       end
@@ -55,7 +55,7 @@ class Bhf::EntriesController < Bhf::ApplicationController
       after_save
 
       if @quick_edit
-        render json: object_to_bhf_display_hash, status: :ok
+        render json: object_to_bhf_hash, status: :ok
       else
         redirect_after_save(notice: set_message('update.success', @model), referral_entry: {id: @object.id, platform: @platform.name})
       end
@@ -100,32 +100,29 @@ class Bhf::EntriesController < Bhf::ApplicationController
 
   private
 
-    def object_to_bhf_display_hash
+    def object_to_bhf_hash
       extra_data = {
-        to_bhf_s: @object.to_bhf_s, 
-        object_id: @object.send(@object.class.bhf_primary_key).to_s,
-        edit_path: edit_entry_path(@platform.name, @object),
-        can_edit: ! @platform.hide_edit,
-        delete_path: entry_path(@platform.name, @object),
-        can_delete: ! @platform.hide_delete,
-        delete_confirm: t('bhf.helpers.promts.confirm')
+        to_bhf_s:  @object.to_bhf_s, 
+        object_id: @object.send(@object.class.bhf_primary_key).to_s
       }
+      extra_data.merge!(@object.to_bhf_hash) if @object.respond_to?(:to_bhf_hash)
+      
       @platform.columns.each_with_object(extra_data) do |column, hash|
-        unless column.field.macro == :column && @object.send(column.name).blank?
-          p = "bhf/pages/macro/#{column.field.macro}/#{column.field.display_type}"
-          hash[column.name] = render_to_string partial: p, locals: {column: column, object: @object}
+        column_value = @object.send(column.name)
+        unless column.macro == :column && column_value.blank?
+          p = "bhf/table/#{column.macro}/#{column.display_type}"
+          hash[column.name] = render_to_string partial: p, locals: {object: @object, column_value: column_value}
         end
       end
     end
 
     def load_platform
-      @platform = @settings.find_platform(params[:platform], current_account)
+      @platform = find_platform(params[:platform])
     end
 
     def load_model
       @model = @platform.model
-      @model_sym = ActiveModel::Naming.singular(@model).to_sym
-      @permited_params = ActionController::Parameters.new(params[@model_sym]).permit!
+      @permited_params = ActionController::Parameters.new(params[@platform.model_name.to_sym]).permit!
     end
 
     def load_object

data/app/controllers/bhf/pages_controller.rb

@@ -2,6 +2,7 @@ class Bhf::PagesController < Bhf::ApplicationController
   before_filter :set_page
 
   def show
+    @edit_params = {}
     unless platform_options = @settings.content_for_page(@page)
       raise Exception.new("Page '#{@page}' could not be found")
     end
@@ -13,9 +14,9 @@ class Bhf::PagesController < Bhf::ApplicationController
     end
 
     @platforms = platform_options.each_with_object([]) do |opts, obj|
-      platform = Bhf::Platform.new(opts, @page, @settings, current_account)
+      platform = find_platform(opts.keys[0])
+      
       next if platform.table_hide?
-      platform.pagination = Bhf::Pagination.new(platform.entries_per_page)
       paginate_platform_objects(platform)
       obj << platform
     end
@@ -28,30 +29,30 @@ class Bhf::PagesController < Bhf::ApplicationController
     end
 
     def render_platform(platform_name)
-      platform = @settings.find_platform(platform_name, current_account)
+      platform = find_platform(platform_name)
 
-      platform.pagination = Bhf::Pagination.new(platform.entries_per_page)
       paginate_platform_objects(platform)
 
       render layout: false, partial: 'platform', locals: {platform: platform}
     end
 
-    def check_params(platform)
+    def paginate_platform_objects(platform)
+      p = (params[platform.name] || {})
       page = 1
-      if params[platform.name] && !params[platform.name][:page].blank?
-        page = params[platform.name][:page].to_i
+      unless p[:page].blank?
+        page = p[:page].to_i
       end
       
       per_page = platform.pagination.offset_per_page
-      if params[platform.name] && !params[platform.name][:per_page].blank?
-        per_page = params[platform.name][:per_page].to_i
+      unless p[:per_page].blank?
+        per_page = p[:per_page].to_i
       end
 
-      return { page: page, per_page: per_page }
-    end
+      page_params = { page: page, per_page: per_page }
 
-    def paginate_platform_objects(platform)
-      platform.prepare_objects(params[platform.name] || {}, check_params(platform))
+      @edit_params[platform.name] = page_params
+
+      platform.get_objects(p, page_params)
     end
 
 end

data/app/helpers/bhf/application_helper.rb

@@ -2,23 +2,23 @@ module Bhf
   module ApplicationHelper
 
     def show_t(platform)
-      t("bhf.helpers.entry.models.#{platform.model_name}.show", platform_name: platform.title_singular, default: t('bhf.helpers.entry.show')).html_safe
+      t("bhf.helpers.entry.models.#{platform.model_name}.show", platform_title: platform.title_singular, default: t('bhf.helpers.entry.show')).html_safe
     end
 
     def new_t(platform)
-      t("bhf.helpers.entry.models.#{platform.model_name}.new", platform_name: platform.title_singular, default: t('bhf.helpers.entry.new')).html_safe
+      t("bhf.helpers.entry.models.#{platform.model_name}.new", platform_title: platform.title_singular, default: t('bhf.helpers.entry.new')).html_safe
     end
 
     def duplicate_t(platform)
-      t("bhf.helpers.entry.models.#{platform.model_name}.duplicate", platform_name: platform.title_singular, default: t('bhf.helpers.entry.duplicate')).html_safe
+      t("bhf.helpers.entry.models.#{platform.model_name}.duplicate", platform_title: platform.title_singular, default: t('bhf.helpers.entry.duplicate')).html_safe
     end
 
     def edit_t(platform)
-      t("bhf.helpers.entry.models.#{platform.model_name}.edit", platform_name: platform.title_singular, default: t('bhf.helpers.entry.edit')).html_safe
+      t("bhf.helpers.entry.models.#{platform.model_name}.edit", platform_title: platform.title_singular, default: t('bhf.helpers.entry.edit')).html_safe
     end
 
     def delete_t(platform)
-      t("bhf.helpers.entry.models.#{platform.model_name}.delete", platform_name: platform.title_singular, default: t('bhf.helpers.entry.delete')).html_safe
+      t("bhf.helpers.entry.models.#{platform.model_name}.delete", platform_title: platform.title_singular, default: t('bhf.helpers.entry.delete')).html_safe
     end
     
     def find_smallest_size_url_for_file(file)
@@ -32,7 +32,7 @@ module Bhf
     end
 
     def type_is_image?(type)
-      Bhf::PAPERCLIP_IMAGE_TYPES.include?(type)
+      Bhf.configuration.paperclip_image_types.include?(type)
     end
     
   end

data/app/helpers/bhf/entries_helper.rb

@@ -1,5 +1,6 @@
 module Bhf
   module EntriesHelper
+    include Bhf::ActionView::FormOptions
     
     def node(f, field, &block)
       render partial: 'bhf/helper/node', locals: {f: f, field: field, input: with_output_buffer(&block)}
@@ -16,12 +17,13 @@ module Bhf
       }
     end
     
-    def reflection_title(f, field)
+    def reflection_title(f, field, count = 2)
       title = f.object.class.human_attribute_name(field.reflection.name)
       if field.link
-        title = t("bhf.platforms.#{field.link}.title", count: f.object.send(field.reflection.name).to_a.count, default: title)
+        title = t("bhf.platforms.#{field.link.name}.title", count: count, default: title)
       end
       title
     end
+    
   end
 end

data/app/helpers/bhf/pages_helper.rb

@@ -30,9 +30,5 @@ module Bhf
       params_platfrom['direction'] == 'desc' ? 'sorted desc' : 'sorted asc'
     end
     
-    def has_link?(display_type)
-      display_type.to_s.include? '_link'
-    end
-
   end
 end

data/app/views/bhf/entries/_form.haml

@@ -1,22 +1,25 @@
 - html = { id: (:main_form unless @quick_edit), multipart: (!@quick_edit && @platform.has_file_upload?), class: 'js_bhf_form' }
-= form_for @object, url: @form_url, builder: Bhf::Form::Builder, html: html do |f|
+= form_for @object, url: @form_url, builder: Bhf::ActionView::FormBuilder, html: html do |f|
 
   - if f.object.errors.any?
     = render partial: 'bhf/entries/validation_errors', locals: {f: f}
     
   - @platform.fields.each do |field|
     - unless field.form_type == :hidden
-      = render partial: "bhf/entries/form/#{field.macro}/#{field.form_type}", locals: {f: f, field: field}
+      - if !field.form_type
+        = d field
+      = render partial: "bhf/form/#{field.macro}/#{field.form_type}", locals: {f: f, field: field}
 
   - unless @quick_edit
+    
     - if params[:return_to]
       = hidden_field :return, :to, name: :return_to, value: params[:return_to]
-      
+    
     .node
       .label
       .input
         - unless @object.class.bhf_embedded?
-          = f.submit t('bhf.helpers.form.buttons.save', platform_name: @platform.title_singular)
+          = f.submit t('bhf.helpers.form.buttons.save', platform_title: @platform.title_singular)
         - unless @platform.hide_edit
           = f.submit t('bhf.helpers.form.buttons.and_edit'), name: :return_to_edit, class: 'alt_button'
         - unless @platform.hide_create

data/app/views/bhf/entries/show.haml

@@ -2,13 +2,12 @@
 - if @platform.definitions.any?
   .dl.content_box
     - @platform.definitions.each do |column|
-      - tmp = column.field.show_type ? column.field.show_type : column.field.display_type
-      - if ! @object.send(column.name).blank?
+      - column_value = @object.send(column.name)
+      - if ! column_value.blank?
         = definition_item @object, column do
-          = render(partial: "bhf/pages/macro/#{column.field.macro}/#{tmp}", locals: {column: column, object: @object})
+          = render(partial: "bhf/table/#{column.macro}/#{column.show_type}", locals: {column_value: column_value, object: @object})
 
 - if @platform.show_extra_fields and @platform.show_extra_fields.any?
   .content_box
     - @platform.show_extra_fields.each do |name|
       = render(partial: "bhf/pages/show/#{name}", locals: {name: name, object: @object})
-      

data/app/views/bhf/form/belongs_to/_radio.haml

@@ -0,0 +1,28 @@
+- data_source ||= field.link ? field.link.get_objects : field.reflection.klass.all 
+- fk = field.db_name
+= reflection_node f, field do
+  .quick_edit_block
+    %ul.relation.quick_edit_inject
+      - data_source.each do |obj|
+        %li.quick_edit_entry
+          = f.radio_button fk, obj.id, id: "belongs_to_#{fk}_#{obj.id}"
+          - if field.link && ! field.link.hide_edit
+            = link_to obj.to_bhf_s, edit_entry_path(field.link.name, obj), class: 'js_edit_field qe_button quick_edit'
+          - else
+            = label_tag "belongs_to_#{fk}_#{obj.id}", obj.to_bhf_s
+          - if field.link && ! field.link.hide_delete
+            = link_to '×'.html_safe, entry_path(field.link.name, obj), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
+    
+    %template.quick_edit_template{type: 'text/template'}
+      %li
+        = f.radio_button fk, '{object_id}', id: "belongs_to_#{fk}_{object_id}"
+        - if field.link && ! field.link.hide_edit
+          = link_to '{to_bhf_s}', edit_entry_path(field.link.name, '{object_id}'), class: 'js_edit_field qe_button quick_edit'
+        - else
+          = label_tag "belongs_to_#{fk}_#{obj.id}", obj.to_bhf_s
+        - if field.link && ! field.link.hide_delete
+          = link_to '×'.html_safe, entry_path(field.link.name, '{object_id}'), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
+        
+      
+    - if field.link && ! field.link.hide_create
+      = link_to '+', new_entry_path(field.link.name), class: 'js_add_field plus_button qe_button quick_edit'

data/app/views/bhf/form/belongs_to/_select.haml

@@ -0,0 +1,21 @@
+- data_source ||= field.link ? field.link.get_objects : field.reflection.klass.all 
+- fk = field.db_name
+.node
+  .label= f.label fk, reflection_title(f, field, 1)
+  .input.select_input.quick_edit_block
+    - if field.link
+      %template.quick_edit_template{type: 'text/template'}
+        = options_for_select([['{to_bhf_s}', '{object_id}', {data: {edit: edit_entry_path(field.link.name, '{object_id}'), delete: entry_path(field.link.name, '{object_id}')}}]])
+      - select_options ||= options_from_collection_for_select_with_html_attrs(data_source, :id, :to_bhf_s, f.object.send(fk), Proc.new {|obj| {data: {edit: edit_entry_path(field.link.name, obj), delete: entry_path(field.link.name, obj)}}})
+    - else
+      - select_options ||= options_from_collection_for_select(data_source, :id, :to_bhf_s, f.object.send(fk))
+    
+    = f.select fk, select_options, {include_blank: true}, {class: ('quick_edit_inject quick_edit_select' if field.link)}
+    = render partial: 'bhf/helper/field_errors', locals: {f: f, field: fk}
+    
+    - if field.link && ! field.link.hide_edit
+      = link_to edit_t(field.link), '', class: 'js_edit_field icon edit quick_edit'
+    - if field.link && ! field.link.hide_delete
+      = link_to '×'.html_safe, '', method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
+    - if field.link && ! field.link.hide_create
+      = link_to '+', new_entry_path(field.link.name), class: 'js_add_field plus_button qe_button quick_edit'

data/app/views/bhf/form/belongs_to/_static.haml

@@ -0,0 +1 @@
+= render partial: 'bhf/form/has_one/static', locals: {ref_object: f.object.send(field.reflection.name), field: field, f: f}

data/app/views/bhf/form/embeds_many/_static.haml

@@ -0,0 +1,26 @@
+= reflection_node f, field do
+  - ref_objects ||= f.object.send(field.reflection.name)
+  - is_one = field.macro == :embeds_one
+  .quick_edit_block
+    %p.empty{class: ('hide' unless ref_objects.blank?)}= t 'bhf.helpers.entry.empty', count: (is_one ? 1 : 2)
+    %ul.relation.quick_edit_inject{class: field.macro}
+      - ref_objects.each do |ref_object|
+        %li.quick_edit_entry
+          - if field.link && ! field.link.hide_edit
+            = link_to ref_object.to_bhf_s, edit_entry_embed_path(field.link.name, f.object, ref_object), class: 'js_edit_field qe_button quick_edit'
+          - else
+            = ref_object.to_bhf_s
+          - if field.link && ! field.link.hide_delete
+            = link_to '×'.html_safe, entry_embed_path(field.link.name, f.object, ref_object), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
+    
+    %template.quick_edit_template{type: 'text/template'}
+      %li.quick_edit_entry
+        - if field.link && ! field.link.hide_edit
+          = link_to '{to_bhf_s}', edit_entry_embed_path(field.link.name, f.object, '{object_id}'), class: 'js_edit_field qe_button quick_edit'
+        - else
+          = '{to_bhf_s}'
+        - if field.link && ! field.link.hide_delete
+          = link_to '×'.html_safe, entry_embed_path(field.link.name, f.object, '{object_id}'), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
+    
+    - if ! is_one && field.link && ! field.link.hide_create
+      = link_to '+', new_entry_embed_path(field.link.name, f.object), class: 'js_add_field plus_button qe_button quick_edit default_form_align'

data/app/views/bhf/form/embeds_one/_static.haml

@@ -0,0 +1,2 @@
+- ref_object ||= f.object.send(field.reflection.name)
+= render partial: 'bhf/form/embeds_many/static', locals: {ref_objects: [ref_object], field: field, f: f}

data/app/views/bhf/form/has_and_belongs_to_many/_check_box.haml

@@ -0,0 +1,22 @@
+- data_source ||= field.link ? field.link.get_objects : field.reflection.klass.all 
+= reflection_node f, field do
+  .quick_edit_block
+    %ul.relation.quick_edit_inject
+      - data_source.each do |ref_object|
+        %li.quick_edit_entry
+          = f.many_to_many_check_box(ref_object, field.reflection.name, params, field.link && ! field.link.hide_edit)
+          - if field.link && ! field.link.hide_edit
+            = link_to ref_object.to_bhf_s, edit_entry_path(field.link.name, ref_object), class: 'js_edit_field qe_button quick_edit'
+          - if field.link && ! field.link.hide_delete
+            = link_to '×'.html_safe, entry_path(field.link.name, ref_object), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
+
+    %template.quick_edit_template{type: 'text/template'}
+      %li.quick_edit_entry
+        = f.many_to_many_check_box(OpenStruct.new(to_bhf_s: '{to_bhf_s}'), field.reflection.name, params, field.link && ! field.link.hide_edit, true, "{object_id}").gsub('_object_id_', '{object_id}').html_safe # fix for id attr
+        - if field.link && ! field.link.hide_edit
+          = link_to '{to_bhf_s}', edit_entry_path(field.link.name, '{object_id}'), class: 'js_edit_field qe_button quick_edit'
+        - if field.link && ! field.link.hide_delete
+          = link_to '×'.html_safe, entry_path(field.link.name, '{object_id}'), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
+    
+    - if field.link && ! field.link.hide_create
+      = link_to '+', new_entry_path(field.link.name), class: 'js_add_field plus_button qe_button quick_edit default_form_align'

data/app/views/bhf/form/has_and_belongs_to_many/_static.haml

@@ -0,0 +1 @@
+= render partial: 'bhf/form/has_many/static', locals: {ref_objects: f.object.send(field.reflection.name), field: field, f: f}

data/app/views/bhf/form/has_many/_static.haml

@@ -0,0 +1,26 @@
+= reflection_node f, field do
+  - ref_objects ||= f.object.send(field.reflection.name)
+  - is_one = (field.macro == :has_one || field.macro == :belongs_to)
+  .quick_edit_block
+    %p.empty{class: ('hide' unless ref_objects.blank?)}= t 'bhf.helpers.entry.empty', count: (is_one ? 1 : 2)
+    %ul.relation.quick_edit_inject{class: field.macro}
+      - ref_objects.each do |ref_object|
+        %li.quick_edit_entry
+          - if field.link && ! field.link.hide_edit
+            = link_to ref_object.to_bhf_s, edit_entry_path(field.link.name, ref_object), class: 'js_edit_field qe_button quick_edit'
+          - else
+            = ref_object.to_bhf_s
+          - if field.link && ! field.link.hide_delete
+            = link_to '×'.html_safe, entry_path(field.link.name, ref_object), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
+
+    %template.quick_edit_template{type: 'text/template'}
+      %li.quick_edit_entry
+        - if field.link && ! field.link.hide_edit
+          = link_to '{to_bhf_s}', edit_entry_path(field.link.name, '{object_id}'), class: 'js_edit_field qe_button quick_edit'
+        - else
+          = '{to_bhf_s}'
+        - if field.link && ! field.link.hide_delete
+          = link_to '×'.html_safe, entry_path(field.link.name, '{object_id}'), method: :delete, class: 'qe_delete js_delete', remote: true, data: {confirm: t('bhf.helpers.promts.confirm', platform_title: field.link.title_singular)}
+
+    - if ! is_one && field.link && ! field.link.hide_create
+      = link_to '+', new_entry_path(field.link.name), class: 'js_add_field plus_button qe_button quick_edit default_form_align'