active_scaffold_vho 3.1.6 → 3.1.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.1.6)
+    active_scaffold_vho (3.1.7)
       kaminari
       rails (>= 3.1.0)
 

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

@@ -937,7 +937,9 @@ var ActiveScaffold = {
   load_embedded_conrollers: function(){
     $.each($('a.as_link_to_component'), function(index) {
       var div_element = $(this).closest('div.active-scaffold-component');
-      div_element.load($(this).attr('href').append_params({embedded: true}));
+      div_element.load($(this).attr('href').append_params({embedded: true}), function() {
+        ActiveScaffold.trigger_load_events($(this).find('[data-as_load]'));
+      });
     });
   },
 
@@ -1176,12 +1178,20 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
 
     if (this.position == 'after') {
       this.target.after(this.wrap_with_adapter_html(content, should_refresh_data));
-      ActiveScaffold.trigger_load_events(this.target.next().find('.records').first().find('> [data-as_load]'));
+      if(this.action == 'index') {
+        ActiveScaffold.trigger_load_events(this.target.next().find('.records').first().find('> [data-as_load]'));
+      } else {
+        ActiveScaffold.trigger_load_events(this.target.next().find('[data-as_load]'));
+      }
       this.set_adapter(this.target.next());
     }
     else if (this.position == 'before') {
       this.target.before(this.wrap_with_adapter_html(content, should_refresh_data));
-      ActiveScaffold.trigger_load_events(this.target.prev().find('.records').first().find('> [data-as_load]'));
+      if (this.action == 'index') {
+        ActiveScaffold.trigger_load_events(this.target.prev().find('.records').first().find('> [data-as_load]'));
+      } else {
+        ActiveScaffold.trigger_load_events(this.target.prev().find('[data-as_load]'));
+      }
       this.set_adapter(this.target.prev());
     }
     else {
@@ -1224,7 +1234,11 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
     }
     if (!new_adapter.hasClass('as_adapter')) {
       new_adapter = ActiveScaffold.replace(new_adapter, this.wrap_with_adapter_html(new_adapter.children(':first-child').html(), should_refresh_data), true);
-      ActiveScaffold.trigger_load_events(new_adapter.find('.records').first().find('> [data-as_load]'));
+      if (this.action == 'index') {
+        ActiveScaffold.trigger_load_events(new_adapter.find('.records').first().find('> [data-as_load]'));
+      } else {
+        ActiveScaffold.trigger_load_events(new_adapter.find('[data-as_load]'));
+      }
     }
     this.set_adapter(new_adapter);
     this.disable();

data/app/assets/stylesheets/active_scaffold_core.css.erb

@@ -530,9 +530,10 @@ color: #ccc;
 }
 
 .active-scaffold-footer .pagination {
-float: right;
+text-align: right;
 white-space: nowrap;
 margin-right: 5px;
+font: bold 12px arial, sans-serif;
 }
 
 .blue-theme .active-scaffold-footer .active-scaffold-records {
@@ -543,8 +544,7 @@ margin-left: 5px;
 text-decoration: none;
 letter-spacing: 0;
 padding: 0 2px;
-margin: 0 -2px;
-font: bold 12px arial, sans-serif;
+margin: 0;
 }
 
 .blue-theme .active-scaffold-footer a,
@@ -777,7 +777,7 @@ padding: 6px 0;
 }
 
 .active-scaffold li.form-element dd {
-float: left;
+float: none;
 }
 
 .active-scaffold li.form-element dd input[type="checkbox"] {
@@ -1002,9 +1002,9 @@ height: 27px;
 background: url(<%= asset_data_uri 'close_touch.png' %>) 0 0 no-repeat;
 }
 
-.as_touch .active-scaffold-pagination a {
-font-size: 20px;
-padding: 3px 10px;
+.as_touch .active-scaffold-footer .pagination, .as_touch .active-scaffold-footer .pagination a {
+    font-size: 20px;
+    padding: 3px 10px;
 }
 
 .as_touch .active-scaffold-header div.actions a {

data/frontends/default/views/_messages.html.erb

@@ -5,6 +5,7 @@
       <% if request.xhr? %>
         <a href="#" onclick="ActiveScaffold.remove(this.parentNode); return false;" title="<%= as_(:close) %>"><%= as_(:close) %></a>
       <% end %>
+      <% flash[name] = nil %>
     </div>
   <% end %>
 <% end %>

data/lib/active_scaffold/actions/field_search.rb

@@ -43,12 +43,16 @@ module ActiveScaffold::Actions
     end
 
     def do_search
-      unless search_params.nil?
+      prepare_search_conditions(search_params)
+    end
+
+    def prepare_search_conditions(params)
+      unless params.nil?
         text_search = active_scaffold_config.field_search.text_search
         search_conditions = []
         human_condition_columns = [] if active_scaffold_config.field_search.human_conditions
         columns = field_search_columns
-        search_params.each do |key, value|
+        params.each do |key, value|
           next unless columns.include? key
           search_condition = self.class.condition_for_column(active_scaffold_config.columns[key], value, text_search)
           unless search_condition.blank?

data/lib/active_scaffold/actions/nested.rb

@@ -83,7 +83,7 @@ module ActiveScaffold::Actions
     
     def beginning_of_chain
       if nested? && nested.association && nested.association.collection?
-        nested.parent_scope.send(nested.association.name).where("")
+        nested.parent_scope.send(nested.association.name)
       elsif nested? && nested.scope
         nested.parent_scope.send(nested.scope)
       else

data/lib/active_scaffold/bridges/calendar_date_select/bridge.rb

@@ -3,7 +3,7 @@ ActiveScaffold::Bridges.bridge "CalendarDateSelect" do
     # check to see if the old bridge was installed.  If so, warn them
     # we can detect this by checking to see if the bridge was installed before calling this code
        
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_calendar_date_select")
+    if ActiveScaffold::Config::Core.instance_method_names.include?("initialize_with_calendar_date_select")
       raise RuntimeError, "We've detected that you have active_scaffold_calendar_date_select_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_calendar_date_select_bridge to prevent any conflicts"
     end
     

data/lib/active_scaffold/bridges/date_picker/lib/datepicker_bridge.rb

@@ -41,7 +41,7 @@ module ActiveScaffold
         '%m' => 'mm',
         '%y' => 'y',
         '%Y' => 'yy',
-        '%H' => 'hh', # options ampm => false
+        '%H' => 'HH', # options ampm => false
         '%I' => 'hh', # options ampm => true
         '%M' => 'mm',
         '%p' => 'tt',
@@ -168,12 +168,13 @@ module ActiveScaffold
       def self.split_datetime_format(datetime_format)
         date_format = datetime_format
         time_format = nil
-        time_start_indicators = %w{hh mm tt ss}
+        time_start_indicators = %w{HH hh mm tt ss}
         unless datetime_format.nil?
           start_indicator = time_start_indicators.detect {|indicator| datetime_format.include?(indicator)}
           unless start_indicator.nil?
             pos_time_format = datetime_format.index(start_indicator)
             date_format = datetime_format.to(pos_time_format - 1)
+            date_format.strip!
             time_format = datetime_format.from(pos_time_format)
           end
         end

data/lib/active_scaffold/bridges/file_column/bridge.rb

@@ -1,6 +1,6 @@
 ActiveScaffold::Bridges.bridge "FileColumn" do
   install do
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_file_column")
+    if ActiveScaffold::Config::Core.instance_method_names.include?("initialize_with_file_column")
       raise RuntimeError, "We've detected that you have active_scaffold_file_column_bridge installed.  This plugin has been moved to core.  Please remove active_scaffold_file_column_bridge to prevent any conflicts"
     end
     require File.join(File.dirname(__FILE__), "lib/as_file_column_bridge")

data/lib/active_scaffold/bridges/file_column/lib/as_file_column_bridge.rb

@@ -24,7 +24,7 @@ module ActiveScaffold::Config
       }
     end
     
-    alias_method_chain :initialize, :file_column unless self.instance_methods.include?("initialize_without_file_column")
+    alias_method_chain :initialize, :file_column unless self.instance_method_names.include?("initialize_without_file_column")
     
     def configure_file_column_field(field)
       # set list_ui first because it gets its default value from form_ui

data/lib/active_scaffold/bridges/paperclip/bridge.rb

@@ -1,6 +1,6 @@
 ActiveScaffold::Bridges.bridge "Paperclip" do
   install do
-    if ActiveScaffold::Config::Core.instance_methods.include?("initialize_with_paperclip")
+    if ActiveScaffold::Config::Core.instance_method_names.include?("initialize_with_paperclip")
       raise RuntimeError, "We've detected that you have active_scaffold_paperclip_bridge installed. This plugin has been moved to core. Please remove active_scaffold_paperclip_bridge to prevent any conflicts"
     end
     require File.join(File.dirname(__FILE__), "lib/form_ui")

data/lib/active_scaffold/bridges/paperclip/lib/paperclip_bridge_helpers.rb

@@ -7,7 +7,7 @@ module ActiveScaffold
           self.thumbnail_style = :thumbnail
         
           def self.generate_delete_helper(klass, field)
-            klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.instance_methods.include?("delete_#{field}=")
+            klass.class_eval <<-EOF, __FILE__, __LINE__ + 1 unless klass.instance_method_names.include?("delete_#{field}=")
               attr_reader :delete_#{field}
         
               def delete_#{field}=(value)

data/lib/active_scaffold/data_structures/column.rb

@@ -188,7 +188,16 @@ module ActiveScaffold::DataStructures
     end
 
     def stripped_value(value)
-      stripable? ? value.strip : value
+      if stripable?
+        begin
+          value.strip
+        rescue
+          Rails.logger.error("stripped_value: column #{self.name} is a db text column, but value is nt a string: #{value.inspect}. Please define column[:#{self.name}].stripable = false in config")
+          value
+        end
+      else
+        value
+      end
     end
 
     # to set how many associated records a column with plural association must show in list

data/lib/active_scaffold/finder.rb

@@ -266,6 +266,7 @@ module ActiveScaffold
       options[:count_includes] ||= full_includes unless search_conditions.nil?
 
       klass = beginning_of_chain
+      klass = klass.where("") if klass.is_a?(Array)
       
       # create a general-use options array that's compatible with Rails finders
       finder_options = { :order => options[:sorting].try(:clause),

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -146,7 +146,12 @@ module ActiveScaffold
         if link.type == :member && !options[:authorized]
           action_link_html(link, nil, {:class => "disabled #{link.action}#{link.html_options[:class].blank? ? '' : (' ' + link.html_options[:class])}"}, record)
         else
-          render_action_link(link, url_options, record)
+          begin
+            render_action_link(link, url_options, record)
+          rescue
+            Rails.logger.error("render_action_link: exception occured: #{$!} link: #{link.inspect}, url_options: #{url_options.inspect}, options: #{options.inspect}, record: #{record.inspect}")
+            action_link_html(link, nil, {:class => "disabled #{link.action}#{link.html_options[:class].blank? ? '' : (' ' + link.html_options[:class])}"}, record)
+          end
         end
       end
       

data/lib/active_scaffold/locale/de.yml

@@ -22,6 +22,7 @@ de:
     download: 'Download'
     edit: 'Bearbeiten'
     export: 'Exportieren'
+    'false': 'Nein'
     nested_for_model: '%{nested_model} für %{parent_model}'
     nested_of_model: '%{nested_model} von %{parent_model}'
     filtered: '(Gefiltert)'
@@ -50,6 +51,7 @@ de:
     show: 'Anzeigen'
     show_model: 'Zeige %{model} an'
     _to_ : ' zu '
+    'true': 'Ja'
     update: 'Speichern'
     update_model: 'Editiere %{model}'
     updated_model: '%{model} aktualisiert'

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &5201540 !ruby/object:Gem::Requirement
+  requirement: &19626940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5201540
+  version_requirements: *19626940
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &5165600 !ruby/object:Gem::Requirement
+  requirement: &19626440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *5165600
+  version_requirements: *19626440
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &5157800 !ruby/object:Gem::Requirement
+  requirement: &19625940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5157800
+  version_requirements: *19625940
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &5155320 !ruby/object:Gem::Requirement
+  requirement: &19625380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *5155320
+  version_requirements: *19625380
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &5153520 !ruby/object:Gem::Requirement
+  requirement: &19625000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *5153520
+  version_requirements: *19625000
 description: Save time and headaches, and create a more easily maintainable set of
   pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read,
   update, delete) user interface needs, leaving you more time to focus on more challenging
@@ -378,9 +378,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3291551366358840762
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: