active_scaffold 3.1.10 → 3.1.11

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

@@ -72,7 +72,8 @@ $(document).ready(function() {
     
     if (action_link) {
       var cancel_url = as_cancel.attr('href');
-      if (typeof(cancel_url) == 'undefined' || cancel_url.length == 0) {
+      var refresh_data = as_cancel.attr('data-refresh');
+      if (refresh_data !== 'true' || !cancel_url) {
         action_link.close();
         return false;
       }

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

@@ -0,0 +1,7 @@
+var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;       
+ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
+  $(this.adapter).find('textarea.mceEditor').each(function(index, elem) {         
+    tinyMCE.execCommand('mceRemoveControl', false, $(elem).attr('id'));
+  });
+  action_link_close.apply(this);  
+};

data/app/assets/javascripts/prototype/tiny_mce_bridge.js

@@ -0,0 +1,7 @@
+var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
+ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
+  this.adapter.select('textarea.mceEditor').each(function(elem) {
+    tinyMCE.execCommand('mceRemoveControl', false, elem.id);
+  }); 
+  action_link_close.apply(this);
+};

data/config/locales/de.yml

@@ -1,7 +1,7 @@
 de:
   time:
     formats:
-      picker: "%a, %d %b %Y %H:%M:%S"
+      picker: "%d.%m.%Y %H:%M"
   active_scaffold:
     add: 'Hinzufügen'
     add_existing: 'Existierenden Eintrag hinzufügen'
@@ -65,7 +65,7 @@ de:
     between: 'Zwischen'
     contains: 'Enthält'
     begins_with: 'Beginnt'
-    ends_with: 'Ended'
+    ends_with: 'Endet'
     today: 'Heute'
     yesterday: 'Gestern'
     tomorrow: 'Morgen'

data/lib/active_scaffold/actions/list.rb

@@ -36,7 +36,7 @@ module ActiveScaffold::Actions
         params.delete(:embedded)
         render(:partial => 'list_with_header')
       else
-        render :action => 'list.js'
+        render :action => 'refresh_list.js'
       end
     end
     def list_respond_to_xml

data/lib/active_scaffold/actions/list.rb~

@@ -17,8 +17,6 @@ module ActiveScaffold::Actions
 
     def list
       do_list
-      do_new if active_scaffold_config.list.always_show_create
-      @record ||= new_model if active_scaffold_config.list.always_show_search
       @nested_auto_open = active_scaffold_config.list.nested_auto_open
       respond_to_action(:list)
     end

data/lib/active_scaffold/attribute_params.rb

@@ -85,6 +85,7 @@ module ActiveScaffold
       record = find_or_create_for_params(attributes, column, parent_record)
       if record
         record_columns = active_scaffold_config_for(column.association.klass).subform.columns
+        record_columns.constraint_columns = [column.association.reverse]
         update_record_from_params(record, record_columns, attributes)
         record.unsaved = true
       end

data/lib/active_scaffold/attribute_params.rb~

@@ -85,6 +85,8 @@ module ActiveScaffold
       record = find_or_create_for_params(attributes, column, parent_record)
       if record
         record_columns = active_scaffold_config_for(column.association.klass).subform.columns
+        record_columns.constraint_columns = [column.association.reverse]
+        debugger
         update_record_from_params(record, record_columns, attributes)
         record.unsaved = true
       end
@@ -101,7 +103,6 @@ module ActiveScaffold
     end
 
     def column_value_from_param_simple_value(parent_record, column, value)
-      debugger if column.name == :working_days
       if column.singular_association?
         # it's a single id
         column.association.klass.find(value) if value and not value.empty?

data/lib/active_scaffold/bridges/tiny_mce.rb

@@ -2,4 +2,16 @@ class ActiveScaffold::Bridges::TinyMce < ActiveScaffold::DataStructures::Bridge
   def self.install
     require File.join(File.dirname(__FILE__), "tiny_mce/helpers.rb")
   end
+
+  def self.install?
+    Object.const_defined? "TinyMCE"
+  end
+ 
+  def self.javascripts
+    if ActiveScaffold.js_framework == :jquery
+      ['tinymce-jquery', 'jquery/tiny_mce_bridge']
+    else
+      ['tinymce', 'prototype/tiny_mce_bridge']
+    end
+  end
 end

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -4,34 +4,6 @@ class ActiveScaffold::Bridges::TinyMce
       base.class_eval do
         include FormColumnHelpers
         include SearchColumnHelpers
-        include ViewHelpers
-      end
-    end
-
-    module ViewHelpers
-      def active_scaffold_includes(*args)
-        if ActiveScaffold.js_framework == :jquery
-          tiny_mce_js = javascript_tag(%|
-var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
-ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
-  $(this.adapter).find('textarea.mceEditor').each(function(index, elem) {
-    tinyMCE.execCommand('mceRemoveControl', false, $(elem).attr('id'));
-  });
-  action_link_close.apply(this);
-};
-          |) if using_tiny_mce?
-        else
-          tiny_mce_js = javascript_tag(%|
-var action_link_close = ActiveScaffold.ActionLink.Abstract.prototype.close;
-ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
-  this.adapter.select('textarea.mceEditor').each(function(elem) {
-    tinyMCE.execCommand('mceRemoveControl', false, elem.id);
-  });
-  action_link_close.apply(this);
-};
-          |) if using_tiny_mce?
-        end
-        super(*args) + (include_tiny_mce_if_needed || '') + (tiny_mce_js || '')
       end
     end
 
