active_scaffold_vho 3.0.24 → 3.0.25

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.24"
+  s.version = "3.0.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-12-01}
+  s.date = %q{2012-02-28}
   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 = [
@@ -65,7 +65,6 @@ Gem::Specification.new do |s|
     "frontends/default/views/_list_calculations.html.erb",
     "frontends/default/views/_list_column_headings.html.erb",
     "frontends/default/views/_list_header.html.erb",
-    "frontends/default/views/_list_inline_adapter.html.erb",
     "frontends/default/views/_list_messages.html.erb",
     "frontends/default/views/_list_pagination.html.erb",
     "frontends/default/views/_list_pagination_links.html.erb",
@@ -183,7 +182,6 @@ Gem::Specification.new do |s|
     "lib/active_scaffold/data_structures/nested_info.rb",
     "lib/active_scaffold/data_structures/set.rb",
     "lib/active_scaffold/data_structures/sorting.rb",
-    "lib/active_scaffold/extensions/action_controller_rendering.rb",
     "lib/active_scaffold/extensions/action_view_rendering.rb",
     "lib/active_scaffold/extensions/action_view_resolver.rb",
     "lib/active_scaffold/extensions/active_association_reflection.rb",

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

@@ -239,6 +239,16 @@ $(document).ready(function() {
     });
     return true;
   });
+  $('tr.inline-adapter-autoopen').live('as:list_row_loaded', function(event) {
+    var actionlink_id = $(event.target).attr('data-actionlinkid');
+    if(actionlink_id) {
+      var action_link = ActiveScaffold.ActionLink.get(actionlink_id);
+      if (action_link) {
+        action_link.set_opened();
+      }
+    }
+    return true;
+  });
   $('form.as_form').live('ajax:before', function(event) {
     var as_form = $(this).closest("form");
     $(this).trigger('as:form_submit');
@@ -453,12 +463,17 @@ var ActiveScaffold = {
     ActiveScaffold.highlight(replaced);
   },
   
-  replace: function(element, html) {
+  replace: function(element, html, disable_event_trigger) {
     if (typeof(element) == 'string') element = '#' + element; 
     element = $(element);
-    ActiveScaffold.trigger_unload_events(element.find('[data-as_load]').andSelf());
-    var new_element = $(html).replaceAll(element);
-    ActiveScaffold.trigger_load_events(new_element.find('[data-as_load]').andSelf());
+    var new_element = null;
+    if((typeof(disable_event_trigger) == 'boolean') && disable_event_trigger == true) {
+      new_element = $(html).replaceAll(element);
+    } else {
+      ActiveScaffold.trigger_unload_events(element.find('[data-as_load]').andSelf());
+      new_element = $(html).replaceAll(element);
+      ActiveScaffold.trigger_load_events(new_element.find('[data-as_load]').andSelf());
+    }
     return new_element;
   },
   
@@ -731,7 +746,15 @@ var ActiveScaffold = {
                      hover_class: 'hover',
                      element_id: 'editor_id',
                      ajax_data_type: "script",
-                     update_value: 'value'},
+                     update_value: 'value',
+                     delegate: {didOpenEditInPlace: function(aDOMNode, aSettingsDict) {
+                                  ActiveScaffold.trigger_load_events(aDOMNode.find('[data-as_load]'));
+                                  return true;
+                                },
+                                shouldCloseEditInPlace: function(aDOMNode, aSettingsDict) {
+                                  ActiveScaffold.trigger_unload_events(aDOMNode.find('[data-as_load]'));
+                                  return true;
+                                }}},
           csrf_param = $('meta[name=csrf-param]').first(),
           csrf_token = $('meta[name=csrf-token]').first(),
           my_parent = span.parent(),
@@ -977,6 +1000,24 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     this.adapter = element;
     this.adapter.addClass('as_adapter');
     this.adapter.data('action_link', this);
+  },
+  wrap_with_adapter_html: function(content) {
+    // players_view class missing
+    var id_string = null;
+    var close_label = this.scaffold().attr('data-closelabel');
+    var controller = this.scaffold().attr('data-controller');
+
+    if (this.tag.attr('data-controller')) {
+        controller = this.tag.attr('data-controller');
+    }
+
+    if(this.target.hasClass('before-header')) {
+        id_string = this.target.attr('id').replace('search', 'nested');
+    } else {
+        id_string = this.target.attr('id').replace('list', 'nested');
+    }
+
+    return '<tr class="inline-adapter" id="' + id_string + '"><td colspan="99" class="inline-adapter-cell"><div class="' + this.action + '-view ' + controller +  '-view view"><a class="inline-adapter-close as_cancel" title="' + close_label + '" data-remote="true" data-refresh="false" href="">' + close_label +'</a>' + content + '</div></td></tr>'
   }
 });
 
