Merge remote-tracking branch 'remotes/origin/projects_search' into fixes

# Conflicts:
#	app/views/favorites/projects.html.erb
#	db/schema.rb
This commit is contained in:
Pfingstfrosch
2020-05-31 13:16:56 +02:00
8 changed files with 77 additions and 11 deletions
+7
View File
@@ -35,7 +35,14 @@ class FavoritesController < ApplicationController
end
def projects
@favorite_projects = FavoriteProject.where('user_id': current_user.id)
.order(sort_column + " " + sort_direction)
@host = 'https://tiss.tuwien.ac.at'
end
def delete_project
FavoriteProject.find_by(id: params[:id]).destroy
redirect_back(fallback_location: projects)
end
private
+5
View File
@@ -0,0 +1,5 @@
class FavoriteProject < ApplicationRecord
self.primary_key = 'id'
validates :id, uniqueness: true
end
+31 -8
View File
@@ -1,11 +1,34 @@
<%= render(:partial => "nav")%>
<%= render(:partial => "nav") %>
<h1>Favorite Projects</h1>
<p>Not implemented yet!</p>
<%# if !@favorite_theses[0].blank? %>
<%# else %>
<!-- No favorite projects added yet!-->
<%# end %>
<% if !@favorite_projects[0].blank? %>
<div class="table_wrapper">
<table>
<tr>
<th><%= sortable "Title", "title" %></th>
<th><%= sortable "Registration Date", "created_at" %></th>
<th></th>
<th></th>
</tr>
<% for project in @favorite_projects %>
<tr>
<td>
<%= project['title'] %>
</td>
<td>
<%= project['created_at'] %>
</td>
<td>
<%= button_to 'Details', crawlers_projects_crawler_show_detail_url(:id => project['id']) %>
</td>
<td>
<%= button_to 'Delete', {:action => "delete_project", :id => project['id']}, :method => 'delete' %>
</td>
</tr>
<% end %>
</table>
</div>
<% else %>
No favorite projects added yet!
<% end %>