active_scaffold 3.6.1 → 3.6.4.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f4c1c30d71374c44ba52365fd42ce5e355d0a247581d210098efe40ac62f1b61
4
- data.tar.gz: ca952b27376c9a12b12b3e9bcfde73c33fd0976f4e3490a3a3d1c2a97d1db0bd
3
+ metadata.gz: 335d7ad205e19c251d006398597bad619cc5499efa8a0815017cf27aa5df0b65
4
+ data.tar.gz: 940135dfbc68e1c3d70aa02132a3d9f3873162dc4964b6d9cdc04a2b73feed97
5
5
  SHA512:
6
- metadata.gz: 72400accea68b295f7b8fe5b1da561d98111d7026a8f63062fe6cec0d949cc9f93108231e09f443214f4079698aba0e1ab0b736df1e0a611b6c1289713516847
7
- data.tar.gz: 46e0658d19bf28f6f71a01a540fdb98cae584d8d72153f828e30c68ff92c8723e72c19bc22e99981082faed49455ca8768f6416a2e6366f4a6b0b29552b9ab2c
6
+ metadata.gz: 436fed807f06fb66d908dd913a54f06173fb7304ebbb59ea15c0952165570c6fd16ba243794dc147140445beb9e03e9f6e28ca9564d5bedb402f28e2dbdd565e
7
+ data.tar.gz: 7dec63250eee9943823e9ffc14fd45ac7dd2edb5aef15f901a564ba0bc60101b93a41cfca09e58dd29936ef7aebe3e534adb9cfb850abdeb21bb88b7567b028d
data/CHANGELOG.rdoc CHANGED
@@ -1,3 +1,19 @@
1
+ = 3.6.4.1
2
+ - Actually fix country_select bridge for latest gem version
3
+
4
+ = 3.6.4
5
+ - Fix country_select bridge for latest gem version
6
+
7
+ = 3.6.3
8
+ - Fix search on nested or embedded lists with rails_ujs
9
+ - Fix inplace edit when collection action link opens a view with table and th
10
+
11
+ = 3.6.2
12
+ - Fix count query when association's primary key is string
13
+ - Fix unauthorized_columns and constraint_columns with threadsafe enabled
14
+ - Fix changing list.sorting and column.sort_by per request when threadsafe is enabled
15
+
16
+ = 3.6.1
1
17
  - Display group cols vertically when subform layout is vertical
2
18
  - Fix html attributes for input datetime on field search, when jquery ui is not used
3
19
  - Fix constraint columns for nested list on through assocaitions
@@ -32,7 +48,7 @@
32
48
  - Display loading indicator at bottom on auto pagination
33
49
  - List rendering speed up
34
50
  - Remove font family from CSS, it was preventing from changing it easily in body
35
- - Fix search for mongoid models in with threadsafety enabled
51
+ - Fix search for mongoid models with threadsafety enabled
36
52
  - Keep nested params after calling render_field for column in subform
37
53
  - Fix nested for controllers without list action (for example, for nested create on singular assocations)
38
54
  - Fix delayed setup issues with threads
data/README.md CHANGED
@@ -9,7 +9,7 @@ Overview
9
9
  [![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
10
10
  [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
11
11
 
12
- ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control. Rails >= 4.2.0 and Rails < 6.1 is supported, ruby >= 2.3 required.
12
+ ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control. Rails >= 4.2.0 and Rails <= 6.1 is supported, ruby >= 2.3 required.
13
13
 
14
14
  Branch Details
15
15
  --------------
@@ -1024,7 +1024,7 @@ var ActiveScaffold = {
1024
1024
 
1025
1025
  if (my_parent.is('td')) {
1026
1026
  var column_no = my_parent.prevAll('td').length;
1027
- column_heading = my_parent.closest('.active-scaffold').find('th:eq(' + column_no + ')');
1027
+ column_heading = my_parent.closest('table').find('th:eq(' + column_no + ')');
1028
1028
  } else if (my_parent.is('th')) {
1029
1029
  column_heading = my_parent;
1030
1030
  }
@@ -9,8 +9,16 @@
9
9
  data: {loading: true},
10
10
  method: :get
11
11
  }
12
+
13
+ hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
12
14
  -%>
15
+
13
16
  <%= form_tag url_options, options %>
17
+ <% hidden_params.each do |pair| -%>
18
+ <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
19
+ <%= hidden_field_tag(key, value) %>
20
+ <% end -%>
21
+
14
22
  <ol class="form">
15
23
  <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search) %>
16
24
  <% visibles.each do |column| -%>
@@ -10,8 +10,15 @@
10
10
  data: {loading: true},
11
11
  method: :get
12
12
  }
13
+
14
+ hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
13
15
  -%>
16
+
14
17
  <%= form_tag url_options, options do %>
18
+ <% hidden_params.each do |pair| -%>
19
+ <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
20
+ <%= hidden_field_tag(key, value) %>
21
+ <% end -%>
15
22
  <%= search_field_tag :search, (search_params if search_params.is_a? String), :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
16
23
  <%= submit_tag as_(submit_text), :class => "submit", :style => ('display:none;' if live_search) %>
17
24
  <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} unless local_assigns[:skip_reset] %>
