Skip to content
Snippets Groups Projects
Commit 938111ee authored by Mateus Rambo Strey's avatar Mateus Rambo Strey
Browse files

add button for new review and small fix

parent eaceab0b
No related branches found
No related tags found
No related merge requests found
...@@ -36,7 +36,7 @@ class CollectionsController < ApplicationController ...@@ -36,7 +36,7 @@ class CollectionsController < ApplicationController
@own = user_signed_in? ? @collection.owner?(current_user) : false @own = user_signed_in? ? @collection.owner?(current_user) : false
end end
@reviews = Review.where(reviewable: @collection) @reviews = Review.includes(:user).where(reviewable: @collection)
render partial: 'list' if params[:list] == 'true' render partial: 'list' if params[:list] == 'true'
end end
......
...@@ -15,7 +15,7 @@ class LearningObjectsController < ApplicationController ...@@ -15,7 +15,7 @@ class LearningObjectsController < ApplicationController
# GET /learning_objects/1.json # GET /learning_objects/1.json
def show def show
@liked = !@learning_object.likes.where(user: current_user).blank? if user_signed_in? @liked = !@learning_object.likes.where(user: current_user).blank? if user_signed_in?
@reviews = Review.where(reviewable: @learning_object) @reviews = Review.includes(:user).where(reviewable: @learning_object)
end end
# GET /learning_objects/new # GET /learning_objects/new
......
...@@ -64,6 +64,8 @@ ...@@ -64,6 +64,8 @@
</div> </div>
</nav> </nav>
<%= link_to 'Avalie esta coleção!', new_review_path(reviewable_id: @collection.id, reviewable_type: @collection.class.name), class: 'btn btn-success' %>
<div class="row"> <div class="row">
<div class="learning-object-columns"> <div class="learning-object-columns">
<br/> <br/>
......
...@@ -85,9 +85,6 @@ ...@@ -85,9 +85,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-12">
<%= render 'reviews/list' %>
</div>
</div> </div>
<br/> <br/>
...@@ -129,7 +126,14 @@ ...@@ -129,7 +126,14 @@
</div> </div>
</div> </div>
</div> </div>
<%= link_to 'Avalie este objeto!', new_review_path(reviewable_id: @learning_object.id, reviewable_type: @learning_object.class.name), class: 'btn btn-success' %>
<br/><br/>
<div class="row">
<div class="col-md-12">
<%= render 'reviews/list' %>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(".view video").hover(function(event) { $(".view video").hover(function(event) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment