active_scaffold 3.4.19 → 3.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4522a06a683825a65e9660092377e48da966cf7b
-  data.tar.gz: 0b81519fc84c1b1e9cc41de416d91a80d25fcdb9
+  metadata.gz: 42baa20c0dc8c0bcc7f9d1f8f9458de2135d4def
+  data.tar.gz: d5cf0f64b77a05dcf00dafbd57533df34033a18b
 SHA512:
-  metadata.gz: 72fbd86f4e970a0956747ffbda27cf02dd7c3ef75733e4e88af919b6753339f192f3343e158b21ddab2d9c9e12c9951e95a3a18c6a74063658521a04f2630637
-  data.tar.gz: 39c90ee5898d11f75d8e587138a641de6edc9048776f243d535fc10b4508ce06395d5e8616060938384d153c40ca81d04330cc2880251af1623ef9695fb43de5
+  metadata.gz: 9e45bf8388302307fe80cf19293c71efa2779289931fbe4fa852ab10b56c32c4b3b2f9da22d1a4c3426cf80879555e94b0722bd8395c5dbfe267bcc92400717c
+  data.tar.gz: 869a983b83016caf7aaf93d213a2392e056ccfcc0c41b51149fd17292542fd5e42ee8083271f4b15e8ba25cd0d1a6844874e91823f7c06baf2c36aa53645b760

data/CHANGELOG

@@ -1,3 +1,12 @@
+- Update tinymce bridge for tinyMCE 4.x
+- Ignore :format in conditions_from_params
+- column with :radio form_ui works like :select form_ui in list and show
+- Fix default opt_value in search_range when comparator options is overrided
+- translate include_blank in select search_ui
+- Add column.css_class to li tag on field search
+- Allow to set having in custom_finder_options
+
+= 3.4.19
 - Fix rails bug on set_inverse_instance for has_one :through associations which has_many inverse association
 - Fix warn when form is changed
 

data/app/assets/javascripts/jquery/tiny_mce_bridge.js

@@ -1,7 +1,7 @@
 var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;       
 ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
   jQuery(this.adapter).find('textarea.mceEditor').each(function(index, elem) {         
-    tinyMCE.execCommand('mceRemoveControl', false, jQuery(elem).attr('id'));
+    tinyMCE.execCommand('mceRemoveEditor', false, jQuery(elem).attr('id'));
   });
   action_link_close.apply(this);  
 };

data/app/assets/javascripts/prototype/tiny_mce_bridge.js

@@ -1,7 +1,7 @@
 var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
 ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
   this.adapter.select('textarea.mceEditor').each(function(elem) {
-    tinyMCE.execCommand('mceRemoveControl', false, elem.id);
+    tinyMCE.execCommand('mceRemoveEditor', false, elem.id);
   }); 
   action_link_close.apply(this);
 };

data/app/views/active_scaffold_overrides/_field_search.html.erb

@@ -9,7 +9,7 @@ form_tag url_options, options %>
   <ol class="form">
    <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search) %>
     <% visibles.each do |column| -%>
-      <li class="form-element"><%= search_attribute(column, @record) %></li>
+      <li class="form-element <%= column.css_class unless column.css_class.is_a?(Proc) %>"><%= search_attribute(column, @record) %></li>
     <% end -%>
     <% unless hiddens.empty?  -%>
       <li class="sub-section">
@@ -20,7 +20,7 @@ form_tag url_options, options %>
       </h5>
       <ol id ="<%= further_options_id %>" class="form" style="display:none;">
       <% hiddens.each do |column| -%>
-        <li class="form-element"><%= search_attribute(column, @record) %></li>
+        <li class="form-element <%= column.css_class unless column.css_class.is_a?(Proc) %>"><%= search_attribute(column, @record) %></li>
       <% end -%>
       </ol>
       </li>

data/lib/active_scaffold/actions/core.rb

@@ -208,7 +208,7 @@ module ActiveScaffold::Actions
     def conditions_from_params
       @conditions_from_params ||= begin
         conditions = {}
-        params.except(:controller, :action, :page, :sort, :sort_direction, :id).each do |key, value|
+        params.except(:controller, :action, :page, :sort, :sort_direction, :format, :id).each do |key, value|
           column = active_scaffold_config.model.columns_hash[key.to_s]
           next unless column
           key = key.to_sym

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -15,22 +15,22 @@ class ActiveScaffold::Bridges::TinyMce
       def active_scaffold_input_text_editor(column, options)
         options[:class] = "#{options[:class]} mceEditor #{column.options[:class]}".strip
 
