refactor view/export samples permission

app/controllers/teams_controller.rb

@@ -255,7 +255,7 @@ class TeamsController < ApplicationController
   end
 
   def check_view_samples_permission
-    unless can_view_samples(@team)
+    unless can_read_team?(@team)
       render_403
     end
   end

app/helpers/permission_helper.rb

@@ -332,7 +332,7 @@ module PermissionHelper
   end
 
   def can_view_project_samples(project)
-    can_view_samples(project.team)
+    can_view_project(project)
   end
 
   def can_view_project_archive(project)
@@ -383,7 +383,7 @@ module PermissionHelper
   end
 
   def can_view_experiment_samples(experiment)
-    can_view_samples(experiment.project.team)
+    can_view_experiment(experiment)
   end
 
   def can_clone_experiment(experiment)
@@ -517,8 +517,7 @@ module PermissionHelper
   end
 
   def can_view_module_samples(my_module)
-    can_view_module(my_module) and
-      can_view_samples(my_module.experiment.project.team)
+    can_view_module(my_module)
   end
 
   def can_view_module_archive(my_module)
@@ -633,9 +632,9 @@ module PermissionHelper
   #   is_normal_user_or_admin_of_team(team)
   # end
 
-  def can_view_samples(team)
-    is_member_of_team(team)
-  end
+  # def can_view_samples(team)
+  #   is_member_of_team(team)
+  # end
 
   # Only person who created the sample
   # or team admin can edit it

app/permissions/team.rb

@@ -1,5 +1,5 @@
 Canaid::Permissions.register_for(Team) do
-  # view projects, view protocols
+  # view projects, view protocols, view samples, export samples
   can :read_team do |user, team|
     user.is_member_of_team?(team)
   end

app/views/shared/_samples.html.erb

@@ -8,7 +8,7 @@
 
 <div id="alert-container"></div>
 
-<% if can_view_samples(@team) %>
+<% if can_read_team?(@team) %>
   <%= bootstrap_form_tag(url: export_samples_team_path(@team),
                          html: { id: 'form-export', class: 'hidden' }) do |f| %>
   <% end %>
@@ -32,7 +32,7 @@
       </button>
   <% end %>
 
-  <% if can_view_samples(@team) %>
+  <% if can_read_team?(@team) %>
     <a href="#" class="btn btn-default" id="exportSamplesButton">
       <span class="glyphicon glyphicon-cloud-download"></span>
       <span class="hidden-xs"><%= t("samples.export") %></span>