active_scaffold 3.0.12 → 3.0.21

data/lib/active_scaffold/helpers/show_column_helpers.rb

@@ -25,13 +25,17 @@ module ActiveScaffold
         simple_format(clean_column_value(record.send(column.name)))
       end
 
-      def show_column_override(column)
-        "#{column.name.to_s.gsub('?', '')}_show_column" # parse out any question marks (see issue 227)
+      def show_column_override_name(column, class_prefix = false)
+        "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_show_column"
       end
 
-      def show_column_override?(column)
-        respond_to?(show_column_override(column))
+      def show_column_override(column)
+        method_with_class = show_column_override_name(column, true)
+        return method_with_class if respond_to?(method_with_class)
+        method = show_column_override_name(column)
+        method if respond_to?(method)
       end
+      alias_method :show_column_override?, :show_column_override
 
       def override_show_column_ui?(list_ui)
         respond_to?(override_show_column_ui(list_ui))

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -10,7 +10,6 @@ module ActiveScaffold
       include ActiveScaffold::Helpers::ShowColumnHelpers
       include ActiveScaffold::Helpers::FormColumnHelpers
       include ActiveScaffold::Helpers::SearchColumnHelpers
-      include ActiveScaffold::Helpers::CountryHelpers
       include ActiveScaffold::Helpers::HumanConditionHelpers
 
       ##
@@ -73,7 +72,7 @@ module ActiveScaffold
       def form_remote_upload_tag(url_for_options = {}, options = {})
         options[:target] = action_iframe_id(url_for_options)
         options[:multipart] ||= true
-        options[:class] = "#{options[:class]} as_remote_upload".strip
+        options[:class] = "#{options[:class]} as_remote_upload".strip 
         output=""
         output << form_tag(url_for_options, options)
         (output << "<iframe id='#{action_iframe_id(url_for_options)}' name='#{action_iframe_id(url_for_options)}' style='display:none'></iframe>").html_safe
@@ -87,13 +86,13 @@ module ActiveScaffold
           ActiveScaffold::Config::Core.asset_path(name, frontend)
         end
       end
-
+      
       # Provides stylesheets to include with +stylesheet_link_tag+
       def active_scaffold_stylesheets(frontend = :default)
         [ActiveScaffold::Config::Core.asset_path("stylesheet.css", frontend)]
       end
 
-      # Provides stylesheets for IE to include with +stylesheet_link_tag+
+      # Provides stylesheets for IE to include with +stylesheet_link_tag+ 
       def active_scaffold_ie_stylesheets(frontend = :default)
         [ActiveScaffold::Config::Core.asset_path("stylesheet-ie.css", frontend)]
       end
@@ -122,7 +121,7 @@ module ActiveScaffold
       # You may also flag whether the other element is visible by default or not, and the initial text will adjust accordingly.
       def link_to_visibility_toggle(id, options = {})
         options[:default_visible] = true if options[:default_visible].nil?
-        options[:hide_label] = as_(:hide)
+        options[:hide_label] = as_(:hide) 
         options[:show_label] = as_(:show)
         javascript_tag("ActiveScaffold.create_visibility_toggle('#{id}', #{options.to_json});")
       end
@@ -134,39 +133,43 @@ module ActiveScaffold
       def render_action_link(link, url_options, record = nil, html_options = {})
         url_options = action_link_url_options(link, url_options, record)
         html_options = action_link_html_options(link, url_options, record, html_options)
-        action_link_html(link, url_options, html_options)
+        action_link_html(link, url_options, html_options, record)
       end
 
       def render_group_action_link(link, url_options, options, record = nil)
         if link.type == :member && !options[:authorized]
-          action_link_html(link, nil, {:class => "disabled #{link.action}#{link.html_options[:class].blank? ? '' : (' ' + link.html_options[:class])}"})
+          action_link_html(link, nil, {:class => "disabled #{link.action}#{link.html_options[:class].blank? ? '' : (' ' + link.html_options[:class])}"}, record)
         else
           render_action_link(link, url_options, record)
         end
       end
-
+      
       def action_link_url_options(link, url_options, record, options = {})
         url_options = url_options.clone
         url_options[:action] = link.action
-        url_options[:controller] = link.controller if link.controller
+        url_options[:controller] = link.controller.to_s if link.controller
         url_options.delete(:search) if link.controller and link.controller.to_s != params[:controller]
         url_options.merge! link.parameters if link.parameters
+        @link_record = record
+        url_options.merge! self.instance_eval(&(link.dynamic_parameters)) if link.dynamic_parameters.is_a?(Proc)
+        @link_record = nil
         url_options_for_nested_link(link.column, record, link, url_options, options) if link.nested_link?
         url_options_for_sti_link(link.column, record, link, url_options, options) unless record.nil? || active_scaffold_config.sti_children.nil?
         url_options[:_method] = link.method if !link.confirm? && link.inline? && link.method != :get
         url_options
       end
-
+      
       def action_link_html_options(link, url_options, record, html_options)
         link_id = get_action_link_id(url_options, record, link.column)
         html_options.reverse_merge! link.html_options.merge(:class => link.action)
 
-        # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails
+        # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails        
         html_options[:method] = link.method if link.method != :get
 
         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[:class] += ' as_action' if link.inline?
+        html_options['data-action'] = link.action if link.inline?
         if link.popup?
           html_options['data-popup'] = true
           html_options[:target] = '_blank'
@@ -187,17 +190,18 @@ module ActiveScaffold
         id = url_options[:id] || url_options[:parent_id]
         id = "#{column.association.name}-#{record.id}" if column && column.plural_association?
         if record.try(column.association.name.to_sym).present?
-          id = "#{column.association.name}-#{record.send(column.association.name).id}"
+          id = "#{column.association.name}-#{record.send(column.association.name).id}-#{record.id}"
         else
           id = "#{column.association.name}-#{record.id}" unless record.nil?
         end if column && column.singular_association?
+        id = "#{id}-#{url_options[:batch_scope].downcase}" if url_options[:batch_scope]
         action_id = "#{id_from_controller(url_options[:controller]) + '-' if url_options[:parent_controller]}#{url_options[:action].to_s}"
         action_link_id(action_id, id)
       end
-
-      def action_link_html(link, url, html_options)
+      
+      def action_link_html(link, url, html_options, record)
         # issue 260, use url_options[:link] if it exists. This prevents DB data from being localized.
-        label = url.delete(:link) if url.is_a?(Hash)
+        label = url.delete(:link) if url.is_a?(Hash) 
         label ||= link.label
         if link.image.nil?
           html = link_to(label, url, html_options)
@@ -205,11 +209,11 @@ module ActiveScaffold
           html = link_to(image_tag(link.image[:name] , :size => link.image[:size], :alt => label), url, html_options)
         end
         # if url is nil we would like to generate an anchor without href attribute
-        url.nil? ? html.sub(/href=".*?"/, '') : html
+        url.nil? ? html.sub(/href=".*?"/, '').html_safe : html.html_safe
       end
-
+      
       def url_options_for_nested_link(column, record, link, url_options, options = {})
-        if column && column.association
+        if column && column.association 
           url_options[:assoc_id] = url_options.delete(:id)
           url_options[:id] = record.send(column.association.name).id if column.singular_association? && record.send(column.association.name).present?
           link.eid = "#{controller_id.from(3)}_#{record.id}_#{column.association.name}" unless options.has_key?(:reuse_eid)
@@ -224,10 +228,15 @@ module ActiveScaffold
       def url_options_for_sti_link(column, record, link, url_options, options = {})
         #need to find out controller of current record type
         #and set parameters
-        sti_controller_path = controller_path_for_activerecord(record.class)
-        if sti_controller_path
-          url_options[:controller] = sti_controller_path
-          url_options[:parent_sti] = controller_path
+        # its quite difficult to detect an sti link
+        # if link.column.nil? we are sure that it is nt an singular association inline autolink
+        # howver that will not work if a sti parent is an singular association inline autolink
+        if link.column.nil?
+          sti_controller_path = controller_path_for_activerecord(record.class)
+          if sti_controller_path
+            url_options[:controller] = sti_controller_path
+            url_options[:parent_sti] = controller_path
+          end
         end
       end
 
@@ -240,13 +249,13 @@ module ActiveScaffold
         else
           classes << column.css_class
         end unless column.css_class.nil?
-
+         
         classes << 'empty' if column_empty? column_value
         classes << 'sorted' if active_scaffold_config.list.user.sorting.sorts_on?(column)
         classes << 'numeric' if column.column and [:decimal, :float, :integer].include?(column.column.type)
         classes.join(' ').rstrip
       end
-
+      
       def column_heading_class(column, sorting)
         classes = []
         classes << "#{column.name}-column_heading"
@@ -255,9 +264,15 @@ module ActiveScaffold
         classes.join(' ')
       end
 
+      def as_main_div_class
+        classes = ["active-scaffold", "active-scaffold-#{controller_id}", "#{params[:controller]}-view", "#{active_scaffold_config.theme}-theme"]
+        classes << "as_touch" if touch_device?
+        classes.join(' ')
+      end
+
       def column_empty?(column_value)
         empty = column_value.nil?
-        empty ||= column_value.empty? if column_value.respond_to? :empty?
+        empty ||= column_value.blank? if column_value.respond_to? :blank?
         empty ||= ['&nbsp;', active_scaffold_config.list.empty_field_text].include? column_value if String === column_value
         return empty
       end
@@ -287,11 +302,19 @@ module ActiveScaffold
       end
 
       def column_show_add_new(column, associated, record)
-        value = column.plural_association? || (column.singular_association? and not associated.empty?)
-        value = false unless record.class.authorized_for?(:crud_type => :create)
+        value = (column.plural_association? && !column.readonly_association?) || (column.singular_association? and not associated.empty?)
+        value = false unless column.association.klass.authorized_for?(:crud_type => :create)
         value
       end
+ 
+      def clean_column_name(name)
+        name.to_s.gsub('?', '')
+      end
 
+      def clean_class_name(name)
+        name.underscore.gsub('/', '_')
+      end
+     
       def active_scaffold_error_messages_for(*params)
         options = params.extract_options!.symbolize_keys
         options.reverse_merge!(:container_tag => :div, :list_type => :ul)

data/lib/active_scaffold/locale/de.yml

@@ -0,0 +1,111 @@
+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}"

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}"