active_scaffold_vho 3.0.9 → 3.0.10

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.9"
+  s.version = "3.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Many, see README"]
-  s.date = %q{2011-01-27}
+  s.date = %q{2011-02-01}
   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 = [
@@ -102,7 +102,6 @@ Gem::Specification.new do |s|
     "frontends/default/views/update_column.js.rjs",
     "frontends/default/views/update_row.js.rjs",
     "init.rb",
-    "lib/active_record_permissions.rb",
     "lib/active_scaffold.rb",
     "lib/active_scaffold/actions/common_search.rb",
     "lib/active_scaffold/actions/core.rb",
@@ -116,6 +115,7 @@ Gem::Specification.new do |s|
     "lib/active_scaffold/actions/show.rb",
     "lib/active_scaffold/actions/subform.rb",
     "lib/active_scaffold/actions/update.rb",
+    "lib/active_scaffold/active_record_permissions.rb",
     "lib/active_scaffold/attribute_params.rb",
     "lib/active_scaffold/bridges/ancestry/bridge.rb",
     "lib/active_scaffold/bridges/ancestry/lib/ancestry_bridge.rb",
@@ -195,11 +195,12 @@ Gem::Specification.new do |s|
     "lib/active_scaffold/locale/ja.yml",
     "lib/active_scaffold/locale/ru.yml",
     "lib/active_scaffold/marked_model.rb",
+    "lib/active_scaffold/paginator.rb",
+    "lib/active_scaffold/responds_to_parent.rb",
     "lib/active_scaffold/version.rb",
     "lib/active_scaffold_assets.rb",
+    "lib/active_scaffold_env.rb",
     "lib/active_scaffold_vho.rb",
-    "lib/dhtml_confirm.rb",
-    "lib/environment.rb",
     "lib/extensions/action_controller_rendering.rb",
     "lib/extensions/action_view_rendering.rb",
     "lib/extensions/action_view_resolver.rb",
@@ -223,8 +224,6 @@ Gem::Specification.new do |s|
     "lib/generators/active_scaffold_controller/templates/controller.rb",
     "lib/generators/active_scaffold_setup/USAGE",
     "lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb",
-    "lib/paginator.rb",
-    "lib/responds_to_parent.rb",
     "public/blank.html",
     "shoulda_macros/macros.rb",
     "test/bridges/bridge_test.rb",

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

@@ -632,6 +632,7 @@ var ActiveScaffold = {
     toggler.children('a').click(function() {
       toggable.toggle(); 
       $(this).html((toggable.is(':hidden')) ? options.show_label : options.hide_label);
+      return false;
     });
   },
   

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

@@ -445,6 +445,7 @@ var ActiveScaffold = {
       }
     }
     row.remove();
+    tbody = $(tbody);
     this.stripe(tbody);
     this.decrement_record_count(tbody.up('div.active-scaffold'));
     this.reload_if_empty(tbody, page_reload_url);
@@ -512,6 +513,7 @@ var ActiveScaffold = {
       var element = event.element();
       toggable.toggle(); 
       element.innerHTML = (toggable.style.display == 'none') ? options.show_label : options.hide_label;
+      return false;
     });
   },
   

data/frontends/default/stylesheets/stylesheet.css

@@ -312,6 +312,11 @@ line-height: 16px;
 white-space: nowrap;
 }
 
+.active-scaffold tr.record td.actions a.disabled {
+color: #666;
+opacity: 0.5;
+}
+
 .active-scaffold .actions .action_group div:hover {
 background-color: #ff8;
 }
@@ -438,7 +443,6 @@ right: 0px;
 .active-scaffold .active-scaffold .active-scaffold-header div.actions a,
 .active-scaffold .active-scaffold .active-scaffold-header div.actions div {
 font: bold 11px verdana, sans-serif;
-padding: 0 2px 1px 17px;
 }
 
 .blue-theme .active-scaffold .active-scaffold-header div.actions a,

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

@@ -1,5 +1,17 @@
+messages_id = active_scaffold_messages_id
 if controller.send(:successful?)
