active_scaffold_vho 3.1.4 → 3.1.5

data/lib/active_scaffold/data_structures/column.rb

@@ -181,6 +181,16 @@ module ActiveScaffold::DataStructures
     # to modify the default order of columns
     attr_accessor :weight
 
+    # whether the field should be stripped when search values or form values are read for this value
+    attr_writer :stripable
+    def stripable?
+      @stripable
+    end
+
+    def stripped_value(value)
+      stripable? ? value.strip : value
+    end
+
     # to set how many associated records a column with plural association must show in list
     cattr_accessor :associated_limit
     @@associated_limit = 3
@@ -228,6 +238,9 @@ module ActiveScaffold::DataStructures
     def plural_association?
       self.association and [:has_many, :has_and_belongs_to_many].include? self.association.macro
     end
+    def belongs_to_association?
+      self.association && self.association.macro == :belongs_to
+    end
     def through_association?
       self.association and self.association.options[:through]
     end
@@ -278,6 +291,7 @@ module ActiveScaffold::DataStructures
       @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
+      @stripable = true if @column and @column.text?
       @allow_add_existing = true
       @form_ui = self.class.association_form_ui if @association && self.class.association_form_ui
       
@@ -311,7 +325,7 @@ module ActiveScaffold::DataStructures
         self.sort = false
       else
         if self.singular_association?
-          self.sort = {:method => "#{self.name}.to_label"}
+          self.sort = {:method => "#{self.name}.nil? ? '' : #{self.name}.to_label"}
         elsif self.plural_association?
           self.sort = {:method => "#{self.name}.join(',')"}
         else
@@ -322,7 +336,7 @@ module ActiveScaffold::DataStructures
     
     def initialize_search_sql
       self.search_sql = unless self.virtual?
-        if association.nil?
+        if association.nil? || self.belongs_to_association?
           self.field.to_s
         elsif !self.polymorphic_association?
           [association.klass.table_name, association.klass.primary_key].collect! do |str|

data/lib/active_scaffold/finder.rb

@@ -86,18 +86,24 @@ module ActiveScaffold
       def condition_for_range(column, value, like_pattern = nil)
         if !value.is_a?(Hash)
           if column.column.nil? || column.column.text?
-            ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
+            ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', column.stripped_value(value))]
           else
             ["#{column.search_sql} = ?", column.column.type_cast(value)]
           end
         elsif value[:from].blank?
           nil
         elsif ActiveScaffold::Finder::StringComparators.values.include?(value[:opt])
-          ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', value[:from])]
+          if(active_scaffold_config.field_search.or_columns.include? column.name)
+            search_values = column.stripped_value(value[:from]).split(active_scaffold_config.field_search.or_delimiter).compact
+            sql_prepared_statement = search_values.collect {|search_value| "#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?"}.join(' OR ')
+            [sql_prepared_statement] + search_values.collect{|search_value| value[:opt].sub('?', column.stripped_value(search_value))}
+          else
+            ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', column.stripped_value(value[:from]))]
+          end
         elsif value[:opt] == 'BETWEEN'
-          ["#{column.search_sql} BETWEEN ? AND ?", value[:from], value[:to]]
+          ["#{column.search_sql} BETWEEN ? AND ?", column.stripped_value(value[:from]), column.stripped_value(value[:to])]
         elsif ActiveScaffold::Finder::NumericComparators.include?(value[:opt])
-          ["#{column.search_sql} #{value[:opt]} ?", value[:from]]
+          ["#{column.search_sql} #{value[:opt]} ?", column.stripped_value(value[:from])]
         else
           nil
         end
@@ -256,6 +262,7 @@ module ActiveScaffold
       full_includes = (active_scaffold_includes.blank? ? nil : active_scaffold_includes)
       options[:per_page] ||= 999999999
       options[:page] ||= 1
+      #TODO not supported by kaminary
       options[:count_includes] ||= full_includes unless search_conditions.nil?
 
       klass = beginning_of_chain
@@ -264,35 +271,18 @@ module ActiveScaffold
       finder_options = { :order => options[:sorting].try(:clause),
                          :where => search_conditions,
                          :joins => joins_for_finder,
-                         :includes => options[:count_includes]}
+                         :includes => add_association_to_includes_for_sorting(options[:sorting], full_includes)}
                          
       finder_options.merge! custom_finder_options
-
-      # NOTE: we must use :include in the count query, because some conditions may reference other tables
-      count_query = append_to_query(klass, finder_options.reject{|k, v| [:select, :order].include?(k)})
-      count = count_query.count unless options[:pagination] == :infinite
-  
-      # Converts count to an integer if ActiveRecord returned an OrderedHash
-      # that happens when finder_options contains a :group key
-      count = count.length if count.is_a? ActiveSupport::OrderedHash
-
-      full_includes = add_association_to_includes_for_sorting(options[:sorting], full_includes)
-      finder_options.merge! :includes => full_includes
-
+ 
       # we build the paginator differently for method- and sql-based sorting
-      if options[:sorting] and options[:sorting].sorts_by_method?
-        pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page|
-          sorted_collection = sort_collection_by_column(append_to_query(klass, finder_options).all, *options[:sorting].first)
-          sorted_collection = sorted_collection.slice(offset, per_page) if options[:pagination]
-          sorted_collection
-        end
+      records = if options[:sorting] && options[:sorting].sorts_by_method?
+        Kaminari.paginate_array(sort_collection_by_column(append_to_query(klass, finder_options).all, *options[:sorting].first))
       else
-        pager = ::Paginator.new(count, options[:per_page]) do |offset, per_page|
-          finder_options.merge!(:offset => offset, :limit => per_page) if options[:pagination]
-          append_to_query(klass, finder_options).all
-        end
+        append_to_query(klass, finder_options)
       end
-      pager.page(options[:page])
+      records = records.page(options[:page]).per(options[:per_page]) if options[:pagination]
+      records
     end
 
     # if someone excludes association from includes in configuration

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -17,12 +17,14 @@ module ActiveScaffold
             "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{format_number_value(controller.class.condition_value_for_numeric(column, value[:from]), column.options)} #{value[:opt] == 'BETWEEN' ? '- ' + format_number_value(controller.class.condition_value_for_numeric(column, value[:to]), column.options).to_s : ''}"
           when :string
             opt = ActiveScaffold::Finder::StringComparators.index(value[:opt]) || value[:opt]
-            "#{column.active_record_class.human_attribute_name(column.name)} #{as_(opt).downcase} '#{value[:from]}' #{opt == 'BETWEEN' ? '- ' + value[:to].to_s : ''}"
+            "#{column.active_record_class.human_attribute_name(column.name)} #{as_(opt).downcase} '#{column.stripped_value(value[:from])}' #{opt == 'BETWEEN' ? '- ' + column.stripped_value(value[:to]).to_s : ''}"
           when :date, :time, :datetime, :timestamp
             conversion = column.column.type == :date ? :to_date : :to_time
             from = controller.condition_value_for_datetime(value[:from], conversion)
             to = controller.condition_value_for_datetime(value[:to], conversion)
-            "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt])} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
+            unless from.nil? || (value[:opt] == 'BETWEEN' && to.nil?)
+              "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt])} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
+            end
           when :select, :multi_select, :record_select
             associated = value
             associated = [associated].compact unless associated.is_a? Array

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -124,6 +124,7 @@ module ActiveScaffold
           format_column_value(record, column)
         else
           value = record.send(column.name)
+          value = value.to_s unless value.nil?
           text, val = column.options[:options].find {|text, val| (val || text).to_s == value}
           value = active_scaffold_translated_option(column, text, val).first if text
           format_column_value(record, column, value)
@@ -136,6 +137,16 @@ module ActiveScaffold
         check_box(:record, column.name, options)
       end
 