-        settings = {:theme => 'simple'}.merge(column.options[:tinymce] || {})
+        settings = {:theme => 'modern'}.merge(column.options[:tinymce] || {})
         settings = settings.to_json
         settings = "tinyMCE.settings = #{settings};"
 
         html = []
         html << send(override_input(:textarea), column, options)
-        html << javascript_tag(settings + "tinyMCE.execCommand('mceAddControl', false, '#{options[:id]}');") if request.xhr? || params[:iframe]
+        html << javascript_tag(settings + "tinyMCE.execCommand('mceAddEditor', false, '#{options[:id]}');") if request.xhr? || params[:iframe]
         html.join "\n"
       end
 
       def onsubmit_with_tiny_mce
         case ActiveScaffold.js_framework
         when :jquery
-          submit_js = 'tinyMCE.triggerSave();jQuery(\'textarea.mceEditor\').each(function(index, elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, jQuery(elem).attr(\'id\')); });'
+          submit_js = 'tinyMCE.triggerSave();jQuery(\'textarea.mceEditor\').each(function(index, elem) { tinyMCE.execCommand(\'mceRemoveEditor\', false, jQuery(elem).attr(\'id\')); });'
         when :prototype
-          submit_js = 'tinyMCE.triggerSave();this.select(\'textarea.mceEditor\').each(function(elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, elem.id); });'
+          submit_js = 'tinyMCE.triggerSave();this.select(\'textarea.mceEditor\').each(function(elem) { tinyMCE.execCommand(\'mceRemoveEditor\', false, elem.id); });'
         end
         [onsubmit_without_tiny_mce, submit_js].compact.join ';'
       end

data/lib/active_scaffold/finder.rb

@@ -429,7 +429,7 @@ module ActiveScaffold
     end
 
     def append_to_query(relation, options)
-      options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :outer_joins, :includes, :lock, :readonly, :from, :conditions, :preload, (:references if Rails::VERSION::MAJOR >= 4)
+      options.assert_valid_keys :where, :select, :having, :group, :reorder, :limit, :offset, :joins, :outer_joins, :includes, :lock, :readonly, :from, :conditions, :preload, (:references if Rails::VERSION::MAJOR >= 4)
       relation = options.reject { |_, v| v.blank? }.inject(relation) do |rel, (k, v)|
         k == :conditions ? apply_conditions(rel, *v) : rel.send(k, v)
       end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -105,7 +105,7 @@ module ActiveScaffold
       def format_column_value(record, column, value = nil)
         value ||= record.send(column.name) unless record.nil?
         if column.association.nil?
-          if column.form_ui == :select && column.options[:options]
+          if [:select, :radio].include?(column.form_ui) && column.options[:options]
             text, val = column.options[:options].find { |text, val| (val.nil? ? text : val).to_s == value.to_s }
             value = active_scaffold_translated_option(column, text, val).first if text
           end

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -114,6 +114,7 @@ module ActiveScaffold
           html_options[:name] += '[]'
         else
           options[:include_blank] ||= as_(:_select_)
+          active_scaffold_translate_select_options(options)
         end
 
         if (optgroup = options.delete(:optgroup))
@@ -185,11 +186,10 @@ module ActiveScaffold
         select_options = active_scaffold_search_range_comparator_options(column)
         if active_scaffold_search_range_string?(column)
           text_field_size = 15
-          opt_value ||= '%?%'
         else
           text_field_size = 10
-          opt_value ||= '='
         end
+        opt_value ||= select_options[0][1]
 
         from_value = controller.class.condition_value_for_numeric(column, from_value)
         to_value = controller.class.condition_value_for_numeric(column, to_value)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 19
+    PATCH = 20
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/test/bridges/tiny_mce_test.rb

@@ -15,7 +15,7 @@ class TinyMceTest < ActionView::TestCase
     @record = Company.new
     expects(:request).returns(stub(:xhr? => true))
 
-    assert_dom_equal %{<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\">\n</textarea>\n<script#{' type="text/javascript"' if Rails::VERSION::MAJOR < 4}>\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"simple\"};tinyMCE.execCommand('mceAddControl', false, 'record_name');\n//]]>\n</script>}, active_scaffold_input_text_editor(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => @record)
+    assert_dom_equal %{<textarea name=\"record[name]\" class=\"name-input mceEditor\" id=\"record_name\">\n</textarea>\n<script#{' type="text/javascript"' if Rails::VERSION::MAJOR < 4}>\n//<![CDATA[\ntinyMCE.settings = {\"theme\":\"modern\"};tinyMCE.execCommand('mceAddEditor', false, 'record_name');\n//]]>\n</script>}, active_scaffold_input_text_editor(config.columns[:name], :name => 'record[name]', :id => 'record_name', :class => 'name-input', :object => @record)
   end
 
   protected

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.19
+  version: 3.4.20
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: brakeman