-  if (active_scaffold_config.delete.refresh_list)
+  if render_parent? && controller.respond_to?(:render_component_into_view)
+    render_parent_options
+    if render_parent_action == :row
+      # TODO: That s not working with delete....
+      page << "ActiveScaffold.delete_record_row('#{element_row_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}", :action => 'list', :id => params[:id])}','#{url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max, :escape => false))}');"
+      messages_id = active_scaffold_messages_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}")
+    elsif render_parent_action == :index
+      parent_rendered = controller.send(:render_component_into_view, render_parent_options)
+      page << parent_rendered
+    end
+    #page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}
+  elsif (active_scaffold_config.delete.refresh_list)
     page.call 'ActiveScaffold.replace_html', active_scaffold_content_id, render(:partial => 'list', :layout => false)
   else
     page << "ActiveScaffold.delete_record_row('#{element_row_id(:action => 'list', :id => params[:id])}','#{url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max, :escape => false))}');"
@@ -8,4 +20,4 @@ if controller.send(:successful?)
 else
   flash[:error] = active_scaffold_error_messages_for(@record, :object_name => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :header_message => '', :message => "#{@record.class.model_name.human.downcase}#{@record.new_record? ? '' : ": #{@record.to_label}"}", :container_tag => nil, :list_type => :br)
 end
-page.call 'ActiveScaffold.replace_html', active_scaffold_messages_id, render(:partial => 'messages')
+page.call 'ActiveScaffold.replace_html', messages_id, render(:partial => 'messages')

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

@@ -3,9 +3,9 @@ insert_at ||= :top
 page << "var action_link = ActiveScaffold.find_action_link('#{form_selector}');"
 page << "action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');"
 if controller.send :successful?
-  if render_parent? && respond_to?(:render_component)
-    parent_rendered = render_component(render_parent_options)
-    if nested?
+  if render_parent? && controller.respond_to?(:render_component_into_view)
+    parent_rendered = controller.send(:render_component_into_view, render_parent_options)
+    if nested_singular_association?
       page << "action_link.close('#{escape_javascript(parent_rendered)}');"
     else
       if render_parent_action == :row

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

@@ -5,7 +5,7 @@ page << "action_link.update_flash_messages('#{escape_javascript(render(:partial
 if controller.send :successful?
   if render_parent? && controller.respond_to?(:render_component_into_view)
     parent_rendered = controller.send(:render_component_into_view, render_parent_options)
-    if nested?
+    if nested_singular_association?
       page << "action_link.close('#{escape_javascript(parent_rendered)}');"
     else
       if render_parent_action == :row

data/init.rb

@@ -1,5 +1,3 @@
-ACTIVE_SCAFFOLD_INSTALLED = :plugin
-
 require 'active_scaffold'
 
 begin

data/lib/active_scaffold/actions/create.rb

@@ -61,7 +61,7 @@ module ActiveScaffold::Actions
     end
 
     def create_respond_to_js
-      if active_scaffold_config.create.refresh_list && successful?
+      if successful? && active_scaffold_config.create.refresh_list && !render_parent?
         do_search if respond_to? :do_search
         do_list
       end

data/lib/active_scaffold/actions/delete.rb

@@ -23,7 +23,7 @@ module ActiveScaffold::Actions
     end
 
     def destroy_respond_to_js
-      if active_scaffold_config.delete.refresh_list && successful?
+      if successful? && active_scaffold_config.delete.refresh_list && !render_parent?
         do_search if respond_to? :do_search
         do_list
       end

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

@@ -49,14 +49,18 @@ module ActiveScaffold
       end
   
       module ViewHelpers
+        def self.included(base)
+          base.alias_method_chain :active_scaffold_stylesheets, :calendar_date_select
+          base.alias_method_chain :active_scaffold_javascripts, :calendar_date_select
+        end
         # Provides stylesheets to include with +stylesheet_link_tag+
-        def active_scaffold_stylesheets(frontend = :default)
-          super + [calendar_date_select_stylesheets]
+        def active_scaffold_stylesheets_with_calendar_date_select(frontend = :default)
+          active_scaffold_stylesheets_without_calendar_date_select + [calendar_date_select_stylesheets]
         end
   
         # Provides stylesheets to include with +stylesheet_link_tag+
-        def active_scaffold_javascripts(frontend = :default)
-          super + [calendar_date_select_javascripts]
+        def active_scaffold_javascripts_with_calendar_date_select(frontend = :default)
+          active_scaffold_javascripts_without_calendar_date_select + [calendar_date_select_javascripts]
         end
       end
     end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -71,11 +71,21 @@ module ActiveScaffold::DataStructures
     def delete(val)
       self.each({:include_set => true}) do |link, set|
         if link.action == val.to_s
-          set.delete_if {|item|item.action == val.to_s}
+          set.delete_if {|item| item.is_a?(ActiveScaffold::DataStructures::ActionLink) && item.action == val.to_s}
         end
       end
     end
 
+    def delete_group(name)
+      @set.each do |group|
+        if group.name == name
+          @set.delete_if {|item| item.is_a?(ActiveScaffold::DataStructures::ActionLinks) && item.name == name}
+        else
+          group.delete_group(name)
+        end if group.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+      end
+    end
+
     # iterates over the links, possibly by type
     def each(options = {}, &block)
       @set.each {|item|

data/lib/active_scaffold/data_structures/column.rb

@@ -270,6 +270,7 @@ module ActiveScaffold::DataStructures
       @actions_for_association_links = self.class.actions_for_association_links.clone if @association
       @options = {:format => :i18n_number} if @column.try(:number?)
       @form_ui = :checkbox if @column and @column.type == :boolean
+      @form_ui = :textarea if @column and @column.type == :text
       @allow_add_existing = true
       @form_ui = self.class.association_form_ui if @association && self.class.association_form_ui
       

data/lib/active_scaffold/finder.rb

@@ -292,6 +292,7 @@ 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
         query.send((k.to_sym), v) 
       end
     end

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Helpers
     module ControllerHelpers
       def self.included(controller)
-        controller.class_eval { helper_method :params_for, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action}
+        controller.class_eval { helper_method :params_for, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?}
       end
       
       include ActiveScaffold::Helpers::IdHelpers
@@ -50,17 +50,21 @@ module ActiveScaffold
         end
       end
 
+      def nested_singular_association?
+        nested? && (nested.belongs_to? || nested.has_one?)
+      end
+
       def render_parent?
-        (nested? && (nested.belongs_to? || nested.has_one?) || params[:parent_sti])
+        nested_singular_association? || params[:parent_sti]
       end
 
       def render_parent_options
-        if nested? && (nested.belongs_to? || nested.has_one?)
+        if nested_singular_association?
           {:controller => nested.parent_scaffold.controller_path, :action => :row, :id => nested.parent_id}
         elsif params[:parent_sti]
           options = {:controller => params[:parent_sti], :action => render_parent_action(params[:parent_sti])}
           if render_parent_action(params[:parent_sti]) == :index
-            options
+            options.merge(params.slice(:eid))
           else
             options.merge({:id => @record.id})
           end
@@ -73,6 +77,7 @@ module ActiveScaffold
           parent_controller = "#{controller_path.to_s.camelize}Controller".constantize
           @parent_action = :index if action_name == 'create' && parent_controller.active_scaffold_config.actions.include?(:create) && parent_controller.active_scaffold_config.create.refresh_list == true
           @parent_action = :index if action_name == 'update' && parent_controller.active_scaffold_config.actions.include?(:update) && parent_controller.active_scaffold_config.update.refresh_list == true
+          @parent_action = :index if action_name == 'destroy' && parent_controller.active_scaffold_config.actions.include?(:delete) && parent_controller.active_scaffold_config.delete.refresh_list == true
         rescue ActiveScaffold::ControllerNotFound
         end if @parent_action.nil?
         @parent_action

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -6,8 +6,8 @@ module ActiveScaffold
         controller.to_s.gsub("/", "__")
       end
 
-      def controller_id
-        controller_id ||= 'as_' + id_from_controller(params[:eid] || params[:parent_controller] || params[:controller])
+      def controller_id(controller = (params[:eid] || params[:parent_controller] || params[:controller]))
+        controller_id ||= 'as_' + id_from_controller(controller)
       end
 
       def active_scaffold_id
@@ -22,8 +22,8 @@ module ActiveScaffold
         "#{controller_id}-tbody"
       end
 
-      def active_scaffold_messages_id
-        "#{controller_id}-messages"
+      def active_scaffold_messages_id(options = {})
+        "#{options[:controller_id] || controller_id}-messages"
       end
 
       def active_scaffold_calculations_id(column = nil)
@@ -59,7 +59,7 @@ module ActiveScaffold
         options[:action] ||= params[:action]
         options[:id] ||= params[:id]
         options[:id] ||= params[:parent_id]
-        clean_id "#{controller_id}-#{options[:action]}-#{options[:id]}-row"
+        clean_id "#{options[:controller_id] || controller_id}-#{options[:action]}-#{options[:id]}-row"
       end
 
       def element_cell_id(options = {})

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -12,10 +12,9 @@ rescue LoadError
 end
 
 require 'active_scaffold_assets'
-require 'active_record_permissions'
-require 'dhtml_confirm'
-require 'paginator'
-require 'responds_to_parent'
+require 'active_scaffold/active_record_permissions'
+require 'active_scaffold/paginator'
+require 'active_scaffold/responds_to_parent'
 
 require 'active_scaffold/version'
 
@@ -330,17 +329,18 @@ module ActiveScaffold
   end
 end
 
-require 'environment'
+require 'active_scaffold_env'
 
 ##
 ## Run the install assets script, too, just to make sure
 ## But at least rescue the action in production
 ##
+
 Rails::Application.initializer("active_scaffold.install_assets") do
   begin
     ActiveScaffoldAssets.copy_to_public(ActiveScaffold.root, {:clean_up_destination => true})
   rescue
     raise $! unless Rails.env == 'production'
   end
-end unless defined?(ACTIVE_SCAFFOLD_INSTALLED) && ACTIVE_SCAFFOLD_INSTALLED == :plugin
+end if defined?(ACTIVE_SCAFFOLD_GEM)
 

data/lib/active_scaffold_vho.rb

@@ -1,2 +1,2 @@
-ACTIVE_SCAFFOLD_INSTALLED = :gem
+ACTIVE_SCAFFOLD_GEM = true
 require 'active_scaffold'

data/lib/extensions/paginator_extensions.rb

@@ -1,4 +1,4 @@
-require 'paginator'
+require 'active_scaffold/paginator'
 
 class Paginator
 

data/lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb

@@ -8,7 +8,7 @@ module Rails
       end
 
       def install_plugins
-        unless defined?(ACTIVE_SCAFFOLD_INSTALLED) && ACTIVE_SCAFFOLD_INSTALLED == :gem
+        unless defined?(ACTIVE_SCAFFOLD_GEM)
           plugin 'verification', :git => 'git://github.com/rails/verification.git'
           plugin 'render_component', :git => 'git://github.com/vhochstein/render_component.git'
         end
@@ -21,9 +21,9 @@ module Rails
       end
       
       def configure_active_scaffold
-        unless defined?(ACTIVE_SCAFFOLD_INSTALLED) && ACTIVE_SCAFFOLD_INSTALLED == :gem
+        unless defined?(ACTIVE_SCAFFOLD_GEM)
           if js_lib == 'jquery'
-            gsub_file 'vendor/plugins/active_scaffold/lib/environment.rb', /#ActiveScaffold.js_framework = :jquery/, 'ActiveScaffold.js_framework = :jquery'
+            gsub_file 'vendor/plugins/active_scaffold/lib/active_scaffold_env.rb', /#ActiveScaffold.js_framework = :jquery/, 'ActiveScaffold.js_framework = :jquery'
           end
         else
           if js_lib == 'jquery'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 3
   - 0
-  - 9
-  version: 3.0.9
+  - 10
+  version: 3.0.10
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 +01:00
+date: 2011-02-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -217,7 +217,6 @@ files:
 - frontends/default/views/update_column.js.rjs
 - frontends/default/views/update_row.js.rjs
 - init.rb
-- lib/active_record_permissions.rb
 - lib/active_scaffold.rb
 - lib/active_scaffold/actions/common_search.rb
 - lib/active_scaffold/actions/core.rb
@@ -231,6 +230,7 @@ files:
 - lib/active_scaffold/actions/show.rb
 - lib/active_scaffold/actions/subform.rb
 - lib/active_scaffold/actions/update.rb
+- lib/active_scaffold/active_record_permissions.rb
 - lib/active_scaffold/attribute_params.rb
 - lib/active_scaffold/bridges/ancestry/bridge.rb
 - lib/active_scaffold/bridges/ancestry/lib/ancestry_bridge.rb
@@ -310,11 +310,12 @@ files:
 - lib/active_scaffold/locale/ja.yml
 - lib/active_scaffold/locale/ru.yml
 - lib/active_scaffold/marked_model.rb
+- lib/active_scaffold/paginator.rb
+- lib/active_scaffold/responds_to_parent.rb
 - lib/active_scaffold/version.rb
 - lib/active_scaffold_assets.rb
+- lib/active_scaffold_env.rb
 - lib/active_scaffold_vho.rb
-- lib/dhtml_confirm.rb
-- lib/environment.rb
 - lib/extensions/action_controller_rendering.rb
 - lib/extensions/action_view_rendering.rb
 - lib/extensions/action_view_resolver.rb
@@ -338,8 +339,6 @@ files:
 - lib/generators/active_scaffold_controller/templates/controller.rb
 - lib/generators/active_scaffold_setup/USAGE
 - lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb
-- lib/paginator.rb
-- lib/responds_to_parent.rb
 - public/blank.html
 - shoulda_macros/macros.rb
 - test/bridges/bridge_test.rb

data/lib/dhtml_confirm.rb

@@ -1,54 +0,0 @@
-# Matt Mower <matt@cominded.com>
-# 
-# A base class for creating DHTML confirmation types.
-#
-# The real work is done by the onclick_function and onclick_handler methods. In
-# general it should only be required to override the default onclick_handler
-# method and provide the specific Javascript required to invoke the DHTML confirm
-# dialog of your choice.
-#
-# It is up to this dialog, if the user confirms the intended action, to invoke
-# the function window.gFireModalLink() to trigger the intended action of the link.
-# For example, using the Modalbox library, you would use something like:
-#
-#     Modalbox.hide( {
-#               afterHide: function() {
-#                 window.gFireModalLink();
-#               } } );
-#
-# By default the only action recognized is :value which is used to add a
-# dhtml_confirm attribute to the link <a> tag. This value is detected by the
-# ActiveScaffold link and triggers the DHTML confirmation logic.
-#
-class DHTMLConfirm
-  attr_accessor :value, :message, :options
-  
-  def initialize( options = {} )
-    @options = options
-    @value = @options.delete(:value) { |key| "yes" }
-    @message = @options.delete(:message) { |key| "Are you sure?" }
-  end
-  
-  def onclick_function( controller, link_id )
-    script = <<-END
-window.gFireModalLink = function() {
-  var link = $('#{link_id}').action_link;
-  link.open_action.call( link );
-};
-#{ensure_termination(onclick_handler(controller,link_id))}
-return false;
-END
-    # script = "window.gModalLink = $('#{link_id}').action_link;#{onclick_handler(controller,link_id)}return false;"
-  end
-  
-  def onclick_handler( controller, link_id )
-    ""
-  end
-  
-protected
-  def ensure_termination( expression )
-    expression =~ /;$/ ? expression : "#{expression};"
-  end
-  
-end
-