[fix] undefined sanitize_to_id (#3919)

* [fix] undefined sanitize_to_id * [fix] undefined archive_view * [fix] undefined show_captcha * [ci] * [ci] * [fix] setting global variable * [ci] specify the font * [ci] remove comment out * [modify] rubocop * [modify] Rename variable -> use_no_archive_html Co-authored-by: Uetani <satoshi.0411@icloud.com>
shirasagi · Jun 3, 2021 · 2be8b5b · 2be8b5b
1 parent 6fbc125
commit 2be8b5b
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -25,6 +25,7 @@ addons:
   apt:
     packages:
       - imagemagick
+      - ghostscript
       - libmagick++-dev
       - sox
       - libsox-dev

diff --git a/app/controllers/cms/node/confs_controller.rb b/app/controllers/cms/node/confs_controller.rb
@@ -1,7 +1,6 @@
 class Cms::Node::ConfsController < ApplicationController
   include Cms::BaseFilter
   include Cms::NodeFilter
-  include SS::CaptchaFilter
 
   model Cms::Node
 

diff --git a/app/controllers/concerns/ss/base_filter.rb b/app/controllers/concerns/ss/base_filter.rb
@@ -3,6 +3,7 @@ module SS::BaseFilter
   include SS::AuthFilter
   include SS::LayoutFilter
   include SS::ExceptionFilter
+  include SS::CaptchaFilter
   include History::LogFilter
 
   included do

diff --git a/app/models/cms/node.rb b/app/models/cms/node.rb
@@ -73,6 +73,8 @@ class Archive
     include History::Addon::Backup
 
     default_scope ->{ where(route: "cms/archive") }
+
+    self.use_no_archive_html = false
   end
 
   class GroupPage

diff --git a/app/models/concerns/cms/addon/list.rb b/app/models/concerns/cms/addon/list.rb
@@ -8,6 +8,7 @@ module Model
     included do
       cattr_accessor(:use_no_items_display, instance_accessor: false) { true }
       cattr_accessor(:use_substitute_html, instance_accessor: false) { true }
+      cattr_accessor(:use_no_archive_html, instance_accessor: false) { true }
       cattr_accessor(:use_upper_html, instance_accessor: false) { true }
       cattr_accessor(:use_lower_html, instance_accessor: false) { true }
       cattr_accessor(:use_loop_html, instance_accessor: false) { true }

diff --git a/app/models/ss/captcha.rb b/app/models/ss/captcha.rb
@@ -11,12 +11,13 @@ class SS::Captcha
   class << self
     def generate_captcha
       Dir.mktmpdir do |dir|
-        captcha_text = sprintf("%04d", rand(10_000))
+        captcha_text = format("%04d", rand(10_000))
         MiniMagick::Tool::Convert.new do |convert|
           convert.size "100x28"
           convert.background "white"
           convert.fill "darkblue"
           convert.wave "1x88"
+          convert.font "C059-Bold"
           convert.implode "0.2"
           convert.pointsize "22"
           convert.gravity "Center"

diff --git a/app/views/cms/agents/addons/page_list/_show.html.erb b/app/views/cms/agents/addons/page_list/_show.html.erb
@@ -5,7 +5,7 @@
   <dt><%= @model.t :conditions %></dt>
   <dd><%=br @item.conditions %></dd>
 
-  <% if @item.archive_view == "list" %>
+  <% if @model.use_no_archive_html %>
     <dt><%= @model.t :sort %></dt>
     <dd>
       <%=

diff --git a/app/views/inquiry/agents/addons/captcha/_form.html.erb b/app/views/inquiry/agents/addons/captcha/_form.html.erb
@@ -1,9 +1,7 @@
 <%= jquery do %>
-  $(function(){
-    $(".simple-captcha").hide()
-    $("button").on("click", function(){
-      $(".simple-captcha").toggle();
-    });
+  $(".simple-captcha").hide()
+  $("button").on("click", function(){
+    $(".simple-captcha").toggle();
   });
 <% end %>
 

diff --git a/app/views/inquiry/agents/addons/captcha/_show.html.erb b/app/views/inquiry/agents/addons/captcha/_show.html.erb
@@ -1,9 +1,7 @@
 <%= jquery do %>
-  $(function(){
-    $(".simple-captcha").hide()
-    $("button").on("click", function(){
-      $(".simple-captcha").toggle();
-    });
+  $(".simple-captcha").hide()
+  $("button").on("click", function(){
+    $(".simple-captcha").toggle();
   });
 <% end %>
 

diff --git a/lib/ss/helpers/file_form_builder.rb b/lib/ss/helpers/file_form_builder.rb
@@ -1,5 +1,6 @@
 module SS::Helpers::FileFormBuilder
   extend ActiveSupport::Concern
+  include ActionView::Helpers::FormTagHelper
 
   def ss_file_field(method, options = {})
     ss_mode = @template.instance_variable_get(:"@ss_mode")