@@ -161,7 +161,7 @@ module ActiveScaffold::Actions
161
161
 
162
162
  def count_query_on_association_class(column)
163
163
  key = column.association.primary_key || :id
164
- query = column.association.klass.where(column.association.foreign_key => @records.map(&key))
164
+ query = column.association.klass.where(column.association.foreign_key => @records.map(&key.to_sym))
165
165
  if column.association.as
166
166
  query.where!(column.association.reverse_association.foreign_type => active_scaffold_config.model.name)
167
167
  end
@@ -2,7 +2,8 @@ module ActiveScaffold::Bridges
2
2
  class CountrySelect
3
3
  module FormColumnHelpers
4
4
  def active_scaffold_input_country(column, options)
5
- select_options = {:prompt => as_(:_select_), :priority_countries => column.options[:priority] || [:us], :format => column.options[:format]}
5
+ select_options = {:prompt => as_(:_select_), :priority_countries => column.options[:priority] || [:us]}
6
+ select_options[:format] = column.options[:format] if column.options[:format]
6
7
  select_options.merge!(options)
7
8
  options.reverse_merge!(column.options).except!(:prompt, :priority, :format)
8
9
  active_scaffold_select_name_with_multiple options
@@ -292,7 +292,7 @@ module ActiveScaffold::Config
292
292
  @_sorting = sorting
293
293
  else
294
294
  @_sorting = default_sorting
295
- @_sorting.set(@sorting) if @sorting
295
+ @_sorting.set(*@sorting) if @sorting
296
296
  if @conf.columns.constraint_columns.present?
297
297
  @_sorting.constraint_columns = @conf.columns.constraint_columns
298
298
  end
@@ -124,7 +124,7 @@ module ActiveScaffold::DataStructures
124
124
  end
125
125
 
126
126
  def action_name
127
- @action.class.name.demodulize.underscore
127
+ @action.user_settings_key
128
128
  end
129
129
 
130
130
  def columns_key
@@ -18,10 +18,6 @@ module CowProxy
18
18
  end
19
19
  super
20
20
  end
21
-
22
- def sort_by(options)
23
- @sort = options
24
- end
25
21
  end
26
22
 
27
23
  class Set < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::Set)
@@ -2,7 +2,7 @@ module ActiveScaffold
2
2
  module Version
3
3
  MAJOR = 3
4
4
  MINOR = 6
5
- PATCH = 1
5
+ PATCH = '4.1'
6
6
 
7
7
  STRING = [MAJOR, MINOR, PATCH].compact.join('.')
8
8
  end
@@ -5,7 +5,7 @@ require 'test_helper'
5
5
  class ActionColumnsTest < MiniTest::Test
6
6
  def setup
7
7
  @columns = ActiveScaffold::DataStructures::ActionColumns.new(%i[a b])
8
- @columns.action = stub(:core => stub(:model_id => 'model_stub'))
8
+ @columns.action = stub(core: stub(model_id: 'model_stub'), user_settings_key: :"model_stub_active_scaffold/config/test")
9
9
  end
10
10
 
11
11
  def test_label
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active_scaffold
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6.1
4
+ version: 3.6.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Many, see README
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-04-29 00:00:00.000000000 Z
11
+ date: 2022-02-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
475
475
  - !ruby/object:Gem::Version
476
476
  version: '0'
477
477
  requirements: []
478
- rubygems_version: 3.0.8
478
+ rubygems_version: 3.0.9
479
479
  signing_key:
480
480
  specification_version: 4
481
481
  summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery