active_scaffold 3.4.4 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ef74ce45fee06f01b9150802312b245e2eb226
-  data.tar.gz: 7be6ae4331a71c54488362305825ca222dc39d05
+  metadata.gz: 9f474117432310ae21c926433541aa5849b9303b
+  data.tar.gz: 1ebb3ec0f64123d0afc586b4015e29a4d634a294
 SHA512:
-  metadata.gz: 7f30bfe3a5091311f0f03a0a9b74b2fdf92f0237bedd728020c32a818d6eb6fd5acb08c77ecbb948487bab097b79d5c17e7b8928021a72125531f086fd6f7041
-  data.tar.gz: a99a94a0321aaabda253e299d9eec2acc37ea7519db77ce8b1f3e843949b62316983d5523093b636b1dbd490e5b2ec970ba79c5cc6ce773472b3510657da596a
+  metadata.gz: 33bfb4cd1023bc82fe3c2974f4725794688b8a96e11033c62081f16dce820e6d31ae09a321949e70605312aa51d87c17a60c373378b9fda71079512803e418f3
+  data.tar.gz: 1f351e2a0d0e5b49cfb952c6763fb0ecd826cc91788ddd8c4cb7c6999a2e02ccdee0f7e1867c730ce09f27029de4e9655a39b3da13d4812d363d14cdb24c322a

data/CHANGELOG

@@ -1,4 +1,10 @@
-= 3.4.4 (not released yet)
+= 3.4.5
+- Fix default sorting on ruby 1.8
+- Fix add existing button, broken on 3.4.4
+- add active_scaffold_checkbox_option so rendering li of checkbox_list can be overrided
+- Fix set_parent for render field on main form columns
+
+= 3.4.4
 - Fix set_parent for render field on blank records added by default on subforms
 - Enable sorting on selected draggable list, so it can be used on config_list
 - Remove unfinished nested_auto_open feature, it was working only if render_component is used, which is not recommended way

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

