active_scaffold_vho 3.0.11 → 3.0.12

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.11"
+  s.version = "3.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-02-03}
+  s.date = %q{2011-02-11}
   s.description = %q{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 (and interesting!) problems.}
   s.email = %q{activescaffold@googlegroups.com}
   s.extra_rdoc_files = [

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

@@ -214,16 +214,15 @@ $(document).ready(function() {
       var as_form = element.closest('form.as_form');
       $.ajax({
         url: element.attr('data-update_url'),
-        data: {value: element.val()},
+        data: {value: element.val(),
+               source_id: element.attr('id')},
         beforeSend: function(event) {
           element.nextAll('img.loading-indicator').css('visibility','visible');
-          $('input[type=submit]', as_form).attr('disabled', 'disabled');
-          $("input:enabled,select:enabled", as_form).attr('disabled', 'disabled');
+          ActiveScaffold.disable_form(as_form)
         },
         complete: function(event) {
           element.nextAll('img.loading-indicator').css('visibility','hidden');
-          $('input[type=submit]', as_form).attr('disabled', '');
-          $("input:disabled,select:disabled", as_form).attr('disabled', '');
+          ActiveScaffold.enable_form(as_form)
         },
         error: function (xhr, status, error) {
           var as_div = element.closest("div.active-scaffold");
@@ -504,7 +503,7 @@ var ActiveScaffold = {
     var loading_indicator = $('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
     if (loading_indicator) loading_indicator.css('visibility','visible');
     $('input[type=submit]', as_form).attr('disabled', 'disabled');
-    $("input:enabled,select:enabled", as_form).attr('disabled', 'disabled');
+    $("input:enabled,select:enabled,textarea:enabled", as_form).attr('disabled', 'disabled');
   },
   
   enable_form: function(as_form) {
@@ -513,7 +512,7 @@ var ActiveScaffold = {
     var loading_indicator = $('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
     if (loading_indicator) loading_indicator.css('visibility','hidden');
     $('input[type=submit]', as_form).attr('disabled', '');
-    $("input:disabled,select:disabled", as_form).attr('disabled', '');
+    $("input:disabled,select:disabled,textarea:disabled", as_form).attr('disabled', '');
   },  
   
   focus_first_element_of_form: function(form_element) {
@@ -562,6 +561,15 @@ var ActiveScaffold = {
     this.reload_if_empty(tbody, page_reload_url);
   },
 
+  delete_subform_record: function(record) {
+    if (typeof(record) == 'string') record = '#' + record;
+    var errors = $(record).prev();
+    if (errors.hasClass('association-record-errors')) {
+      this.replace_html(errors, '');
+    }
+    this.remove(record);
+  },
+
   report_500_response: function(active_scaffold_id) {
     server_error = $(active_scaffold_id).find('td.messages-container p.server-error');
     if (!$(server_error).is(':visible')) {
@@ -653,13 +661,21 @@ var ActiveScaffold = {
     }
   },
   
-  render_form_field: function(element, content, options) {
-    if (typeof(element) == 'string') element = '#' + element;
-    var element = $(element);
-    if (options.is_subform == false) {
-      this.replace(element.closest('dl'), content);
-    } else {
-      this.replace_html(element, content);
+  render_form_field: function(source, content, options) {
+    if (typeof(source) == 'string') source = '#' + source;
+    var source = $(source);
+    var element = source.closest('.association-record');
+    if (element.length == 0) {
+      element = source.closest('ol.form');
+    }
+    element = element.find('.' + options.field_class);
+
+    if (element) {
+      if (options.is_subform == false) {
+        this.replace(element.closest('dl'), content);
+      } else {
+        this.replace_html(element, content);
+      }
     }
   },
   

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

@@ -238,7 +238,7 @@ document.observe("dom:loaded", function() {
     
     new Ajax.Request(element.readAttribute('data-update_url'), {
       method: 'get',
-      parameters: {value: element.getValue()},
+      parameters: {value: element.getValue(), source_id: element.readAttribute('id')},
       onLoading: function(response) {
         element.next('img.loading-indicator').style.visibility = 'visible';
         as_form.disable();
@@ -451,6 +451,14 @@ var ActiveScaffold = {
     this.reload_if_empty(tbody, page_reload_url);
   },
 
+  delete_subform_record: function(record) {
+    var errors = $(record).previous();
+    if (errors.hasClassName('association-record-errors')) {
+      this.replace_html(errors, '');
+    }
+    this.remove(record);
+  },
+
   report_500_response: function(active_scaffold_id) {
     server_error = $(active_scaffold_id).down('td.messages-container p.server-error');
     if (server_error.visible()) {
@@ -533,12 +541,20 @@ var ActiveScaffold = {
     }
   },
   
-  render_form_field: function(element, content, options) {
-    var element = $(element);
-    if (options.is_subform == false) {
-      this.replace(element.up('dl'), content);
-    } else {
-      this.replace_html(element, content);
+  render_form_field: function(source, content, options) {
+    var source = $(source);
+    var element = source.up('.association-record');
+    if (typeof(element) === 'undefined') {
+      element = source.up('ol.form');
+    }
+    element = element.down('.' + options.field_class);
+
+    if (element) {
+      if (options.is_subform == false) {
+        this.replace(element.up('dl'), content);
+      } else {
+        this.replace_html(element, content);
+      }
     }
   },
 

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

@@ -26,7 +26,7 @@
   <td class="actions">
     <% if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
       <% destroy_id = "#{options[:id]}-destroy" %>
-      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.remove(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
+      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.delete_subform_record(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
       <%= javascript_tag("ActiveScaffold.show('#{destroy_id}');") if !locked %>
     <% end %>
     <% unless @record.new_record? %>

data/frontends/default/views/_render_field.js.rjs

@@ -1,12 +1,9 @@
 column = active_scaffold_config.columns[render_field.to_sym]
-options = {:is_subform => false}
+options = {:is_subform => false, :field_class => "#{column.name}-input"}
 if column_renders_as(column) == :subform
   options[:is_subform] = true
-  field_id = sub_form_id(:association => column.name)
-else
-  field_id = active_scaffold_input_options(column, params[:scope])[:id]
 end
-page.call 'ActiveScaffold.render_form_field', field_id, render(:partial => form_partial_for_column(column), :locals => { :column => column, :scope => params[:scope] }), options
+page.call 'ActiveScaffold.render_form_field', source_id, render(:partial => form_partial_for_column(column), :locals => { :column => column, :scope => params[:scope] }), options
 render(:partial => "render_field", :collection => column.update_columns) if column.update_columns && !column.update_columns.empty?
 
     

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

@@ -27,7 +27,7 @@
   <li class="actions">
     <% if record_column.plural_association? and (@record.authorized_for?(:crud_type => :delete) or not [:destroy, :delete_all].include?(record_column.association.options[:dependent])) %>
       <% destroy_id = "#{options[:id]}-destroy" %>
-      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.remove(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
+      <%= link_to as_(:remove), '#', :class => 'destroy', :id => destroy_id , :onclick => "ActiveScaffold.delete_subform_record(\"#{tr_id}\"); return false;", :style=> "display: none;" %>
       <%= javascript_tag("ActiveScaffold.show('#{destroy_id}');") if !locked %>
     <% end %> 
     <% unless @record.new_record? %>

data/lib/active_scaffold/actions/core.rb

@@ -34,7 +34,8 @@ module ActiveScaffold::Actions
         value = column_value_from_param_value(@record, column, params[:value])
         @record.send "#{column.name}=", value
         after_render_field(@record, column)
-        render :partial => "render_field", :collection => Array(params[:update_columns]), :content_type => 'text/javascript'
+        source_id = params.delete(:source_id)
+        render :partial => "render_field", :collection => Array(params[:update_columns]), :content_type => 'text/javascript', :locals => {:source_id => source_id}
       end
     end
     

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

@@ -8,8 +8,10 @@ ActiveScaffold::Bridges.bridge "DatePicker" do
 
     if ActiveScaffold.js_framework == :jquery
       require File.join(directory, "lib/datepicker_bridge.rb")
-      FileUtils.cp(source, destination)
-      ActiveScaffold::Bridges::DatePickerBridge.localization(File.join(destination, 'date_picker_bridge.js'))
+      unless defined?(ACTIVE_SCAFFOLD_INSTALL_ASSETS) && ACTIVE_SCAFFOLD_INSTALL_ASSETS == false
+        FileUtils.cp(source, destination)
+        ActiveScaffold::Bridges::DatePickerBridge.localization(File.join(destination, 'date_picker_bridge.js'))
+      end
     else
       # make sure that jquery files are removed
       FileUtils.rm(File.join(destination, 'date_picker_bridge.js')) if File.exist?(File.join(destination, 'date_picker_bridge.js'))

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -43,7 +43,7 @@ module ActiveScaffold
           def active_scaffold_date_bridge_trend_tag(column, options, trend_options)
             trend_controls = text_field_tag("#{trend_options[:name_prefix]}[#{column.name}][number]", trend_options[:number_value], :class => 'text-input', :size => 10, :autocomplete => 'off') << " " <<
             select_tag("#{trend_options[:name_prefix]}[#{column.name}][unit]",
-             options_for_select(active_scaffold_search_date_bridge_trend_units(column), trend_options[:name_prefix]),
+             options_for_select(active_scaffold_search_date_bridge_trend_units(column), trend_options[:unit_value]),
              :class => 'text-input')
             content_tag("span", trend_controls.html_safe, :id => "#{options[:id]}_trend", :style => "display:#{trend_options[:show] ? '' : 'none'}")
           end
@@ -108,12 +108,16 @@ module ActiveScaffold
                 ['from', 'to'].collect { |field| condition_value_for_datetime(value[field], conversion)}
               end
             end
+
+            def date_bridge_now
+              Time.zone.now
+            end
             
             def date_bridge_from_to_for_trend(column, value)
               case value['opt']
               when "PAST"
                 trend_number = [value['number'].to_i,  1].max
-                now = Time.zone.now
+                now = date_bridge_now
                 if date_bridge_column_date?(column)
                   from = now.beginning_of_day.ago((trend_number).send(value['unit'].downcase.singularize.to_sym))
                   to = now.end_of_day
@@ -124,7 +128,7 @@ module ActiveScaffold
                 return from, to
               when "FUTURE"
                 trend_number = [value['number'].to_i,  1].max
-                now = Time.zone.now
+                now = date_bridge_now
                 if date_bridge_column_date?(column)
                   from = now.beginning_of_day
                   to = now.end_of_day.in((trend_number).send(value['unit'].downcase.singularize.to_sym))
@@ -139,21 +143,21 @@ module ActiveScaffold
             def date_bridge_from_to_for_range(column, value)
               case value[:range]
               when 'TODAY'
-                return Time.zone.now.beginning_of_day, Time.zone.now.end_of_day
+                return date_bridge_now.beginning_of_day, date_bridge_now.end_of_day
               when 'YESTERDAY'
-                return Time.zone.now.ago(1.day).beginning_of_day, Time.zone.now.ago(1.day).end_of_day
+                return date_bridge_now.ago(1.day).beginning_of_day, date_bridge_now.ago(1.day).end_of_day
               when 'TOMMORROW'
-                return Time.zone.now.in(1.day).beginning_of_day, Time.zone.now.in(1.day).end_of_day
+                return date_bridge_now.in(1.day).beginning_of_day, date_bridge_now.in(1.day).end_of_day
               else
                 range_type, range = value[:range].downcase.split('_')
                 raise ArgumentError unless ['week', 'month', 'year'].include?(range)
                 case range_type
                 when 'this'
-                  return Time.zone.now.send("beginning_of_#{range}".to_sym), Time.zone.now.send("end_of_#{range}")
+                  return date_bridge_now.send("beginning_of_#{range}".to_sym), date_bridge_now.send("end_of_#{range}")
                 when 'prev'
-                  return Time.zone.now.ago(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), Time.zone.now.ago(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
+                  return date_bridge_now.ago(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), date_bridge_now.ago(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
                 when 'next'
-                  return Time.zone.now.in(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), Time.zone.now.in(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
+                  return date_bridge_now.in(1.send(range.to_sym)).send("beginning_of_#{range}".to_sym), date_bridge_now.in(1.send(range.to_sym)).send("end_of_#{range}".to_sym)
                 else
                   return nil, nil    
                 end

data/lib/active_scaffold/finder.rb

@@ -292,7 +292,10 @@ module ActiveScaffold
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :order, :limit, :offset, :joins, :includes, :lock, :readonly, :from
       options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
-        query = query.except(:order) if k.to_sym == :order
+        # default ordering of model has a higher priority than current queries ordering
+        # fix this by removing existing ordering from arel
+        # will not work if order part is first one which is iterated
+        query = query.except(:order) if k.to_sym == :order && query.is_a?(ActiveRecord::Relation)
         query.send((k.to_sym), v) 
       end
     end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 0
-    PATCH = 11
+    PATCH = 12
 
     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: 17
+  hash: 31
   prerelease: false
   segments: 
   - 3
   - 0
-  - 11
-  version: 3.0.11
+  - 12
+  version: 3.0.12
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +01:00
+date: 2011-02-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency