active_scaffold_vho 3.0.13 → 3.0.14

data/active_scaffold_vho.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{active_scaffold_vho}
-  s.version = "3.0.13"
+  s.version = "3.0.14"
 
   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-18}
+  s.date = %q{2011-03-05}
   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 = [
@@ -225,6 +225,7 @@ Gem::Specification.new do |s|
     "lib/generators/active_scaffold_controller/USAGE",
     "lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb",
     "lib/generators/active_scaffold_controller/templates/controller.rb",
+    "lib/generators/active_scaffold_controller/templates/helper.rb",
     "lib/generators/active_scaffold_setup/USAGE",
     "lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb",
     "public/blank.html",

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

@@ -140,7 +140,11 @@ $(document).ready(function() {
           csrf_token = $('meta[name=csrf-token]').first(),
           my_parent = span.parent(),
           column_heading = null;
-      
+
+      if(!(my_parent.is('td') || my_parent.is('th'))){
+          my_parent = span.parents('td').eq(0);
+      }
+
       if (my_parent.is('td')) {
         var column_no = my_parent.prevAll('td').length;
         column_heading = my_parent.closest('.active-scaffold').find('th:eq(' + column_no + ')');

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

@@ -155,6 +155,10 @@ document.observe("dom:loaded", function() {
           csrf_token = $$('meta[name=csrf-token]')[0],
           my_parent = span.up(),
           column_heading = null;
+
+      if(!(my_parent.nodeName.toLowerCase() === 'td' || my_parent.nodeName.toLowerCase() === 'th')){
+          my_parent = span.up('td');
+      }
           
       if (my_parent.nodeName.toLowerCase() === 'td') {
         var heading_selector = '.' + span.up().readAttribute('class').split(' ')[0] + '_heading';

data/frontends/default/stylesheets/stylesheet.css

@@ -793,8 +793,11 @@ padding: 2px;
 }
 
 .active-scaffold .fieldWithErrors input,
+.active-scaffold .field_with_errors input,
 .active-scaffold .fieldWithErrors textarea,
-.active-scaffold .fieldWithErrors select {
+.active-scaffold .field_with_errors textarea,
+.active-scaffold .fieldWithErrors select,
+.active-scaffold .field_with_errors select {
 border: solid 1px #f00;
 }
 

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

@@ -1,21 +1,27 @@
 <% url_options ||= params_for(:action => form_action)
    xhr = request.xhr? if xhr.nil?
-   as_action_config = active_scaffold_config.send(form_action)
+   if active_scaffold_config.actions.include? form_action
+     multipart ||= active_scaffold_config.send(form_action).multipart?
+     columns ||= active_scaffold_config.send(form_action).columns
+   else
+     multipart ||= false
+     columns ||= nil
+   end
    body_partial ||= 'form' %>
 <%=
 options = {:onsubmit => onsubmit,
            :id => element_form_id(:action => form_action),
-           :multipart => as_action_config.multipart?,
+           :multipart => multipart,
            :class => "as_form #{form_action.to_s}",
            :method => method,
            'data-loading' => true}
 cancel_options = {:class => 'as_cancel', 'data-refresh' => false}
 
 cancel_options[:remote] = true if xhr #cancel link does nt have to care about multipart forms
-if xhr && as_action_config.multipart? # file_uploads
+if xhr && multipart # file_uploads
   form_remote_upload_tag url_options.merge({:iframe => true}), options
 else
-  options[:remote] = true if xhr && !as_action_config.multipart?
+  options[:remote] = true if xhr && !multipart
   form_tag url_options, options
 end
 -%>
@@ -33,7 +39,7 @@ end
 <% end -%>
   </div>
 
-  <%= render :partial => body_partial, :locals => { :columns => as_action_config.columns } %>
+  <%= render :partial => body_partial, :locals => { :columns => columns } %>
 
   <p class="form-footer">
     <%= submit_tag as_(form_action), :class => "submit" %>

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

@@ -13,11 +13,11 @@
     next %>
   <% elsif renders_as == :subform and !override_form_field?(column) -%>
   <li class="sub-form <%= active_scaffold_config_for(column.association.klass).subform.layout %>-sub-form <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>" id="<%= sub_form_id(:association => column.name) %>">
-    <%= render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column } -%>
+    <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column } -%>
   </li>
   <% else -%>
   <li class="form-element <%= 'required' if column.required? %> <%= column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc) %>">
-    <%= render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column } -%>
+    <%=raw render :partial => form_partial_for_column(column, renders_as), :locals => { :column => column } -%>
   </li>
   <% end -%>
   <% end -%>

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

@@ -2,8 +2,13 @@
 parent_record = @record
 associated = column.singular_association? ? [parent_record.send(column.name)].compact : parent_record.send(column.name).to_a
 associated = associated.sort_by {|r| r.new_record? ? 99999999999 : r.id} unless column.association.options.has_key?(:order)
-
-associated << column.association.klass.new if column.show_blank_record? associated
+if column.show_blank_record? associated
+  associated << if column.singular_association?
+    parent_record.send("build_#{column.name}".to_sym)
+  else
+    parent_record.send(column.name).build
+  end
+end
 subform_div_id = "#{sub_form_id({:association => column.name, :id => parent_record.id || 99999999999})}-div" 
 -%>
 <h5><%= column.label -%></h5>

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

@@ -4,7 +4,7 @@
     <label for="<%= active_scaffold_input_options(column, scope)[:id] %>"><%= column.label %></label>
   </dt>
   <dd>
-    <%= active_scaffold_input_for column, scope %>
+    <%=raw active_scaffold_input_for column, scope %>
     <% if column.update_columns -%>
       <%= loading_indicator_tag(:action => :render_field, :id => params[:id]) %>
     <% end -%>

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

@@ -1,5 +1,11 @@
 <table cellpadding="0" cellspacing="0">
-  <% @record = column.association.klass.new -%>
+  <% 
+  @record = if column.singular_association?
+      parent_record.send("build_#{column.name}".to_sym)
+    else
+      parent_record.send(column.name).build
+    end
+  -%>
   <%= render :partial => 'horizontal_subform_header', :locals => {:parent_record => parent_record} %>
 
   <tbody id="<%= sub_form_list_id(:association => column.name) %>">

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

@@ -1,6 +1,6 @@
 <% record_column = column 
    readonly = (@record.readonly? or not @record.authorized_for?(:crud_type => :update))
-   crud_type = @record.new_record? ? :create : (readonly ? :read : nil) 
+   crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
    show_actions = false 
    config = active_scaffold_config_for(@record.class)
    options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)

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

@@ -18,7 +18,7 @@
     <% if active_scaffold_config.list.show_search_reset && @filtered -%>
       <% search_link = ActiveScaffold::DataStructures::ActionLink.new('index', :label => :click_to_reset, :type => :member, :position => false)
       action_links = ActiveScaffold::DataStructures::ActionLinks.new
-      record = active_scaffold_config.model.new
+      record = new_model
       record.id = 0
       action_links.add(search_link)  -%>
       <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => params_for(:escape => false, :search => ''), :action_links => action_links.member} %>

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

@@ -1,7 +1,7 @@
 <%
   record_column = column
   readonly = (@record.readonly? or not @record.authorized_for?(:crud_type => :update))
-  crud_type = @record.new_record? ? :create : (readonly ? :read : nil)
+  crud_type = @record.new_record? ? :create : (readonly ? :read : :update)
   show_actions = false
   config = active_scaffold_config_for(@record.class)
   options = active_scaffold_input_options(config.columns[@record.class.primary_key], scope)

data/lib/active_scaffold/actions/core.rb

@@ -6,6 +6,7 @@ module ActiveScaffold::Actions
       end
       base.helper_method :nested?
       base.helper_method :beginning_of_chain
+      base.helper_method :new_model
     end
     def render_field
       if params[:in_place_editing]
@@ -151,12 +152,20 @@ module ActiveScaffold::Actions
     private
     def respond_to_action(action)
       respond_to do |type|
-        send("#{action}_formats").each do |format|
+        action_formats.each do |format|
           type.send(format){ send("#{action}_respond_to_#{format}") }
         end
       end
     end
 
+    def action_formats
+      @action_formats ||= if respond_to? "#{action_name}_formats"
+        send("#{action_name}_formats")
+      else
+        (default_formats + active_scaffold_config.formats).uniq
+      end
+    end
+
     def response_code_for_rescue(exception)
       case exception
         when ActiveScaffold::RecordNotAllowed

data/lib/active_scaffold/actions/field_search.rb

@@ -11,7 +11,7 @@ module ActiveScaffold::Actions
     # FieldSearch uses params[:search] and not @record because search conditions do not always pass the Model's validations.
     # This facilitates for example, textual searches against associations via .search_sql
     def show_search
-      @record = active_scaffold_config.model.new
+      @record = new_model
       respond_to_action(:field_search)
     end
 

data/lib/active_scaffold/actions/list.rb

@@ -18,7 +18,7 @@ module ActiveScaffold::Actions
     def list
       do_list
       do_new if active_scaffold_config.list.always_show_create
-      @record ||= active_scaffold_config.model.new if active_scaffold_config.list.always_show_search
+      @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/actions/subform.rb

@@ -1,17 +1,27 @@
 module ActiveScaffold::Actions
   module Subform
     def edit_associated
-      @parent_record = params[:id].nil? ? active_scaffold_config.model.new : find_if_allowed(params[:id], :update)
+      do_edit_associated
+      render :action => 'edit_associated'
+    end
+
+    protected
+
+    def do_edit_associated
+      @parent_record = params[:id].nil? ? new_model : find_if_allowed(params[:id], :update)
       @column = active_scaffold_config.columns[params[:association]]
 
       # NOTE: we don't check whether the user is allowed to update this record, because if not, we'll still let them associate the record. we'll just refuse to do more than associate, is all.
       @record = @column.association.klass.find(params[:associated_id]) if params[:associated_id]
-      @record ||= @column.association.klass.new
+      @record ||= if @column.singular_association?
+        @parent_record.send("build_#{@column.name}".to_sym)
+      else
+        @parent_record.send(@column.name).build
+      end
 
       @scope = "[#{@column.name}]"
       @scope += (@record.new_record?) ? "[#{(Time.now.to_f*1000).to_i.to_s}]" : "[#{@record.id}]" if @column.plural_association?
-
-      render :action => 'edit_associated'
     end
+
   end
 end

data/lib/active_scaffold/actions/update.rb

@@ -75,18 +75,22 @@ module ActiveScaffold::Actions
     # If you want to customize this algorithm, consider using the +before_update_save+ callback
     def do_update
       do_edit
-      @record = update_record_from_params(@record, active_scaffold_config.update.columns, params[:record])
       update_save
     end
 
     def update_save
       begin
         active_scaffold_config.model.transaction do
+          @record = update_record_from_params(@record, active_scaffold_config.update.columns, params[:record]) unless options[:no_record_param_update]
           before_update_save(@record)
           self.successful = [@record.valid?, @record.associated_valid?].all? {|v| v == true} # this syntax avoids a short-circuit
           if successful?
             @record.save! and @record.save_associated!
             after_update_save(@record)
+          else
+            # some associations such as habtm are saved before saved is called on parent object
+            # we have to revert these changes if validation fails
+            raise ActiveRecord::Rollback, "don't save habtm associations unless record is valid"
           end
         end
       rescue ActiveRecord::RecordInvalid

data/lib/active_scaffold/bridges/cancan/lib/cancan_bridge.rb

@@ -68,10 +68,14 @@ module ActiveScaffold
         # if cancan says "no", it delegates to default AS behavior
         def authorized_for_with_cancan?(options = {})
           raise InvalidArgument if options[:crud_type].blank? and options[:action].blank?
-          crud_type_result = options[:crud_type].nil? ? true : current_ability.can?(options[:crud_type], self)
-          action_result = options[:action].nil? ? true : current_ability.can?(options[:action], self)
+          if current_ability.present?
+            crud_type_result = options[:crud_type].nil? ? true : current_ability.can?(options[:crud_type], self)
+            action_result = options[:action].nil? ? true : current_ability.can?(options[:action].to_sym, self)
+          else
+            crud_type_result, action_result = false, false
+          end
           default_result = authorized_for_without_cancan?(options)
-          result = (crud_type_result and action_result) or default_result
+          result = (crud_type_result && action_result) || default_result
           return result
         end
       end

data/lib/active_scaffold/bridges/carrierwave/lib/form_ui.rb

@@ -3,14 +3,8 @@ module ActiveScaffold
     module FormColumnHelpers
       def active_scaffold_input_carrierwave(column, options)
         options = active_scaffold_input_text_options(options)
-        input = file_field(:record, column.name, options)
         carrierwave = @record.send("#{column.name}")
         if carrierwave.file.present? && !carrierwave.file.empty?
-          if ActiveScaffold.js_framework == :jquery
-            js_remove_file_code = "$(this).prev().val('true'); $(this).parent().hide().next().show(); return false;";
-          else
-            js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show(); return false;";
-          end
 
           remove_field_options = {
             :name => options[:name].gsub(/\[#{column.name}\]$/, "[remove_#{column.name}]"),
@@ -23,6 +17,15 @@ module ActiveScaffold
             :id => options[:id] + '_cache'
           }
 
+          if ActiveScaffold.js_framework == :jquery
+            js_remove_file_code = "$(this).prev('input#remove_#{options[:id]}').val('true'); $(this).parent().hide().next().show(); return false;";
+            js_dont_remove_file_code = "$(this).parents('div.carrierwave_controls').find('input#remove_#{options[:id]}').val('false'); return false;";
+          else
+            js_remove_file_code = "$(this).previous('input#remove_#{options[:id]}').value='true'; $(this).up().hide().next().show(); return false;";
+            js_dont_remove_file_code = "$(this).up('div.carrierwave_controls').down('input#remove_#{options[:id]}').value='false'; return false;";
+          end
+
+          input = file_field(:record, column.name, options.merge(:onchange => js_dont_remove_file_code))
           content_tag( :div,
             content_tag(:div, (
                 get_column_value(@record, column) + " | " +
@@ -30,10 +33,11 @@ module ActiveScaffold
                   hidden_field(:record, "remove_#{column.name}", remove_field_options) +
                   content_tag(:a, as_(:remove_file), {:href => '#', :onclick => js_remove_file_code})
               ).html_safe
-            ) + content_tag(:div, input, :style => "display: none")
+            ) + content_tag(:div, input, :style => "display: none"),
+            :class => 'carrierwave_controls'
           )
         else
-          input
+          file_field(:record, column.name, options)
         end
       end
     end

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

@@ -2,7 +2,18 @@ module ActiveScaffold
   module TinyMceBridge
     module ViewHelpers
       def active_scaffold_includes(*args)
-        tiny_mce_js = javascript_tag(%|
+        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) {
@@ -10,7 +21,8 @@ ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
   });
   action_link_close.apply(this);
 };
-        |) if using_tiny_mce?
+          |) if using_tiny_mce?
+        end
         super(*args) + (include_tiny_mce_if_needed || '') + (tiny_mce_js || '')
       end
     end
