bhf 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1fae87f240ab1b477b28d2b5a52d59c2f8ed572
-  data.tar.gz: 8aa50352b8899a09fe11e4d0f0b88f574de661d8
+  metadata.gz: 0255e2858b8c1e4b8aba999293a7b4be89f8dba6
+  data.tar.gz: de4a31ad3f3e3b26b152e345f70272e53eeea381
 SHA512:
-  metadata.gz: e934f016a7784bedb8a7520c937a2c5df2146578148c115d219003ac0661bf62becc88c30b844359211b88bf775aa2494e51aa69eeaf70ceb76d14a6d2c44ebf
-  data.tar.gz: 52e57093d17b763ae6c2a1ba8842dec3d68ff99bbaa177062a4e8c73c4d1870a2582f4844a3c9a1b11c37f3929a2a4eef0b642a4721ddcfd241c194fe56c29fd
+  metadata.gz: b7f58047a950b4bde5e6ae37dda097059462c9a62aca440e056bdf51cf4687fd724b9959f9fe0fe4bbad30c6fc0796f93341246acbe7b44fe60aa073f7e980ce
+  data.tar.gz: a2abaa0d6e8589da7ce6e905073d3b0f8da470c8805279a4b171b7e67459f35abd967805485b1c300b433ef312194b37db4a797607a1692b6fc9ffe62d8be0f5

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/app/assets/javascripts/bhf/application.js

@@ -65,7 +65,10 @@ Turbolinks.pagesCached(0);
 
 	var updateElementsAfterQuickEditSuccess = function(eventNames, linkElem, json){
 		var parent = linkElem.getParent('.quick_edit_block');
-		var entryTemplate = parent.getElement('.quick_edit_template');
+		var entryTemplate = parent.getElement('.quick_edit_template').clone();
+		entryTemplate.getElements('.js_remove_disabled').each(function(elem){
+			elem.removeProperty('disabled')
+		});
 		var newEntryInjectArea = parent.getElement('.quick_edit_inject');
 		var relation = parent.getElement('.relation');
 		var entry = linkElem.getParent('.quick_edit_entry');

data/app/assets/stylesheets/bhf/application.css.sass

@@ -1017,6 +1017,9 @@ input[type="submit"].alt_button,
     color: $r2 !important
     cursor: default !important
 
+.quick_edit_template
+  display: none !important
+
 .hide
   display: none !important
 .float_left

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

@@ -23,4 +23,4 @@
         - unless @platform.hide_create
           = f.submit t('bhf.helpers.form.buttons.and_add'), name: :return_to_new, class: 'alt_button'
         
-        = link_to t('bhf.helpers.entry.cancel'), page_path(@platform.page_name), class: 'cancel'
+        = link_to t('bhf.helpers.entry.cancel'), params[:return_to] ? params[:return_to] : page_path(@platform.page_name), class: 'cancel'

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

@@ -13,9 +13,9 @@
           - 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'}
+    .quick_edit_template{type: 'text/template'}
       %li
-        = f.radio_button fk, '{object_id}', id: "belongs_to_#{fk}_{object_id}"
+        = f.radio_button fk, '{object_id}', id: "belongs_to_#{fk}_{object_id}", class: 'js_remove_disabled', disabled: true
         - 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

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

@@ -4,7 +4,7 @@
   .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'}
+      .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

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

@@ -13,7 +13,7 @@
           - 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'}
+    .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'

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

@@ -1,2 +1,3 @@
 - ref_object ||= f.object.send(field.reflection.name)
-= render partial: 'bhf/form/embeds_many/static', locals: {ref_objects: [ref_object], field: field, f: f}
+- if ref_object
+  = 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

@@ -10,9 +10,9 @@
           - 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'}
+    .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
+        = 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}", {class: 'js_remove_disabled', disabled: true}).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

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

@@ -13,7 +13,7 @@
           - 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'}
+    .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'

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

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

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

@@ -77,7 +77,7 @@
             = link_to new_t(platform), new_entry_path(platform.name)
 
       - if platform.table_quick_edit
-        %template.quick_edit_template{type: 'text/template'}
+        .quick_edit_template{type: 'text/template'}
           %tr.quick_edit_entry{id: "{object_id}_#{platform.name}"}
             - edit_link = edit_entry_path(platform.name, '{object_id}')
             - if platform.sortable

data/app/views/bhf/table/has_one/_default.haml

@@ -1,5 +1,6 @@
 = content_tag link ? :a : :span, class: ('quick_edit' if add_quick_link), href: (link if link) do
-  - if column_value.is_a?(String)
-    = column_value
-  - else
-    = column_value.to_bhf_s
+  - if column_value
+    - if column_value.is_a?(String)
+      = column_value
+    - else
+      = column_value.to_bhf_s

data/bhf.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bhf 0.9.6 ruby lib
+# stub: bhf 0.9.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bhf"
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Anton Pawlik"]
-  s.date = "2014-07-14"
+  s.date = "2014-07-17"
   s.description = "A simple to use Rails-Engine-Gem that offers an admin interface for trusted user. Easy integratable and highly configurable and agnostic. Works with ActiveRecord and Mongoid."
   s.email = "anton.pawlik@gmail.com"
   s.extra_rdoc_files = [

data/lib/bhf/action_view/form_builder.rb

@@ -14,7 +14,7 @@ module Bhf::ActionView
       field_errors(field).any?
     end
 
-    def many_to_many_check_box(obj, ref_name, params, hide_label = false, checked = false, bhf_primary_key = nil)
+    def many_to_many_check_box(obj, ref_name, params, hide_label = false, checked = false, bhf_primary_key = nil, extra_html_attrs = {})
       mm = :has_and_belongs_to_many
       bhf_primary_key ||= obj.send(obj.class.bhf_primary_key).to_s
       unless checked
@@ -25,8 +25,8 @@ module Bhf::ActionView
         end
       end
       
-      html = hidden_field_tag("#{mm}[#{ref_name}][#{bhf_primary_key}]", '', id: "hidden_#{mm}_#{ref_name}_#{bhf_primary_key}")
-      html = html+' '+check_box_tag("#{mm}[#{ref_name}][#{bhf_primary_key}]", bhf_primary_key, checked)
+      html = hidden_field_tag("#{mm}[#{ref_name}][#{bhf_primary_key}]", '', extra_html_attrs.merge(id: "hidden_#{mm}_#{ref_name}_#{bhf_primary_key}"))
+      html = html+' '+check_box_tag("#{mm}[#{ref_name}][#{bhf_primary_key}]", bhf_primary_key, checked, extra_html_attrs)
       html = html+' '+label_tag("#{mm}_#{ref_name}_#{bhf_primary_key}", obj.to_bhf_s) unless hide_label
       
       html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails