active_scaffold_vho 3.0.30 → 3.0.31

data/frontends/default/javascripts/jquery/active_scaffold.js

@@ -26,7 +26,7 @@ $(document).ready(function() {
       ActiveScaffold.enable_form(as_form);
     }
   });
-  $(document).on('ajax:failure', 'form.as_form', function(event) {
+  $(document).on('ajax:error', 'form.as_form', function(event) {
     var as_div = $(this).closest("div.active-scaffold");
     if (as_div) {
       ActiveScaffold.report_500_response(as_div)
@@ -91,7 +91,7 @@ $(document).ready(function() {
     }
     return true;
   });
-  $(document).on('ajax:failure', 'a.as_action', function(event) {
+  $(document).on('ajax:error', 'a.as_action', function(event) {
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id());
@@ -140,7 +140,7 @@ $(document).ready(function() {
     }
     return true;
   });
-  $(document).on('ajax:failure', 'a.as_cancel', function(event) {
+  $(document).on('ajax:error', 'a.as_cancel', function(event) {
     var action_link = ActiveScaffold.find_action_link($(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id());
@@ -154,7 +154,7 @@ $(document).ready(function() {
     as_sort.closest('th').addClass('loading');
     return true;
   });
-  $(document).on('ajax:failure', 'a.as_sort', function(event) {
+  $(document).on('ajax:error', 'a.as_sort', function(event) {
     var as_scaffold = $(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
@@ -174,7 +174,7 @@ $(document).ready(function() {
     loading_indicator.css('visibility','visible');
     return true;
   });
-  $(document).on('ajax:failure', 'div.active-scaffold-footer .pagination a', function(event) {
+  $(document).on('ajax:error', 'div.active-scaffold-footer .pagination a', function(event) {
     var as_scaffold = $(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
@@ -935,7 +935,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]'));
+      });
     });
   },
 

data/frontends/default/stylesheets/stylesheet.css

@@ -776,7 +776,7 @@ padding: 6px 0;
 }
 
 .active-scaffold li.form-element dd {
-float: left;
+float: none;
 }
 
 .active-scaffold li.form-element dd input[type="checkbox"] {
@@ -1001,9 +1001,9 @@ height: 27px;
 background: url(../../../images/active_scaffold/default/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 {
@@ -1072,4 +1072,4 @@ padding: 5px 2px 5px 5px;
 
 .as_touch tr.record td {
 padding: 5px 10px;
-}
+}

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/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',
@@ -137,12 +137,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/file_column/lib/file_column_helpers.rb

@@ -5,7 +5,7 @@ module ActiveScaffold
         module FileColumnHelpers
           class << self
             def file_column_fields(klass)
-              klass.instance_methods.grep(/_just_uploaded\?$/).collect{|m| m[0..-16].to_sym }
+              klass.instance_method_names.grep(/_just_uploaded\?$/).collect{|m| m[0..-16].to_sym }
             end
             
             def generate_delete_helpers(klass)

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/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
 
 

data/lib/active_scaffold/finder.rb

@@ -266,9 +266,11 @@ module ActiveScaffold
        #TODO not supported by kaminari
       options[:count_includes] ||= full_includes unless search_conditions.nil?
 
+      #active_scaffold_config.model.skip_total_count = true if options[:pagination] == :infinite
+
       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),
                          :where => search_conditions,

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -140,7 +140,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)'
@@ -49,6 +50,7 @@ de:
     _select_: '- Auswählen -'
     show: 'Anzeigen'
     show_model: 'Zeige %{model} an'
+    'true': 'Ja'
     _to_ : ' zu '
     update: 'Speichern'
     update_model: 'Editiere %{model}'

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: 
+  hash: 57
+  prerelease: false
   segments: 
   - 3
   - 0
-  - 30
-  version: 3.0.30
+  - 31
+  version: 3.0.31
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-28 00:00:00 Z
+date: 2014-01-25 00:00:00 +01:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -385,6 +386,7 @@ files:
 - test/run_all.rb
 - test/test_helper.rb
 - uninstall.rb
+has_rdoc: true
 homepage: http://github.com/vhochstein/active_scaffold
 licenses: 
 - MIT
@@ -414,7 +416,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails 3 Version of activescaffold supporting prototype and jquery