@@ -25,7 +37,11 @@ ActiveScaffold.ActionLink.Abstract.prototype.close = function() {
       end
 
       def onsubmit
-        submit_js = 'tinyMCE.triggerSave();this.select("textarea.mceEditor").each(function(elem) { tinyMCE.execCommand("mceRemoveControl", false, elem.id); });' if using_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?
+        else
+          submit_js = 'tinyMCE.triggerSave();this.select(\'textarea.mceEditor\').each(function(elem) { tinyMCE.execCommand(\'mceRemoveControl\', false, elem.id); });' if using_tiny_mce?
+        end
         [super, submit_js].compact.join ';'
       end
     end

data/lib/active_scaffold/config/mark.rb

@@ -16,7 +16,7 @@ module ActiveScaffold::Config
       @core.columns[:marked].form_ui = :checkbox
       @core.columns[:marked].inplace_edit = true
       @core.columns[:marked].sort = false
-      @core.list.columns = [:marked] + @core.list.columns.names unless @core.list.columns.include? :marked 
+      @core.list.columns = [:marked] + @core.list.columns.names_without_auth_check unless @core.list.columns.include? :marked
     end
   end
 end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -38,6 +38,10 @@ module ActiveScaffold::DataStructures
       self.collect(&:name)
     end
 
+    def names_without_auth_check
+      Array(@set)
+    end
+
     protected
 
     def collect_columns

data/lib/active_scaffold/finder.rb

@@ -1,5 +1,9 @@
 module ActiveScaffold
   module Finder
+    def self.like_operator
+      @@like_operator ||= ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
+    end
+
     module ClassMethods
       # Takes a collection of search terms (the tokens) and creates SQL that
       # searches all specified ActiveScaffold columns. A row will match if each
@@ -13,13 +17,13 @@ module ActiveScaffold
 
         where_clauses = []
         columns.each do |column|
-          where_clauses << ((column.column.nil? || column.column.text?) ? "LOWER(#{column.search_sql}) LIKE ?" : "#{column.search_sql} = ?")
+          where_clauses << ((column.column.nil? || column.column.text?) ? "#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?" : "#{column.search_sql} = ?")
         end
         phrase = "(#{where_clauses.join(' OR ')})"
 
         sql = ([phrase] * tokens.length).join(' AND ')
         tokens = tokens.collect do |value|
-          columns.collect {|column| (column.column.nil? || column.column.text?) ? like_pattern.sub('?', value.downcase) : column.column.type_cast(value)}
+          columns.collect {|column| (column.column.nil? || column.column.text?) ? like_pattern.sub('?', value) : column.column.type_cast(value)}
         end.flatten
 
         [sql, *tokens]
@@ -52,7 +56,7 @@ module ActiveScaffold
                 ["#{column.search_sql} in (?)", Array(value)]
                 else
                   if column.column.nil? || column.column.text?
-                    ["LOWER(#{column.search_sql}) LIKE ?", like_pattern.sub('?', value.downcase)]
+                    ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
                   else
                     ["#{column.search_sql} = ?", column.column.type_cast(value)]
                   end
@@ -82,7 +86,7 @@ module ActiveScaffold
       def condition_for_range(column, value, like_pattern = nil)
         if !value.is_a?(Hash)
           if column.column.nil? || column.column.text?
-            ["LOWER(#{column.search_sql}) LIKE ?", like_pattern.sub('?', value.downcase)]
+            ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
           else
             ["#{column.search_sql} = ?", column.column.type_cast(value)]
           end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -275,7 +275,7 @@ module ActiveScaffold
 
       def inplace_edit_control(column)
         if inplace_edit?(active_scaffold_config.model, column) and inplace_edit_cloning?(column)
-          @record = active_scaffold_config.model.new
+          @record = new_model
           column = column.clone
           column.options = column.options.clone
           column.form_ui = :select if (column.association && column.form_ui.nil?)

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -121,15 +121,20 @@ module ActiveScaffold
         return values[:opt], values[:from], values[:to]
       end
 
-      def active_scaffold_search_range(column, options)
-        opt_value, from_value, to_value = field_search_params_range_values(column)
-
-        text_field_size = 10
+      def active_scaffold_search_range_comparator_options(column)
         select_options = ActiveScaffold::Finder::NumericComparators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
         if column.column && column.column.text?
           select_options.unshift *ActiveScaffold::Finder::StringComparators.collect {|title, comp| [as_(title), comp]}
-          text_field_size = 15
         end
+        select_options
+      end
+
+      def active_scaffold_search_range(column, options)
+        opt_value, from_value, to_value = field_search_params_range_values(column)
+        
+        select_options = active_scaffold_search_range_comparator_options(column)
+        text_field_size = ((column.column && column.column.text?) ? 15 : 10)
+
         from_value = controller.class.condition_value_for_numeric(column, from_value)
         to_value = controller.class.condition_value_for_numeric(column, to_value)
         from_value = format_number_value(from_value, column.options) if from_value.is_a?(Numeric)

data/lib/active_scaffold/locale/fr.rb

@@ -7,6 +7,7 @@
       :are_you_sure_to_delete => 'Êtes vous sûr?',
       :cancel => 'Annuler',
       :click_to_edit => 'Cliquer pour éditer',
+      :click_to_reset => 'Cliquer pour ré-initialiser',
       :close => 'Fermer',
       :config_list => 'Configure',
       :config_list_model => 'Configure Columns for %{model}',
@@ -24,6 +25,7 @@
       :export => 'Exporter',
       :nested_for_model => '%{nested_model} pour %{parent_model}',
       :nested_of_model => '%{nested_model} de %{parent_model}',
+      :false => 'Faux',
       :filtered => '(Filtré)',
       :found => 'Trouvé',
       :hide => 'Cacher',
@@ -50,6 +52,7 @@
       :show => 'Montrer',
       :show_model => 'Montrer %{model}',
       :_to_  => ' à ',
+      :true => 'Vrai',
       :update => 'Mettre à jour',
       :update_model => 'Mettre à jour le(/la) %{model}',
       :updated_model => 'Mis à jour de %{model}',
@@ -60,31 +63,34 @@
       :'<' => '<',
       :'!=' => '!=',
       :between => 'Entre',
-      :today => 'Today',
-      :yesterday => 'Yesterday',
-      :tomorrow => 'Tommorrow',
-      :this_week => 'This Week',
-      :prev_week => 'Last Week',
-      :next_week => 'Next Week',
-      :this_month => 'This Month',
-      :prev_month => 'Last Month',
-      :next_month => 'Next Month',
-      :this_year => 'This Year',
-      :prev_year => 'Last Year',
-      :next_year => 'Next Year',
-      :past => 'Past', 
-      :future => 'Future',
-      :range => 'Range',
-      :seconds => 'Seconds',
+      :contains => 'Contient',
+      :begins_with => 'Commençant par',
+      :ends_with => 'Se terminant par',
+      :today => "Aujourd'hui",
+      :yesterday => 'Hier',
+      :tomorrow => 'Demain',
+      :this_week => 'Cette Semaine',
+      :prev_week => 'Semaine dernière',
+      :next_week => 'Semaine prochaine',
+      :this_month => 'Ce Mois',
+      :prev_month => 'Mois dernier',
+      :next_month => 'Mois prochain',
+      :this_year => 'Cette Année',
+      :prev_year => 'Année dernière',
+      :next_year => 'Année prochaine',
+      :past => 'Passé', 
+      :future => 'Futur',
+      :range => 'Intervale',
+      :seconds => 'Secondes',
       :minutes => 'Minutes',
-      :hours => 'Hours',
-      :days => 'Days',
-      :weeks => 'Weeks',
-      :months => 'Months',
-      :years => 'Years',
-      :optional_attributes => 'Further Options',
-      :null => 'Null',
-      :not_null => 'Not Null',
+      :hours => 'Heures',
+      :days => 'Jours',
+      :weeks => 'Semaines',
+      :months => 'Mois',
+      :years => 'Années',
+      :optional_attributes => 'Options additionnelles',
+      :null => 'Nulle',
+      :not_null => 'Non Nulle',
       :date_picker_options => {
         :weekHeader => 'Sm',
 				:firstDay => 1,
@@ -99,18 +105,18 @@
       :errors => {
         :template => {
           :header => {
-            :one =>    "1 error prohibited this %{model} from being saved.",
-            :other =>  "%{count} errors prohibited this %{model} from being saved"
+            :one =>    "1 erreur interdit ce(tte) %{model} d'être sauvegardé.",
+            :other =>  "%{count} erreurs interdit ce(tte) %{model} d'être sauvegardé"
           },
-          :body => "There were problems with the following fields:"
+          :body => "Il y avait des problèmes avec les champs suivants :"
         }
       },
       # error_messages
-      :cant_destroy_record => "%{record} can't be destroyed",
+      :cant_destroy_record => "%{record} ne peut être supprimé",
       :internal_error => 'Erreur de la requête (code 500, Erreur interne)',
       :version_inconsistency => "Version incomplète - Cet enregistrement a été modifié depuis que vous avez commencé à l'éditer.",
-      :record_not_saved => 'Failed to save record cause of an unknown error',
-      :no_authorization_for_action => "No Authorization for action %{action}"
+      :record_not_saved => "Impossible d'enregistrer l'enregistrement à cause d'une erreur inconnue",
+      :no_authorization_for_action => "Aucune autorisation pour l'action %{action}"
     }
   }
 }