@@ -48,13 +20,13 @@ ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
         html.join "\n"
       end
 
-      def onsubmit
+      def onsubmit_with_tiny_mce
         if ActiveScaffold.js_framework == :jquery
-          submit_js = 'tinyMCE.triggerSave();$(\'textarea.mceEditor\').each(function(index, elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, $(elem).attr(\'id\')); });' if using_tiny_mce?
+          submit_js = 'tinyMCE.triggerSave();$(\'textarea.mceEditor\').each(function(index, elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, $(elem).attr(\'id\')); });'
         else
-          submit_js = 'tinyMCE.triggerSave();this.select(\'textarea.mceEditor\').each(function(elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, elem.id); });' if using_tiny_mce?
+          submit_js = 'tinyMCE.triggerSave();this.select(\'textarea.mceEditor\').each(function(elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, elem.id); });'
         end
-        [super, submit_js].compact.join ';'
+        [onsubmit_without_tiny_mce, submit_js].compact.join ';'
       end
     end
 

data/lib/active_scaffold/extensions/action_controller_rendering.rb~

@@ -8,7 +8,7 @@ module ActionController #:nodoc:
         opts = args.blank? ? Hash.new : args.first
         render :partial => params[:adapter][1..-1],
         :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe},
-               :use_full_path => true, :layout => false
+               :use_full_path => true, :layout => false, :content_type => :html
         @rendering_adapter = nil # recursion control
       else
         render_without_active_scaffold(*args, &block)

data/lib/active_scaffold/extensions/action_view_rendering.rb~

@@ -1,5 +1,6 @@
 module ActionView
   class LookupContext
+    attr_accessor :uses_active_scaffold
     module ViewPaths
       def find_all_templates(name, partial = false, locals = {})
         prefixes.collect do |prefix|
@@ -11,6 +12,17 @@ module ActionView
         end.flatten!
       end
     end
+    
+    # Overload formats= to expand ["*/*"] values and automatically
+    # add :html as fallback to :js.
+    def formats=(values)
+      debugger
+      if values == [:js] && uses_active_scaffold
+        _set_detail(:formats, values) if values != @details[:formats]
+      else
+        super(values)
+      end
+    end
   end
 end
 
@@ -49,7 +61,7 @@ module ActionView::Helpers #:nodoc:
           last_view[:templates] = lookup_context.find_all_templates(last_view[:view], last_view[:partial], options[:locals].keys)
           last_view[:templates].shift
         end