+      # list_column override specific to this controller column combination
+      def column_controller_override(column)
+        "#{clean_class_name(column.active_record_class.name)}_#{clean_column_name(column.name)}_column"
+      end
+
+      def column_controller_override?(column)
+        respond_to?(column_controller_override(column))
+      end
+
+      # list_column overide for a specific column in all controllers
       def column_override(column)
         "#{column.name.to_s.gsub('?', '')}_column" # parse out any question marks (see issue 227)
       end
@@ -316,11 +327,17 @@ module ActiveScaffold
       def mark_column_heading
         if active_scaffold_config.mark.mark_all_mode == :page then
           all_marked = true
-          @page.items.each do |record|
+          @records.each do |record|
             all_marked = false if !marked_records.entries.include?(record.id)
           end
         else
-          all_marked = (marked_records.length >= @page.pager.count)
+          # if relation does not respond to kaminari total_count...
+          # kaminari paging is nt active
+          if @records.respond_to?(:total_count)
+            all_marked = (marked_records.length >= @records.total_count)
+          else
+            all_marked = (marked_records.length >= @records.count)
+          end
         end
         tag_options = {:id => "#{controller_id}_mark_heading", :class => "mark_heading in_place_editor_field"}
         tag_options['data-ie_url'] = url_for({:controller => params_for[:controller], :action => 'mark_all', :eid => params[:eid]})
@@ -363,6 +380,52 @@ module ActiveScaffold
         end
         content_tag(:tr, content_tag(:td, rendered.join(' ').html_safe), :class => "inline-adapter-autoopen", 'data-actionlink-controllers' => link_nested_controllers.join('::').html_safe, 'data-as_load'=>"tr");
       end
+
+      def generate_list_column_helper_code(column)
+        method_name = column_controller_override(column)
+        if column_override? column
+          "def #{method_name}(column, record)\n  #{column_override(column)}(column, record)\nend"
+        elsif column.list_ui and override_column_ui?(column.list_ui)
+          "def #{method_name}(column, record)\n  #{override_column_ui(column.list_ui)}(column, record)\nend"
+        elsif column.column and override_column_ui?(column.column.type)
+          "def #{method_name}(column, record)\n  #{override_column_ui(column.column.type)}(column, record)\nend"
+        #associations and virtual columns will use default list_column helper methods..
+        elsif column.association || column.column.nil?
+          "def #{method_name}(record, column)\n get_column_value(column, record)\nend"
+        else
+          "def #{method_name}(column, record)\n value ||= record.send(column.name)\n value.nil? ? h(active_scaffold_config.list.empty_field_text) : h(#{list_column_helper_code_by_column_type(column)})\nend"
+        end
+      end
+
+      def list_column_helper_code_by_column_type(column)
+        case column.column.type
+        when :integer
+          "#{numeric_to_string_method_code(column.options[:format], true)}"
+        when :float, :decimal
+          "#{numeric_to_string_method_code(column.options[:format], false)}"
+        when :boolean
+          "as_(value.to_s.to_sym)"
+        when :datetime, :timestamp, :time, :date
+          "l(value, :format => :#{column.options[:format] || :default})"
+        else
+          "value.to_s"
+        end
+      end
+
+      def numeric_to_string_method_code(format, is_integer)
+        case format
+        when :size
+          "number_to_human_size(value, column.options[:i18n_options] || {})"
+        when :percentage
+          "number_to_percentage(value, column.options[:i18n_options] || {})"
+        when :currency
+          "number_to_currency(value, options[:i18n_options] || {})"
+        when :i18n_number
+          "number_with_#{is_integer ? 'delimiter' : 'precision'}(value, column.options[:i18n_options] || {})"
+        else
+          "value"
+        end
+      end
     end
   end
 end

data/lib/active_scaffold/locale/de.yml

@@ -0,0 +1,118 @@
+de:
+  active_scaffold:
+    add: 'Hinzufügen'
+    add_existing: 'Existierenden Eintrag hinzufügen'
+    add_existing_model: 'Existierende %{model} hinzufügen'
+    are_you_sure_to_delete: 'Sind Sie sicher?'
+    cancel: 'Abbrechen'
+    click_to_edit: 'Zum Editieren anklicken'
+    click_to_reset: 'Reset'
+    close: 'Schliessen'
+    config_list: 'Konfigurieren'
+    config_list_model: 'Konfiguriere Spalten für %{model}'
+    create: 'Anlegen'
+    create_model: 'Lege %{model} an'
+    create_another: 'Weitere anlegen'
+    created_model: '%{model} angelegt'
+    create_new: 'Neu anlegen'
+    customize: 'Anpassen'
+    delete: 'Löschen'
+    deleted_model: '%{model} gelöscht'
+    delimiter: 'Trennzeichen'
+    download: 'Download'
+    edit: 'Bearbeiten'
+    export: 'Exportieren'
+    nested_for_model: '%{nested_model} für %{parent_model}'
+    nested_of_model: '%{nested_model} von %{parent_model}'
+    filtered: '(Gefiltert)'
+    found: 'Gefunden'
+    hide: 'Verstecken'
+    live_search: 'Live-Suche'
+    loading: 'Lade…'
+    next: 'Vor'
+    no_entries: 'Keine Einträge'
+    no_options: 'Keine Optionen'
+    omit_header: 'Lasse Header weg'
+    options: 'Optionen'
+    pdf: 'PDF'
+    previous: 'Zurück'
+    print: 'Drucken'
+    refresh: 'Neu laden'
+    remove: 'Entfernen'
+    remove_file: 'Entferne oder Ersetze Datei'
+    replace_with_new: 'Mit Neuer ersetzen'
+    revisions_for_model: 'Revisionen für %{model}'
+    reset: 'Zurücksetzen'
+    saving: 'Speichern…'
+    search: 'Suche'
+    search_terms: 'Suchbegriffe'
+    _select_: '- Auswählen -'
+    show: 'Anzeigen'
+    show_model: 'Zeige %{model} an'
+    _to_ : ' zu '
+    update: 'Speichern'
+    update_model: 'Editiere %{model}'
+    updated_model: '%{model} aktualisiert'
+    '=': '='
+    '>=': '>='
+    '<=': '<='
+    '>': '>'
+    '<': '<'
+    '!=': '!='
+    between: 'Zwischen'
+    contains: 'Enthält'
+    begins_with: 'Beginnt'
+    ends_with: 'Ended'
+    today: 'Heute'
+    yesterday: 'Gestern'
+    tomorrow: 'Morgen'
+    this_week: 'Diese Woche'
+    prev_week: 'Letzte Woche'
+    next_week: 'Nächste Woche'
+    this_month: 'Diesen Monat'
+    prev_month: 'Letzten Monat'
+    next_month: 'Nächsten Monat'
+    this_year: 'Dieses Jahr'
+    prev_year: 'Letztes Jahr'
+    next_year: 'Nächstes Jahr'
+    past: 'Letzten'
+    future: 'Nächsten'
+    range: 'Zeitraum'
+    seconds: 'Sekunden'
+    minutes: 'Minuten'
+    hours: 'Stunden'
+    days: 'Tage'
+    weeks: 'Wochen'
+    months: 'Monate'
+    years: 'Jahre'
+    optional_attributes: 'Weitere'
+    null: 'Null'
+    not_null: 'Nicht Null'
+    date_picker_options:
+      weekHeader: 'Wo'
+      firstDay: 1
+      isRTL: false
+      showMonthAfterYear: false
+    datetime_picker_options:
+      timeText: 'Uhrzeit'
+      currentText: 'Jetzt'
+      closeText: 'Schließen'
+    errors:
+      template:
+        header:
+          one: "Konnte %{model} nicht speichern: ein Fehler."
+          other: "Konnte %{model} nicht speichern: %{count} Fehler."
+        body: "Bitte überprüfen Sie die folgenden Felder:"
+    # error_messages
+    cant_destroy_record: "%{record} kann nicht gelöscht werden"
+    internal_error: 'Fehler bei der Verarbeitung (code 500, Interner Fehler)'
+    version_inconsistency: 'Inkonsistente Versionen - dieser Eintrag wurde verändert nachdem Sie mit der Bearbeitung begonnen haben.'
+    record_not_saved: 'Eintrag kann nicht gespeichert werden. Ursache unbekannt.'
+    no_authorization_for_action: "Keine Berechtigung für Aktion %{action}"
+  views:
+    pagination:
+      first: "&laquo; Erste"
+      last: "Letzte &raquo;"
+      previous: "&lsaquo; Zurück"
+      next: "Vor &rsaquo;"
+      truncate: "..."

