Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

app/controllers/users_controller.rb

 class UsersController < ApplicationController
+
+  include Pundit
+
   before_action :authenticate_user!, only: [:follow, :unfollow]
   before_action :check_current_user_page, only: :show
   before_action :set_user, only: [:show]
@@ -9,7 +12,7 @@ class UsersController < ApplicationController
   def show
     @objects = @user.learning_objects
     @institutions = @user.institutions
-    @groups = [CollectionsGroup.new(title: 'Coleções Adicionadas', collections: [@user.collections.includes(:owner)])]
+    @groups = [CollectionsGroup.new(title: 'Coleções Adicionadas', collections: [ CollectionPolicy::Scope.new(current_user, @user.id, @user.collections).resolve.includes(:owner)])]
 
     if @user == current_user
       @publishers = @user.institutions

app/helpers/collections_helper.rb

@@ -28,7 +28,7 @@ module CollectionsHelper
   end
 
   def no_collections(collections, user)
-    "Nenhuma coleção disponível. Crie novas coleções na página do seu perfil ou #{link_to 'clique aqui', user_path(user)}" if collections.blank?
+    "Nenhuma coleção disponível. Crie novas coleções na página do seu perfil ou #{link_to 'clique aqui', user_path(user)}".html_safe if collections.blank?
   end
 
 end

app/models/collection.rb

@@ -59,8 +59,9 @@ class Collection < ActiveRecord::Base
   end
 
   def user_own?(user)
+    return true if user.is_a? Institution and owner.users.include?(user)
     return false unless user.is_a? User
-    owner?(user) || owner.users.include?(user)
+    user.is_admin? || owner?(user)
   end
 
   def private?

app/policies/collection_policy.rb

@@ -2,6 +2,26 @@ class CollectionPolicy < ApplicationPolicy
   include SociablePolicy
   include FollowablePolicy
 
+  class Scope < Scope
+
+
+    def initialize (user, user_id, scope)
+      @user = user
+      @user_id = user_id
+      @scope = scope
+    end
+
+    def resolve
+
+      if @user.try(:id) == @user_id || @user.try(:is_admin?)
+        scope.all
+      else
+        scope.where(privacy: 'public')
+      end
+    end
+  end
+
+
   def create?
     record if user_exists?
   end

app/views/users/show.html.erb

@@ -14,7 +14,7 @@
           </div>
         </div>
         <div class="col-md-6 right-column align-right">
-          <% if current_user_page? @user %>
+          <% if user_signed_in? && current_user_page?(@user) %>
             <%= link_to 'Adicionar novo objeto', new_learning_object_path, class: 'btn btn-primary'%>
           <% else %>
               <!-- <button type="button" class="btn btn-primary">Enviar mensagem</button> -->
@@ -48,7 +48,7 @@
         </div>
       </div>
       <div class="col-md-6 right-column align-right">
-        <%= render('collections/create', collection: @new_collection, publishers: @publishers, placement: 'left') if current_user_page?(@user) %>
+        <%= render('collections/create', collection: @new_collection, publishers: @publishers, placement: 'left') if user_signed_in? && current_user_page?(@user) %>
       </div>
     </div>