cm-admin 1.5.44 → 1.5.45
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/README.md +1 -1
- data/app/assets/javascripts/cm_admin/form_validation.js +6 -2
- data/app/controllers/cm_admin/resource_controller.rb +2 -2
- data/app/views/cm_admin/main/_nested_table_form.html.slim +3 -3
- data/lib/cm_admin/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 316dde4d0d5c7b68e6c59d2efa5a26733b1139390467ff23ff71f3282b70d3d7
|
4
|
+
data.tar.gz: 32c8dbfde134f95955d8820b86bf877bbb0deb852469f9ca161fe0d9e6d868a1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a4658b4917b398600ed8fde369eb201a275db905fa0f901824029232e65c09b34ad3567c375d9294313a042c80bb9b6c22c055dd1cfa9b7b29abaced0b0d4b89
|
7
|
+
data.tar.gz: b5ce7a6a45f6d9482a97210ae5ff7b6cdce23bbab811f28cd97fd63af32b226cdc7e8a797a1576bbe6e77eb77083081111f08fb5ba2ebd952158d37a68d63885
|
data/Gemfile.lock
CHANGED
data/README.md
CHANGED
@@ -3,7 +3,7 @@ $(document).on("click", '[data-behaviour="form_submit"]', function (e) {
|
|
3
3
|
var submit = [];
|
4
4
|
var form_class = $(this).data("form-class");
|
5
5
|
$(
|
6
|
-
"." + form_class + " input.required, ." + form_class + " textarea.required"
|
6
|
+
"." + form_class + " input.required, ." + form_class + " textarea.required",
|
7
7
|
).each(function () {
|
8
8
|
$(this).removeClass("is-invalid");
|
9
9
|
if ($(this).val().trim().length === 0) {
|
@@ -14,7 +14,11 @@ $(document).on("click", '[data-behaviour="form_submit"]', function (e) {
|
|
14
14
|
});
|
15
15
|
$("." + form_class + " select.required").each(function () {
|
16
16
|
$(this).removeClass("is-invalid");
|
17
|
-
|
17
|
+
let selected_value = $(this).val();
|
18
|
+
if (!Array.isArray(selected_value)) {
|
19
|
+
selected_value = selected_value.trim();
|
20
|
+
}
|
21
|
+
if (selected_value.length === 0) {
|
18
22
|
$(this).parent().find("select").addClass("is-invalid");
|
19
23
|
$(this)[0].scrollIntoView(true);
|
20
24
|
submit.push(true);
|
@@ -332,9 +332,9 @@ module CmAdmin
|
|
332
332
|
def generate_nested_params(nested_table_field)
|
333
333
|
if nested_table_field.parent_field
|
334
334
|
ar_model = nested_table_field.parent_field.to_s.classify.constantize
|
335
|
-
table_name = ar_model.reflections[nested_table_field.field_name.to_s].klass.table_name
|
335
|
+
table_name = ar_model.reflections.with_indifferent_access[nested_table_field.field_name.to_s].klass.table_name
|
336
336
|
else
|
337
|
-
table_name = @model.ar_model.reflections[nested_table_field.field_name.to_s].klass.table_name
|
337
|
+
table_name = @model.ar_model.reflections.with_indifferent_access[nested_table_field.field_name.to_s].klass.table_name
|
338
338
|
end
|
339
339
|
column_names = table_name.to_s.classify.constantize.column_names
|
340
340
|
column_names = column_names.map {|column_name| column_name.gsub('_cents', '') }
|
@@ -1,5 +1,5 @@
|
|
1
1
|
- assoc_name = nested_table_field.field_name
|
2
|
-
- table_name = f.object._reflections[assoc_name
|
2
|
+
- table_name = f.object._reflections.with_indifferent_access[assoc_name].klass.table_name.to_sym
|
3
3
|
- if nested_table_field.display_type == :table
|
4
4
|
.nested-field-wrapper data-table-name=assoc_name data-model-name=assoc_name.to_s.classify
|
5
5
|
/ label.field-label = nested_table_field.label.to_s.titleize
|
@@ -18,7 +18,7 @@
|
|
18
18
|
= f.fields_for table_name do |record|
|
19
19
|
- if record.object.persisted? || @ar_object.errors.present?
|
20
20
|
= render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, nested_table_field: nested_table_field }
|
21
|
-
- if f.object._reflections[assoc_name.to_s]&.macro == :has_many && nested_table_field.is_creatable.call(f.object)
|
21
|
+
- if f.object._reflections.with_indifferent_access[assoc_name.to_s]&.macro == :has_many && nested_table_field.is_creatable.call(f.object)
|
22
22
|
.nested-table-footer
|
23
23
|
= link_to_add_association "#{nested_table_field.submit_text}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options: {locals: { assoc_name: assoc_name, nested_table_field: nested_table_field }}, data: { association_insertion_node: ".insert-cocoon-position-#{uniq_no}", association_insertion_method: 'append' }, class: 'btn-primary'
|
24
24
|
- else
|
@@ -28,6 +28,6 @@
|
|
28
28
|
= f.fields_for table_name do |record|
|
29
29
|
- if record.object.persisted?
|
30
30
|
= render partial: '/cm_admin/main/nested_fields', locals: { f: record, assoc_name: assoc_name, nested_table_field: nested_table_field }
|
31
|
-
- if f.object._reflections[assoc_name.to_s]&.macro == :has_many
|
31
|
+
- if f.object._reflections.with_indifferent_access[assoc_name.to_s]&.macro == :has_many
|
32
32
|
.links.mt-3
|
33
33
|
= link_to_add_association "#{nested_table_field.submit_text}", f, table_name, partial: '/cm_admin/main/nested_fields', render_options: {locals: { assoc_name: assoc_name, nested_table_field: nested_table_field }}, class: 'd-inline-block btn-primary mt-2'
|
data/lib/cm_admin/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cm-admin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.5.
|
4
|
+
version: 1.5.45
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Michael
|
@@ -14,7 +14,7 @@ authors:
|
|
14
14
|
autorequire:
|
15
15
|
bindir: exe
|
16
16
|
cert_chain: []
|
17
|
-
date: 2024-08-
|
17
|
+
date: 2024-08-16 00:00:00.000000000 Z
|
18
18
|
dependencies:
|
19
19
|
- !ruby/object:Gem::Dependency
|
20
20
|
name: caxlsx_rails
|