data/lib/active_scaffold/locale/en.yml

@@ -0,0 +1,115 @@
+en:
+  active_scaffold:
+    add: 'Add'
+    add_existing: 'Add Existing'
+    add_existing_model: 'Add Existing %{model}'
+    are_you_sure_to_delete: 'Are you sure you want to delete %{label}?'
+    cancel: 'Cancel'
+    click_to_edit: 'Click to edit'
+    click_to_reset: 'Click to reset'
+    close: 'Close'
+    config_list: 'Configure'
+    config_list_model: 'Configure Columns for %{model}'
+    create: 'Create'
+    create_model: 'Create %{model}'
+    create_another: 'Create Another %{model}'
+    created_model: 'Created %{model}'
+    create_new: 'Create New'
+    customize: 'Customize'
+    delete: 'Delete'
+    deleted_model: 'Deleted %{model}'
+    delimiter: 'Delimiter'
+    download: 'Download'
+    edit: 'Edit'
+    export: 'Export'
+    nested_for_model: '%{nested_model} for %{parent_model}'
+    nested_of_model: '%{nested_model} of %{parent_model}'
+    'false': 'False'
+    filtered: '(Filtered)'
+    found: 'Found'
+    hide: 'Hide'
+    live_search: 'Live Search'
+    loading: 'Loading…'
+    next: 'Next'
+    no_entries: 'No Entries'
+    no_options: 'no options'
+    omit_header: 'Omit Header'
+    options: 'Options'
+    pdf: 'PDF'
+    previous: 'Previous'
+    print: 'Print'
+    refresh: 'Refresh'
+    remove: 'Remove'
+    remove_file: 'Remove or Replace file'
+    replace_with_new: 'Replace With New'
+    revisions_for_model: 'Revisions for %{model}'
+    reset: 'Reset'
+    saving: 'Saving…'
+    search: 'Search'
+    search_terms: 'Search Terms'
+    _select_: '- select -'
+    show: 'Show'
+    show_model: 'Show %{model}'
+    _to_ : ' to '
+    'true': 'True'
+    update: 'Update'
+    update_model: 'Update %{model}'
+    updated_model: 'Updated %{model}'
+    '=': '='
+    '>=': '>='
+    '<=': '<='
+    '>': '>'
+    '<': '<'
+    '!=': '!='
+    between: 'Between'
+    contains: 'Contains'
+    begins_with: 'Begins with'
+    ends_with: 'Ends with'
+    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'
+    minutes: 'Minutes'
+    hours: 'Hours'
+    days: 'Days'
+    weeks: 'Weeks'
+    months: 'Months'
+    years: 'Years'
+    optional_attributes: 'Further Options'
+    null: 'Null'
+    not_null: 'Not Null'
+    date_picker_options:
+      weekHeader: 'Wk'
+      firstDay: 0
+      isRTL: false
+      showMonthAfterYear: false
+
+    datetime_picker_options:
+
+    errors:
+      template:
+        header:
+          one: "1 error prohibited this %{model} from being saved."
+          other: "%{count} errors prohibited this %{model} from being saved"
+
+        body: "There were problems with the following fields:"
+
+
+      # error_messages
+    cant_destroy_record: "%{record} can't be destroyed"
+    internal_error: 'Request Failed (code 500, Internal Error)'
+    version_inconsistency: 'Version inconsistency - this record has been modified since you started editing it.'
+    record_not_saved: 'Failed to save record cause of an unknown error'
+    no_authorization_for_action: "No Authorization for action %{action}"