harrybomrah
/
personal-project
forked from saurabh/personal-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error

This commit is contained in:
chiu 2020-04-26 00:19:05 +08:00
parent 879d849f87
commit b1dac37682
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/personal_projects_controller.rb
View File

@ -88,6 +88,7 @@ class PersonalProjectsController < ApplicationController
choice = choice.map { |value| value.inject :merge } choice = choice.map { |value| value.inject :merge }
select_text = t('personal_project.search_class') select_text = t('personal_project.search_class')
search_text = t('personal_project.word_to_search') search_text = t('personal_project.word_to_search')
csrf_value = (0...46).map { ('a'..'z').to_a[rand(26)] }.join
{ {
'projects' => project_list, 'projects' => project_list,
'headers' => headers, 'headers' => headers,
@ -95,7 +96,8 @@ class PersonalProjectsController < ApplicationController
'url' => '/' + params[:locale] + params[:url], 'url' => '/' + params[:locale] + params[:url],
'select_text' => select_text, 'select_text' => select_text,
'search_text' => search_text, 'search_text' => search_text,
'search_value' => params[:keywords] }, 'search_value' => params[:keywords],
'csrf_value' => csrf_value },
'total_pages' => projects_total_pages, 'total_pages' => projects_total_pages,
'choice' => choice 'choice' => choice
} }

4
app/views/admin/projects/merge.html.erb
View File

@ -61,10 +61,10 @@ function change_mode(){
end end
%> %>
<td rowspan="<%= len %>"> <td rowspan="<%= len %>">
<%= key[0].values.map{|v| v=="" ? t('personal_project.no_input') : v}.join('/') %> <%= key[0].values.map{|v| v=="" ? t('personal_project.no_input') : v}.join('/') rescue t('personal_project.no_input') %>
</td> </td>
<td rowspan="<%= len %>"> <td rowspan="<%= len %>">
<%= key[1].values.map{|v| v=="" ? t('personal_project.no_input') : v}.join('/') %> <%= key[1].values.map{|v| v=="" ? t('personal_project.no_input') : v}.join('/') rescue t('personal_project.no_input') %>
</td> </td>
<% if params['mode']=='simple' %> <% if params['mode']=='simple' %>
<td rowspan="<%= len %>"> <td rowspan="<%= len %>">

5
modules/personal_project/index_search1.html.erb
View File

@ -11,8 +11,9 @@ $( ".selectbox" ).ready(function() {
<h3>{{widget-title}}</h3> <h3>{{widget-title}}</h3>
<div class="search-widget"> <div class="search-widget">
<form action="{{url}}" method="get"> <form action="{{url}}" method="get">
{{select_text}} <input type="hidden" name="authenticity_token" value="{{csrf_value}}">
<select class="selectbox" name="selectbox" data-level="0" data-list="choice"> {{select_text}}
<select class="selectbox" name="selectbox" data-level="0" data-list="choice">
<option value={{choice_value}} data-selected='{{choice_select}}' > <option value={{choice_value}} data-selected='{{choice_select}}' >
{{choice_show}}</option> {{choice_show}}</option>
</select> </select>