data/lib/active_scaffold/version.rb

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

data/lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb

@@ -16,6 +16,7 @@ module Rails
 
       def create_controller_files
         template 'controller.rb', File.join('app/controllers', class_path, "#{controller_file_name}_controller.rb")
+        template 'helper.rb', File.join('app/helpers', class_path, "#{controller_file_name}_helper.rb")
       end
 
       hook_for :test_framework, :as => :scaffold

data/lib/generators/active_scaffold_controller/templates/helper.rb

@@ -0,0 +1,2 @@
+module <%= controller_class_name %>Helper
+end

data/test/misc/finder_test.rb

@@ -33,13 +33,13 @@ class FinderTest < Test::Unit::TestCase
     ]
 
     expected_conditions = [
-			'(LOWER("model_stubs"."a") LIKE ? OR LOWER("model_stubs"."b") LIKE ?) AND (LOWER("model_stubs"."a") LIKE ? OR LOWER("model_stubs"."b") LIKE ?)',
+			'("model_stubs"."a" LIKE ? OR "model_stubs"."b" LIKE ?) AND ("model_stubs"."a" LIKE ? OR "model_stubs"."b" LIKE ?)',
 		  '%foo%', '%foo%', '%bar%', '%bar%'
 		]
     assert_equal expected_conditions, ClassWithFinder.create_conditions_for_columns(tokens, columns)
 
     expected_conditions = [
-      '(LOWER("model_stubs"."a") LIKE ? OR LOWER("model_stubs"."b") LIKE ?)',
+      '("model_stubs"."a" LIKE ? OR "model_stubs"."b" LIKE ?)',
       '%foo%', '%foo%'
     ]
     assert_equal expected_conditions, ClassWithFinder.create_conditions_for_columns('foo', columns)

data/test/mock_app/public/stylesheets/active_scaffold/default/stylesheet.css

@@ -662,8 +662,11 @@ padding: 2px;
 }
 
 .active-scaffold .fieldWithErrors input,
+.active-scaffold .field_with_errors input,
 .active-scaffold .fieldWithErrors textarea,
-.active-scaffold .fieldWithErrors select {
+.active-scaffold .field_with_errors textarea,
+.active-scaffold .fieldWithErrors select,
+.active-scaffold .field_with_errors select {
 border: solid 1px #f00;
 }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_vho
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 3
   - 0
-  - 13
-  version: 3.0.13
+  - 14
+  version: 3.0.14
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 +01:00
+date: 2011-03-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -340,6 +340,7 @@ files:
 - lib/generators/active_scaffold_controller/USAGE
 - lib/generators/active_scaffold_controller/active_scaffold_controller_generator.rb
 - lib/generators/active_scaffold_controller/templates/controller.rb
+- lib/generators/active_scaffold_controller/templates/helper.rb
 - lib/generators/active_scaffold_setup/USAGE
 - lib/generators/active_scaffold_setup/active_scaffold_setup_generator.rb
 - public/blank.html