-        options[:file] = last_view[:templates].shift
+        options[:template] = last_view[:templates].shift
         view_stack << last_view
         result = render_without_active_scaffold options
         view_stack.pop

data/lib/active_scaffold/finder.rb

@@ -96,7 +96,7 @@ module ActiveScaffold
         elsif value[:from].blank?
           nil
         elsif ActiveScaffold::Finder::StringComparators.values.include?(value[:opt])
-          ["#{column.search_sql} LIKE ?", value[:opt].sub('?', value[:from])]
+          ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', value[:from])]
         elsif value[:opt] == 'BETWEEN'
           ["#{column.search_sql} BETWEEN ? AND ?", value[:from], value[:to]]
         elsif ActiveScaffold::Finder::NumericComparators.include?(value[:opt])

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 3
   - 1
-  - 10
-  version: 3.1.10
+  - 11
+  version: 3.1.11
 platform: ruby
 authors: 
 - Many, see README
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-21 00:00:00 Z
+date: 2011-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -27,12 +27,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id001
+  prerelease: false
   type: :development
   name: shoulda
-  version_requirements: *id001
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -43,12 +43,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id002
+  prerelease: false
   type: :development
   name: bundler
-  version_requirements: *id002
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id003
+  prerelease: false
   type: :development
   name: rcov
-  version_requirements: *id003
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -73,10 +73,10 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
+  requirement: *id004
+  prerelease: false
   type: :runtime
   name: rails
-  version_requirements: *id004
-  prerelease: false
 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 (and interesting!) problems.
 email: activescaffold@googlegroups.com
 executables: []
@@ -103,11 +103,13 @@ files:
 - app/assets/javascripts/jquery/draggable_lists.js
 - app/assets/javascripts/jquery/jquery.editinplace.js
 - app/assets/javascripts/jquery/active_scaffold.js~
+- app/assets/javascripts/jquery/tiny_mce_bridge.js
 - app/assets/javascripts/jquery/draggable_lists.js~
 - app/assets/javascripts/prototype/active_scaffold.js
 - app/assets/javascripts/prototype/dhtml_history.js
 - app/assets/javascripts/prototype/form_enhancements.js
 - app/assets/javascripts/prototype/rico_corner.js
+- app/assets/javascripts/prototype/tiny_mce_bridge.js
 - app/assets/javascripts/prototype/active_scaffold.js~
 - app/assets/javascripts/active_scaffold.js.erb~
 - app/assets/stylesheets/active_scaffold-ie.css
@@ -148,7 +150,6 @@ files:
 - frontends/default/views/_search.html.erb
 - frontends/default/views/_show.html.erb
 - frontends/default/views/list.html.erb
-- frontends/default/views/list.js.erb
 - frontends/default/views/_show_columns.html.erb
 - frontends/default/views/_update_actions.html.erb
 - frontends/default/views/_update_form.html.erb
@@ -174,11 +175,11 @@ files:
 - frontends/default/views/_horizontal_subform_footer.html.erb
 - frontends/default/views/edit_associated.js.erb
 - frontends/default/views/form_messages.js.erb
-- frontends/default/views/mark.js.rjs
 - frontends/default/views/on_action_update.js.erb
 - frontends/default/views/on_create.js.erb
 - frontends/default/views/on_mark_all.js.erb
 - frontends/default/views/on_update.js.erb
+- frontends/default/views/refresh_list.js.erb
 - frontends/default/views/render_field.js.erb
 - frontends/default/views/update_column.js.erb
 - frontends/default/views/_base_form.html.erb~

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

@@ -1,6 +0,0 @@
-if params[:id]
-  # FIXME: It isn't right when there are filtered records by a search
-  page << "$('#{active_scaffold_id}').down('.mark_record').checked = #{@mark ? true : false};"
-else
-  page << "$$('##{active_scaffold_tbody_id} > tr > td > .mark_record').each(function(checkbox) { checkbox.checked = #{@mark ? true : false};});"
-end