Merge 385c444 into fbf4eb3

shirasagi · Oct 27, 2023 · c075d9f · c075d9f
2 parents fbf4eb3 + 385c444
commit c075d9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/app/assets/javascripts/cms/lib/syntax_checker.js.erb b/app/assets/javascripts/cms/lib/syntax_checker.js.erb
@@ -469,6 +469,10 @@ this.Syntax_Checker = (function () {
       Syntax_Checker.afterCheck();
     }
 
+    if (Syntax_Checker.errors.length == 1 && Syntax_Checker.errors[0]['msg'] == "<%= I18n.t('cms.confirm.disallow_edit_ignore_syntax_check') %>") {
+      Syntax_Checker.reset();
+    }
+
     Syntax_Checker.resultBox.showResult(checks, Syntax_Checker.errors);
   }
 

diff --git a/app/models/cms/syntax_checker.rb b/app/models/cms/syntax_checker.rb
@@ -72,7 +72,7 @@ def check(cur_site:, cur_user:, contents:)
       end
     end
 
-    if !context.errors.empty? && !cur_user.cms_role_permit_any?(cur_site, "edit_cms_ignore_syntax_check")
+    if !cur_user.cms_role_permit_any?(cur_site, "edit_cms_ignore_syntax_check")
       context.errors << {
         msg: I18n.t('cms.confirm.disallow_edit_ignore_syntax_check')
       }