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

Merge branch 'master' into 'master' 

fix search error



See merge request !5
This commit is contained in:
wmcheng 2019-11-18 15:33:26 +08:00
parent 4837a0df84 a9ea5102ac
commit a70abccae1
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/personal_projects_controller.rb
View File

@ -29,6 +29,10 @@ class PersonalProjectsController < ApplicationController
projects_show = projects_temp.select { |value| search_all_words(t(value.send('language')), params[:keywords]) } projects_show = projects_temp.select { |value| search_all_words(t(value.send('language')), params[:keywords]) }
when 'participator' when 'participator'
projects_show = projects_temp.select { |value| search_all_words(get_authors_text(value), params[:keywords]) } projects_show = projects_temp.select { |value| search_all_words(get_authors_text(value), params[:keywords]) }
when 'abstract'
projects_show = projects_temp.select { |value| search_all_words(Nokogiri::HTML(value.abstract).text, params[:keywords]) }
when 'note'
projects_show = projects_temp.select { |value| search_all_words(Nokogiri::HTML(value.note).text, params[:keywords]) }
else else
projects_show = projects_temp.select { |value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords]) } projects_show = projects_temp.select { |value| search_all_words(value.send(params[:selectbox]).to_s, params[:keywords]) }
end end

12
app/views/admin/projects/index.html.erb
View File

@ -1,17 +1,7 @@
<script src="https://kit.fontawesome.com/1fa49cfdc9.js" crossorigin="anonymous"></script> <script src="https://kit.fontawesome.com/1fa49cfdc9.js" crossorigin="anonymous"></script>
<script> <script>
function MergeUrl(){ function MergeUrl(){
var temp_url = location.href location.href = '<%= merge_admin_projects_path %>'
if (temp_url.search("locale=")!=-1){
var tp=temp_url.lastIndexOf('/')
location.href = temp_url.substring(0,tp+1)+"merge/"+temp_url.substring(tp+1)
}
else if (temp_url.slice(-1)=='/'){
location.href = location.href + "merge"
}
else{
location.href = location.href + "/merge"
}
} }
</script> </script>
<table class="table main-list"> <table class="table main-list">