fix issue with usage page and tinymce on template customization for Ruby 3 and Tinymce 6

briri · briri · commit 6dd914a0593e · 2023-04-13T09:44:41.000-07:00
diff --git a/app/javascript/src/orgAdmin/phases/newEdit.js b/app/javascript/src/orgAdmin/phases/newEdit.js
@@ -81,7 +81,7 @@ $(() => {
         },
       });
 
-      const questionForm = $(selector).find('.question_form');
+      const questionForm = $(`#${selector}`).find('.question_form');
       if (questionForm.length > 0) {
         initQuestion(selector);
       }
diff --git a/app/services/org/monthly_usage_service.rb b/app/services/org/monthly_usage_service.rb
@@ -34,7 +34,7 @@ def reducer_body(acc, rec, key_target)
         else
           args = { month: month }
           args[key_target] = count
-          acc[month] = build_model(args)
+          acc[month] = build_model(**args)
         end
 
         acc

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ $(() => {`
`81`	`81`	`},`
`82`	`82`	`});`
`83`	`83`
`84`		`- const questionForm = $(selector).find('.question_form');`
	`84`	+ const questionForm = $(`#${selector}`).find('.question_form');
`85`	`85`	`if (questionForm.length > 0) {`
`86`	`86`	`initQuestion(selector);`
`87`	`87`	`}`