Merge branches 'projects_search' and 'user_based_+_sortable_favs'

# Conflicts:
#	app/assets/stylesheets/favorites.scss
This commit is contained in:
Pfingstfrosch
2020-05-29 15:48:58 +02:00
8 changed files with 148 additions and 0 deletions
@@ -1,13 +1,42 @@
class Crawlers::ProjectsCrawlerController < Crawlers::TissCrawlerController
def show_basic
params[:api] = '/api/search/projectFullSearch/v1.0/projects'
params[:search_parameter] = 'searchterm'
puts params[:search_context]
@host = TissCrawler.get_host
# TissCrawler performs general search over the available projects
@projects = TissCrawler.search(params)
end
def show_detail
params[:api] = '/api/pdb/rest/project/v2/'
@id = params[:id]
puts params
# TissCrawler fetches the project's detail information
@project = TissCrawler.get_project_details(params)
# Host is needed for image rendering
@host = TissCrawler.get_host
end
def add_to_fav
params[:api] = '/api/pdb/rest/project/v2/'
puts params[:id]
@project = TissCrawler.get_project_details(params)
# create stores the object to the db after creation
favorite_hash = {id: params[:id],
# the user who is currently active
user_id: current_user.id,
title: @project['titleDe']}
if FavoriteProject.create(favorite_hash).valid?
FavoriteProject.create(favorite_hash)
flash[:alert] = 'Project added to your favorites!'
else
flash[:alert] = 'Project is already favorited!'
end
redirect_back(fallback_location: search)
end
end
@@ -19,6 +19,7 @@ class Crawlers::TissCrawlerController < ApplicationController
# redirect to thesis_show_basic, propagate the search_term
redirect_to :controller => 'crawlers/theses_crawler', :action => :show_basic, :search_term => params[:search_term]
when 'Projects'
redirect_to :controller => 'crawlers/projects_crawler', :action => :show_basic, :search_term => params[:search_term]
else
puts 'Undefined search context'
end