@@ -433,7 +433,7 @@ var ActiveScaffold = {
     jQuery('.as-js-button', element).show();
   },
   load_embedded: function(element) {
-    $('.active-scaffold-component .load-embedded', element).each(function(index, item) {
+    jQuery('.active-scaffold-component .load-embedded', element).each(function(index, item) {
       item = jQuery(item);
       item.closest('.active-scaffold-component').load(item.attr('href'), function() {
         jQuery(this).trigger('as:element_updated');

data/app/views/active_scaffold_overrides/_form_association_footer.html.erb

@@ -41,7 +41,7 @@ add_new_url = params_for(:controller => controller_path, :action => 'edit_associ
            add_existing_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || temporary_id || 99999999999)}-add-existing"
            add_existing_label = column.plural_association? ? :add_existing : :replace_existing %>
         <%= select_tag 'associated_id', '<option value="">'.html_safe + as_(:_select_) + '</option>'.html_safe + select_options %>
-        <%= link_to as_(add_existing_label), edit_associated_url, :id => add_existing_id, :remote => true, :class=> "subform-button as_#{add_existing_label}", :style => "display: none;" %>
+        <%= link_to as_(add_existing_label), edit_associated_url, :id => add_existing_id, :remote => true, :class=> "as-js-button as_#{add_existing_label}", :style => "display: none;" %>
       <% end -%>
     <% end -%>
   </div>

data/app/views/active_scaffold_overrides/on_action_update.js.erb

@@ -11,7 +11,7 @@
     <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% else %>
     <% if @action_link.try(:position) %>
-      ActiveScaffold.find_action_link('<%= element_row_id(:action => action_name) %>').close();
+      ActiveScaffold.find_action_link('<%= element_form_id(:action => action_name) %>').close();
     <% end %>
     <%= render :partial => 'refresh_list' %>
   <% end %>

data/config/locales/de.yml

@@ -24,8 +24,6 @@ de:
     click_to_edit: "Zum Editieren anklicken"
     click_to_reset: Reset
     close: Schließen
-    config_list: Konfigurieren
-    config_list_model: "Konfiguriere Spalten für %{model}"
     contains: Enthält
     create: Anlegen
     create_another: "Weitere anlegen"

data/config/locales/en.yml

@@ -24,8 +24,6 @@ en:
     click_to_edit: "Click to edit"
     click_to_reset: "Click to reset"
     close: Close
-    config_list: Configure
-    config_list_model: "Configure Columns for %{model}"
     contains: Contains
     create: Create
     create_another: "Create Another %{model}"

data/config/locales/es.yml

@@ -24,8 +24,6 @@ es:
     click_to_edit: "Pulsa para editar"
     click_to_reset: "Pulsa para restaurar"
     close: Cerrar
-    config_list: Configurar
-    config_list_model: "Configurar columnas de %{model}"
     contains: Contiene
     create: Crear
     create_another: "Crear Otro %{model}"

data/config/locales/fr.yml

@@ -24,8 +24,6 @@ fr:
     click_to_edit: "Cliquer pour éditer"
     click_to_reset: "Cliquer pour ré-initialiser"
     close: Fermer
-    config_list: Configurer
-    config_list_model: "Configurer les colonnes pour %{model}"
     contains: Contient
     create: Créer
     create_another: "Créer un autre %{model}"

data/config/locales/hu.yml

@@ -24,8 +24,6 @@ hu:
     click_to_edit: "Kattints a szerkesztéshez"
     click_to_reset: "Kattints az alapállapothoz"
     close: Bezárás
-    config_list: Configure
-    config_list_model: "Configure Columns for %{model}"
     contains: Contains
     create: Létrehozás
     create_another: "Create Another %{model}"

data/config/locales/ja.yml

@@ -24,8 +24,6 @@ ja:
     click_to_edit: クリックして編集
     click_to_reset: "Click to reset"
     close: 閉じる
-    config_list: Configure
-    config_list_model: "Configure Columns for %{model}"
     contains: Contains
     create: 作成
     create_another: "Create Another %{model}"

data/config/locales/ru.yml

@@ -22,8 +22,6 @@ ru:
     click_to_edit: "Нажмите для редактирования"
     click_to_reset: "Нажмите для сброса"
     close: Закрыть
-    config_list: "Настройки списка"
-    config_list_model: "%{model}: настройки списка"
     contains: Содержит
     create: Создать
     create_another: "%{model}: Создать другую запись"

data/lib/active_scaffold/actions/core.rb

@@ -83,7 +83,7 @@ module ActiveScaffold::Actions
           @record.send "#{@column.name}=", value
           @record.id = params[:id]
         end
-        set_parent(@record) if @record.id.nil? && params[:parent_controller]
+        set_parent(@record) if @record.id.nil? && params[:parent_controller] && @scope
         
         after_render_field(@record, @column)
       end

data/lib/active_scaffold/data_structures/sorting.rb

@@ -17,7 +17,7 @@ module ActiveScaffold::DataStructures
 
       # fallback to setting primary key ordering
       if model.column_names.include?(model.primary_key)
-        set(model.primary_key, 'ASC')
+        set([model.primary_key, 'ASC'])
         @sorting_by_primary_key = clause
       end
       # If an ORDER BY clause is found set default sorting according to it

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -299,24 +299,26 @@ module ActiveScaffold
         html = if select_options.empty?
           content_tag(:span, as_(:no_options), :class => "#{options[:class]} no-options", :id => options[:id])
         else
-          method = column.options[:label_method] || :to_label
-          active_scaffold_checkbox_list(column, select_options.collect {|r| [r.send(method), r.id]}, associated_options.collect(&:id), options)
+          active_scaffold_checkbox_list(column, select_options, associated_options.collect(&:id), options)
         end
         html << active_scaffold_refresh_link(column, options, record) if column.options[:refresh_link]
         html
       end
+
+      def active_scaffold_checkbox_option(option, label_method, associated_ids, checkbox_options, li_options = {})
+        content_tag(:li, li_options) do 
+          check_box_tag(checkbox_options[:name], option.id, associated_ids.include?(option.id), checkbox_options) <<
+          content_tag(:label, option.send(label_method), :for => checkbox_options[:id])
+        end
+      end
       
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options)
+        label_method = column.options[:label_method] || :to_label
         html = hidden_field_tag("#{options[:name]}[]", '', :id => nil)
         html << content_tag(:ul, options.merge(:class => "#{options[:class]} checkbox-list#{' draggable-lists' if column.options[:draggable_lists]}")) do
           content = ''.html_safe
           select_options.each_with_index do |option, i|
-            label, id = option
-            this_id = "#{options[:id]}_#{i}_id"
-            content << content_tag(:li) do 
-              check_box_tag("#{options[:name]}[]", id, associated_ids.include?(id), :id => this_id) <<
-              content_tag(:label, h(label), :for => this_id)
-            end
+            content << active_scaffold_checkbox_option(option, label_method, associated_ids, :name => "#{options[:name]}[]", :id => "#{options[:id]}_#{i}_id")
           end
           content
         end

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.4
+  version: 3.4.5
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda