From b84234b38598dda053d233e7aeadbefe01e6dbe0 Mon Sep 17 00:00:00 2001
From: chiu <naruto0426@rulingcom.com>
Date: Sun, 26 Apr 2020 00:26:16 +0800
Subject: [PATCH] fix error

---
 app/controllers/personal_patents_controller.rb | 4 +++-
 app/views/admin/patents/merge.html.erb         | 2 +-
 modules/personal_patent/index_search1.html.erb | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/controllers/personal_patents_controller.rb b/app/controllers/personal_patents_controller.rb
index 984b618..69efc8b 100644
--- a/app/controllers/personal_patents_controller.rb
+++ b/app/controllers/personal_patents_controller.rb
@@ -95,13 +95,15 @@ class PersonalPatentsController < ApplicationController
     choice = choice.map { |value| value.inject :merge }
     select_text = t('personal_patent.search_class')
     search_text = t('personal_patent.word_to_search')
+    csrf_value = (0...46).map { ('a'..'z').to_a[rand(26)] }.join
     {
       'patents' => patent_list,
       'extras' => { 'widget-title' => t('module_name.personal_patent'),
                     'url' => '/' + params[:locale] + params[:url],
                     'select_text' => select_text,
                     'search_text' => search_text,
-                    'search_value' => params[:keywords] },
+                    'search_value' => params[:keywords],
+                    'csrf_value' => csrf_value },
       'headers' => headers,
       'total_pages' => patents_total_pages,
       'choice' => choice
diff --git a/app/views/admin/patents/merge.html.erb b/app/views/admin/patents/merge.html.erb
index 432038d..b7e5fe7 100644
--- a/app/views/admin/patents/merge.html.erb
+++ b/app/views/admin/patents/merge.html.erb
@@ -61,7 +61,7 @@ function change_mode(){
      end
   %>
   <td rowspan="<%= len %>">
-    <%= key[0].values.map{|v| v=="" ? t('personal_patent.no_input') : v}.join('/') %>
+    <%= key[0].values.map{|v| v=="" ? t('personal_patent.no_input') : v}.join('/') rescue t('personal_patent.no_input') %>
   </td>
   <td rowspan="<%= len %>">
     <%= key[1] %>
diff --git a/modules/personal_patent/index_search1.html.erb b/modules/personal_patent/index_search1.html.erb
index 82f45a1..856793b 100644
--- a/modules/personal_patent/index_search1.html.erb
+++ b/modules/personal_patent/index_search1.html.erb
@@ -11,8 +11,9 @@ $( ".selectbox" ).ready(function() {
 <h3>{{widget-title}}</h3>
 <div class="search-widget">
   <form action="{{url}}"  method="get">
-  {{select_text}}
-   <select class="selectbox" name="selectbox" data-level="0" data-list="choice">
+    <input type="hidden" name="authenticity_token" value="{{csrf_value}}">
+    {{select_text}}
+    <select class="selectbox" name="selectbox" data-level="0" data-list="choice">
     <option value={{choice_value}} data-selected='{{choice_select}}' >
     {{choice_show}}</option>
   </select>