@@ -987,12 +1028,15 @@ ActiveScaffold.Actions.Record = ActiveScaffold.Actions.Abstract.extend({
   instantiate_link: function(link) {
     var l = new ActiveScaffold.ActionLink.Record(link, this.target, this.loading_indicator);
     var refresh = this.target.attr('data-refresh');
-    if (refresh) l.refresh_url = refresh;
-    
-    if (l.position) {
-      l.url = l.url.append_params({adapter: '_list_inline_adapter'});
-      l.tag.attr('href', l.url);
+    if (refresh) {
+        l.refresh_url = refresh;
+    }
+
+    if (l.position && l.tag.attr('data-action') == 'index') {
+        l.url = l.url.append_params({embedded: true});
+        l.tag.attr('href', l.url);
     }
+    
     l.set = this;
     return l;
   }
@@ -1019,18 +1063,19 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
     }
 
     if (this.position == 'after') {
-      this.target.after(content);
+      this.target.after(this.wrap_with_adapter_html(content));
       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(content);
+      this.target.before(this.wrap_with_adapter_html(content));
       ActiveScaffold.trigger_load_events(this.target.prev().find('[data-as_load]'));
       this.set_adapter(this.target.prev());
     }
     else {
       return false;
     }
+    this.update_flash_messages('');
     ActiveScaffold.highlight(this.adapter.find('td'));
   },
 
@@ -1059,10 +1104,12 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
   
   set_opened: function() {
     if (this.position == 'after') {
-      this.set_adapter(this.target.next());
+      var new_adapter = ActiveScaffold.replace(this.target.next(), this.wrap_with_adapter_html(this.target.next().children(':first-child').html()), true);
+      this.set_adapter(new_adapter);
     }
     else if (this.position == 'before') {
-      this.set_adapter(this.target.prev());
+      var new_adapter = ActiveScaffold.replace(this.target.prev(), this.wrap_with_adapter_html(this.target.prev().children(':first-child').html()), true);
+      this.set_adapter(new_adapter);
     }
     this.disable();
   }
@@ -1074,10 +1121,7 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
 ActiveScaffold.Actions.Table = ActiveScaffold.Actions.Abstract.extend({
   instantiate_link: function(link) {
     var l = new ActiveScaffold.ActionLink.Table(link, this.target, this.loading_indicator);
-    if (l.position) {
-      l.url = l.url.append_params({adapter: '_list_inline_adapter'});
-      l.tag.attr('href', l.url);
-    }
+    
     return l;
   }
 });
@@ -1085,13 +1129,14 @@ ActiveScaffold.Actions.Table = ActiveScaffold.Actions.Abstract.extend({
 ActiveScaffold.ActionLink.Table = ActiveScaffold.ActionLink.Abstract.extend({
   insert: function(content) {
     if (this.position == 'top') {
-      this.target.prepend(content);
+      this.target.prepend(this.wrap_with_adapter_html(content));
       ActiveScaffold.trigger_load_events(this.target.children().first().find('[data-as_load]'));
       this.set_adapter(this.target.children().first());
     }
     else {
       throw 'Unknown position "' + this.position + '"'
     }
+    this.update_flash_messages('');
     ActiveScaffold.highlight(this.adapter.find('td').first().children());
   }
 });

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

@@ -259,7 +259,7 @@ $.extend(InlineEditor.prototype, {
 		var buttons_html  = (this.settings.show_buttons) ? this.settings.save_button + ' ' + this.settings.cancel_button : '';
 		var editorElement = this.createEditorElement(); // needs to happen before anything is replaced
 		/* insert the new in place form after the element they click, then empty out the original element */
-		this.dom.html('<form class="inplace_form" style="display: inline; margin: 0; padding: 0;"></form>')
+		this.dom.html('<form class="inplace_form" data-as_load="form" style="display: inline; margin: 0; padding: 0;"></form>')
 			.find('form')
 				.append(editorElement)
 				.append(buttons_html);

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

@@ -314,6 +314,16 @@ document.observe("dom:loaded", function() {
       ActiveScaffold.focus_first_element_of_form(as_form);
       return true;
   });
+  document.on('as:list_row_loaded', 'tr.inline-adapter-autoopen', function(event, element) {
+    var actionlink_id = element.readAttribute('data-actionlinkid');
+    if(actionlink_id) {
+      var action_link = ActiveScaffold.ActionLink.get(actionlink_id);
+      if (action_link) {
+        action_link.set_opened();
+      }
+    }
+    return true;
+  });
   document.on('ajax:before', 'form.as_form', function(event) {
     var as_form = event.findElement('form');
     element.fire('as:form_submit');
@@ -406,12 +416,14 @@ var ActiveScaffold = {
     new_row.highlight();
   },
   
-  replace: function(element, html) {
+  replace: function(element, html, disable_event_trigger) {
     element = $(element);
     var elements = element.select('[data-as_load]');
     var new_element = null;
     elements.unshift(element);
-    ActiveScaffold.trigger_unload_events(elements);
+    if((typeof(disable_event_trigger) != 'boolean') || disable_event_trigger === false) {
+      ActiveScaffold.trigger_unload_events(elements);
+    }
     if (html.startsWith('<tr')) {
         new_element = new Element('tbody').update(html);
     } else {
@@ -421,7 +433,9 @@ var ActiveScaffold = {
     Element.replace(element, new_element);
     elements = new_element.select('[data-as_load]');
     elements.unshift(new_element);
-    ActiveScaffold.trigger_load_events(elements);
+    if((typeof(disable_event_trigger) != 'boolean') || disable_event_trigger === false) {
+      ActiveScaffold.trigger_load_events(elements);
+    }
     return new_element;
   },
     
@@ -774,9 +788,11 @@ ActiveScaffold.Actions.Abstract = Class.create({
     this.target = $(target);
     this.loading_indicator = $(loading_indicator);
     this.options = options;
+    var _this = this;
     this.links = links.collect(function(link) {
-      return this.instantiate_link(link);
-    }.bind(this));
+      var my_link = _this.instantiate_link(link);
+      return my_link;
+    });
   },
 
   instantiate_link: function(link) {
@@ -879,6 +895,25 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
     this.adapter = element;
     this.adapter.addClassName('as_adapter');
     this.adapter.store('action_link', this);
+  },
+
+  wrap_with_adapter_html: function(content) {
+    // players_view class missing
+    var id_string = null;
+    var close_label = this.scaffold().readAttribute('data-closelabel');
+    var controller = this.scaffold().readAttribute('data-controller');
+
+    if (this.tag.readAttribute('data-controller')) {
+        controller = this.tag.readAttribute('data-controller');
+    }
+
+    if(this.target.hasClassName('before-header')) {
+        id_string = this.target.readAttribute('id').replace('search', 'nested');
+    } else {
+        id_string = this.target.readAttribute('id').replace('list', 'nested');
+    }
+
+    return '<tr class="inline-adapter" id="' + id_string + '"><td colspan="99" class="inline-adapter-cell"><div class="' + this.action + '-view ' + controller +  '-view view"><a class="inline-adapter-close as_cancel" title="' + close_label + '" data-remote="true" data-refresh="false" href="">' + close_label +'</a>' + content + '</div></td></tr>'
   }
 });
 
@@ -889,10 +924,10 @@ ActiveScaffold.Actions.Record = Class.create(ActiveScaffold.Actions.Abstract, {
   instantiate_link: function(link) {
     var l = new ActiveScaffold.ActionLink.Record(link, this.target, this.loading_indicator);
     if (this.target.hasAttribute('data-refresh') && !this.target.readAttribute('data-refresh').blank()) l.refresh_url = this.target.readAttribute('data-refresh');
-    
-    if (l.position) {
-      l.url = l.url.append_params({adapter: '_list_inline_adapter'});
-      l.tag.href = l.url;
+
+    if (l.position && l.tag.hasAttribute('data-action') && l.tag.readAttribute('data-action') == "index") {
+        l.url = l.url.append_params({embedded: true});
+        l.tag.href = l.url;
     }
     l.set = this;
     return l;
@@ -919,18 +954,19 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
     }
 
     if (this.position == 'after') {
-      this.target.insert({after:content});
+      this.target.insert({after:this.wrap_with_adapter_html(content)});
       ActiveScaffold.trigger_load_events(this.target.next().select('[data-as_load]'));
       this.set_adapter(this.target.next());
     }
     else if (this.position == 'before') {
-      this.target.insert({before:content});
+      this.target.insert({before:this.wrap_with_adapter_html(content)});
       ActiveScaffold.trigger_load_events(this.target.previous().select('[data-as_load]'));
       this.set_adapter(this.target.previous());
     }
     else {
       return false;
     }
+    this.update_flash_messages();
     this.adapter.down('td').down().highlight();
   },
 
@@ -957,10 +993,12 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
 
   set_opened: function() {
     if (this.position == 'after') {
-      this.set_adapter(this.target.next());
+      var new_adapter = ActiveScaffold.replace(this.target.next(), this.wrap_with_adapter_html(this.target.next().childElements().first().innerHTML), true);
+      this.set_adapter(new_adapter);
     }
     else if (this.position == 'before') {
-      this.set_adapter(this.target.previous());
+      var new_adapter = ActiveScaffold.replace(this.target.previous(), this.wrap_with_adapter_html(this.target.previous().childElements().first().innerHTML), true);
+      this.set_adapter(new_adapter);
     }
     this.disable();
   }
@@ -972,10 +1010,7 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
 ActiveScaffold.Actions.Table = Class.create(ActiveScaffold.Actions.Abstract, {
   instantiate_link: function(link) {
     var l = new ActiveScaffold.ActionLink.Table(link, this.target, this.loading_indicator);
-    if (l.position) {
-      l.url = l.url.append_params({adapter: '_list_inline_adapter'});
-      l.tag.href = l.url;
-    }
+    
     return l;
   }
 });
@@ -983,13 +1018,14 @@ ActiveScaffold.Actions.Table = Class.create(ActiveScaffold.Actions.Abstract, {
 ActiveScaffold.ActionLink.Table = Class.create(ActiveScaffold.ActionLink.Abstract, {
   insert: function(content) {
     if (this.position == 'top') {
-      this.target.insert({top:content});
+      this.target.insert({top:this.wrap_with_adapter_html(content)});
       ActiveScaffold.trigger_load_events(this.target.immediateDescendants().first().select('[data-as_load]'));
       this.set_adapter(this.target.immediateDescendants().first());
     }
     else {
       throw 'Unknown position "' + this.position + '"'
     }
+    this.update_flash_messages();
     this.adapter.down('td').down().highlight();
   }
 });

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

@@ -9,5 +9,5 @@ action_links ||= active_scaffold_config.action_links.member
 <tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= url_for(params_for(:action => :row, :id => record.id, :_method => :get, :escape => false)).html_safe %>" data-as_load="tr">
   <%= render :partial => 'list_record_columns', :locals => {:record => record, :columns => columns} %>
   <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => url_options, :action_links => action_links} unless action_links.empty? %>
-  <%= render_nested_view(action_links, url_options, record) unless @nested_auto_open.nil? %>
-</tr>
+</tr>
+<%= render_nested_view(action_links, url_options, record) unless @nested_auto_open.nil? %>

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

@@ -1,4 +1,4 @@
-<div id="<%= active_scaffold_id -%>" class="<%= as_main_div_class %>" <%= "data-eid=#{id_from_controller(params[:eid])}" if params[:eid]%>>
+<div id="<%= active_scaffold_id -%>" class="<%= as_main_div_class %>" <%= "data-eid=#{id_from_controller(params[:eid])}" if params[:eid]%> data-closelabel="<%=as_(:close).html_safe%>" data-controller=<%="#{params[:controller]}"%>>
   <div class="active-scaffold-header">
     <%= render :partial => 'list_header' %>
   </div>

data/lib/active_scaffold.rb

@@ -104,14 +104,16 @@ module ActiveScaffold
   end
 
   def check_input_device
-    if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(iPhone|iPod|iPad)/i]
-      session[:input_device_type] = 'TOUCH'
-      session[:hover_supported] = false
-    else
-      session[:input_device_type] = 'MOUSE'
-      session[:hover_supported] = true
-    end if session[:input_device_type].nil?
-   end
+    if self.class.uses_active_scaffold?
+      if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"][/(iPhone|iPod|iPad)/i]
+        session[:input_device_type] = 'TOUCH'
+        session[:hover_supported] = false
+      else
+        session[:input_device_type] = 'MOUSE'
+        session[:hover_supported] = true
+      end if session[:input_device_type].nil?
+    end
+  end
 
   def touch_device?
     session[:input_device_type] == 'TOUCH'

data/lib/active_scaffold/actions/list.rb

@@ -32,9 +32,7 @@ module ActiveScaffold::Actions
       end
     end
     def list_respond_to_js
-      if params[:adapter]
-        render(:partial => 'list_with_header')
-      elsif params[:embedded]
+      if params[:embedded]
         params.delete(:embedded)
         render(:partial => 'list_with_header')
       else

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

@@ -34,7 +34,7 @@ module ActiveScaffold
         '%a' => 'D',
         '%A' => 'DD',
         '%b' => 'M',
-        '$B' => 'MM',
+        '%B' => 'MM',
         '%d' => 'dd',
         '%e' => 'd',
         '%j' => 'oo',

data/lib/active_scaffold/bridges/date_picker/public/javascripts/date_picker_bridge.js

@@ -1,22 +1,36 @@
 $(document).ready(function() {
-  $('input.date_picker').live('focus', function(event) {
-    var date_picker = $(this);
-    if (typeof(date_picker.datepicker) == 'function') {
-      if (!date_picker.hasClass('hasDatepicker')) {
+  $('form.as_form, form.inplace_form').live('as:form_loaded', function(event) {
+    var as_form = $(this).closest("form");
+    as_form.find('input.datetime_picker').each(function(index) {
+      var date_picker = $(this);
+      if (typeof(date_picker.datetimepicker) == 'function') {
+        date_picker.datetimepicker();
+      }
+    });
+
+    as_form.find('input.date_picker').each(function(index) {
+      var date_picker = $(this);
+      if (typeof(date_picker.datepicker) == 'function') {
         date_picker.datepicker();
-        date_picker.trigger('focus');
       }
-    }
+    });
     return true;
   });
-  $('input.datetime_picker').live('focus', function(event) {
-    var date_picker = $(this);
-    if (typeof(date_picker.datetimepicker) == 'function') {
-      if (!date_picker.hasClass('hasDatepicker')) {
-        date_picker.datetimepicker();
-        date_picker.trigger('focus');
+  $('form.as_form, form.inplace_form').live('as:form_unloaded', function(event) {
+    var as_form = $(this).closest("form");
+    as_form.find('input.datetime_picker').each(function(index) {
+      var date_picker = $(this);
+      if (typeof(date_picker.datetimepicker) == 'function') {
+        date_picker.datetimepicker('destroy');
+      }
+    });
+
+    as_form.find('input.date_picker').each(function(index) {
+      var date_picker = $(this);
+      if (typeof(date_picker.datepicker) == 'function') {
+        date_picker.datepicker('destroy');
       }
-    }
+    });
     return true;
   });
 });

data/lib/active_scaffold/bridges/tiny_mce/public/javascripts/jquery/tiny_mce_bridge.js

@@ -1,11 +1,11 @@
-$('form.as_form').live('as:form_loaded', function(event) {
+$('form.as_form, form.inplace_form').live('as:form_loaded', function(event) {
     var as_form = $(this).closest("form");
     as_form.find('textarea.as_mceEditor').each(function(index, elem) {
       tinyMCE.execCommand('mceAddControl', false, $(elem).attr('id'));
     });
     return true;
   });
-$('form.as_form').live('as:form_submit', function(event) {
+$('form.as_form, form.inplace_form').live('as:form_submit', function(event) {
     var as_form = $(this).closest("form");
     if (as_form.has('textarea.as_mceEditor').length > 0) {
       tinyMCE.triggerSave();
@@ -13,7 +13,7 @@ $('form.as_form').live('as:form_submit', function(event) {
     return true;
   });
 
-$('form.as_form').live('as:form_unloaded', function(event) {
+$('form.as_form, form.inplace_form').live('as:form_unloaded', function(event) {
     var as_form = $(this).closest("form");
     as_form.find('textarea.as_mceEditor').each(function(index, elem) {
       tinyMCE.execCommand('mceRemoveControl', false, $(elem).attr('id'));

data/lib/active_scaffold/config/delete.rb

@@ -16,7 +16,7 @@ module ActiveScaffold::Config
 
     # the ActionLink for this action
     cattr_accessor :link
-    @@link = ActiveScaffold::DataStructures::ActionLink.new('destroy', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :method => :delete, :crud_type => :delete, :position => false, :parameters => {:destroy_action => true}, :security_method => :delete_authorized?)
+    @@link = ActiveScaffold::DataStructures::ActionLink.new('destroy', :label => :delete, :type => :member, :confirm => :are_you_sure_to_delete, :method => :delete, :crud_type => :delete, :position => false, :parameters => {:destroy_action => true}, :security_method => :delete_authorized?, :ignore_method => :delete_ignore?)
 
     # whether we should refresh list after destroy or not
     cattr_accessor :refresh_list

data/lib/active_scaffold/config/list.rb

@@ -128,6 +128,11 @@ module ActiveScaffold::Config
     attr_accessor :nested_auto_open
     
     class UserSettings < UserSettings
+      def initialize(conf, storage, params)
+        super(conf,storage,params)
+        @sorting = nil
+      end
+
       # This label has alread been localized.
       def label
         @session[:label] ? @session[:label] : @conf.label
@@ -159,17 +164,20 @@ module ActiveScaffold::Config
       end
 
       def sorting
-        # we want to store as little as possible in the session, but we want to return a Sorting data structure. so we recreate it each page load based on session data.
-        @session['sort'] = [@params['sort'], @params['sort_direction']] if @params['sort'] and @params['sort_direction']
-        @session['sort'] = nil if @params['sort_direction'] == 'reset'
-
-        if @session['sort']
-          sorting = @conf.sorting.clone
-          sorting.set(*@session['sort'])
-          return sorting
-        else
-          return default_sorting
+        if @sorting.nil?
+          # we want to store as little as possible in the session, but we want to return a Sorting data structure. so we recreate it each page load based on session data.
+          @session['sort'] = [@params['sort'], @params['sort_direction']] if @params['sort'] and @params['sort_direction']
+          @session['sort'] = nil if @params['sort_direction'] == 'reset'
+
+          if @session['sort']
+            sorting = @conf.sorting.clone
+            sorting.set(*@session['sort'])
+            @sorting = sorting
+          else
+            @sorting = default_sorting
+          end
         end
+        @sorting
       end
       
       def count_includes

data/lib/active_scaffold/data_structures/action_links.rb

@@ -173,7 +173,7 @@ module ActiveScaffold::DataStructures
     protected
 
     def skip_action_link(controller, link, *args)
-      (!link.ignore_method.nil? and controller.try(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
+      (!link.ignore_method.nil? && controller.respond_to?(link.ignore_method) && controller.send(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
     end
 
     # called during clone or dup. makes the clone/dup deeper.

data/lib/active_scaffold/data_structures/column.rb

@@ -311,7 +311,7 @@ module ActiveScaffold::DataStructures
         self.sort = false
       else
         if self.singular_association?
-          self.sort = {:method => "#{self.name}.to_s"}
+          self.sort = {:method => "#{self.name}.to_label"}
         elsif self.plural_association?
           self.sort = {:method => "#{self.name}.join(',')"}
         else

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -42,7 +42,6 @@ module ActiveScaffold
             return text if link.crud_type.nil?
             url_options[:link] = as_(:create_new) if link.crud_type == :create
           end
-
           if column_link_authorized?(link, column, record, associated)
             render_action_link(link, url_options, record)
           else
@@ -352,14 +351,15 @@ module ActiveScaffold
       
       def render_nested_view(action_links, url_options, record)
         rendered = []
+        link_id = nil
         action_links.member.each do |link|
           if link.nested_link? && link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && controller.respond_to?(:render_component_into_view)
-            link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true})) 
+            link_url_options = {:embedded => true, :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true}))
             link_id = get_action_link_id(link_url_options, record, link.column)
-            rendered << (controller.send(:render_component_into_view, link_url_options) + javascript_tag("ActiveScaffold.ActionLink.get('#{link_id}').set_opened();"))
+            rendered << (controller.send(:render_component_into_view, link_url_options))
           end 
         end
-        rendered.join(' ').html_safe
+        content_tag(:tr, content_tag(:td, rendered.join(' ').html_safe), :class => "inline-adapter-autoopen", 'data-actionlinkid' => link_id, 'data-as_load'=>"tr");
       end  
       
     end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -127,7 +127,7 @@ module ActiveScaffold
       end
 
       def skip_action_link(link, *args)
-        (!link.ignore_method.nil? and controller.try(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
+        (!link.ignore_method.nil? && controller.respond_to?(link.ignore_method) && controller.send(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
       end
 
       def render_action_link(link, url_options, record = nil, html_options = {})
@@ -168,6 +168,7 @@ module ActiveScaffold
 
         html_options['data-confirm'] = link.confirm(record.try(:to_label)) if link.confirm?
         html_options['data-position'] = link.position if link.position and link.inline?
+        html_options['data-controller'] = link.controller.to_s if link.controller
         html_options[:class] += ' as_action' if link.inline?
         html_options['data-action'] = link.action if link.inline?
         if link.popup?

data/lib/active_scaffold/locale/de.rb

@@ -63,7 +63,7 @@
       :between => 'Zwischen',
       :contains => 'Enthält',
       :begins_with => 'Beginnt',
-      :ends_with => 'Ended',
+      :ends_with => 'Endet',
       :today => 'Heute',
       :yesterday => 'Gestern',
       :tomorrow => 'Morgen',

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold_env.rb

@@ -7,8 +7,8 @@ ActionController::Base.send(:include, ActiveScaffold::Helpers::ControllerHelpers
 ActionView::Base.send(:include, ActiveScaffold::Helpers::ViewHelpers)
 
 ActionController::Base.class_eval {include ActiveRecordPermissions::ModelUserAccess::Controller}
-ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::ModelUserAccess::Model}
-ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::Permissions}
+ActiveRecord::Base.class_eval {include ActiveRecordPermissions::ModelUserAccess::Model}
+ActiveRecord::Base.class_eval {include ActiveRecordPermissions::Permissions}
 
 I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'active_scaffold', 'locale', '*.{rb,yml}')]
 #ActiveScaffold.js_framework = :jquery

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 3
   - 0
-  - 24
-  version: 3.0.24
+  - 25
+  version: 3.0.25
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-01 00:00:00 +01:00
+date: 2012-02-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -178,7 +178,6 @@ files:
 - frontends/default/views/_list_calculations.html.erb
 - frontends/default/views/_list_column_headings.html.erb
 - frontends/default/views/_list_header.html.erb
-- frontends/default/views/_list_inline_adapter.html.erb
 - frontends/default/views/_list_messages.html.erb
 - frontends/default/views/_list_pagination.html.erb
 - frontends/default/views/_list_pagination_links.html.erb
@@ -296,7 +295,6 @@ files:
 - lib/active_scaffold/data_structures/nested_info.rb
 - lib/active_scaffold/data_structures/set.rb
 - lib/active_scaffold/data_structures/sorting.rb
-- lib/active_scaffold/extensions/action_controller_rendering.rb
 - lib/active_scaffold/extensions/action_view_rendering.rb
 - lib/active_scaffold/extensions/action_view_resolver.rb
 - lib/active_scaffold/extensions/active_association_reflection.rb

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

@@ -1,10 +0,0 @@
-<%# nested_id, allows us to remove a nested scaffold programmatically %>
-<tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
-  <td colspan="99" class="inline-adapter-cell">
-    <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{params[:associations] ? params[:associations] : params[:controller]}-view" %> view">
-      <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close), 'data-refresh' => (action_name == 'index' ? true : false)) -%>
-      <%= payload -%>
-    </div>
-  </td>
-</tr>
-<%= javascript_tag("var action_link = ActiveScaffold.ActionLink.get('#{element_row_id(:action => :nested)}'); if (action_link) action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');") %>

data/lib/active_scaffold/extensions/action_controller_rendering.rb

@@ -1,22 +0,0 @@
-# wrap the action rendering for ActiveScaffold controllers
-module ActionController #:nodoc:
-  class Base
-    def render_with_active_scaffold(*args, &block)
-      if self.class.uses_active_scaffold? and params[:adapter] and @rendering_adapter.nil?
-        @rendering_adapter = true # recursion control
-        # if we need an adapter, then we render the actual stuff to a string and insert it into the adapter template
-        opts = args.blank? ? Hash.new : args.first
-        render :partial => params[:adapter][1..-1],
-        :locals => {:payload => render_to_string(opts.merge(:layout => false), &block)},
-               :use_full_path => true, :layout => false
-        @rendering_adapter = nil # recursion control
-      else
-        render_without_active_scaffold(*args, &block)
-      end
-    end
-    alias_method_chain :render, :active_scaffold
-
-    # Rails 2.x implementation is post-initialization on :active_scaffold method
-  end
-end
-