From 6ba226d5148013ededadec0742d4a8219fd2692b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Zrim=C5=A1ek?= <mzrimsek@biosistemika.com>
Date: Fri, 16 Feb 2018 11:12:30 +0100
Subject: [PATCH] Added missing '?' to the canaid permission calls that were
 missing it.

---
 app/controllers/protocols_controller.rb     | 6 +++---
 app/controllers/result_assets_controller.rb | 2 +-
 app/controllers/result_tables_controller.rb | 2 +-
 app/controllers/result_texts_controller.rb  | 2 +-
 app/controllers/steps_controller.rb         | 2 +-
 app/views/my_modules/_result.html.erb       | 4 ++--
 app/views/projects/index/_project.html.erb  | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
index 2be21efdb..a92ef9009 100644
--- a/app/controllers/protocols_controller.rb
+++ b/app/controllers/protocols_controller.rb
@@ -263,8 +263,8 @@ class ProtocolsController < ApplicationController
 
   def copy_to_repository
     link_protocols = params[:link] &&
-                     can_manage_protocol_in_module(@protocol) &&
-                     can_create_protocols_in_repository(@protocol.team)
+                     can_manage_protocol_in_module?(@protocol) &&
+                     can_create_protocols_in_repository?(@protocol.team)
     respond_to do |format|
       transaction_error = false
       Protocol.transaction do
@@ -1074,7 +1074,7 @@ class ProtocolsController < ApplicationController
     @protocol = Protocol.find_by_id(params[:id])
     render_403 unless @protocol.present? &&
                       can_read_protocol_in_module?(@protocol) &&
-                      can_manage_protocol_in_repository(@protocol.parent)
+                      can_manage_protocol_in_repository?(@protocol.parent)
   end
 
   def check_load_from_repository_views_permissions
diff --git a/app/controllers/result_assets_controller.rb b/app/controllers/result_assets_controller.rb
index ff8c176a1..afbd61a13 100644
--- a/app/controllers/result_assets_controller.rb
+++ b/app/controllers/result_assets_controller.rb
@@ -196,7 +196,7 @@ class ResultAssetsController < ApplicationController
 
   def check_archive_permissions
     if result_params[:archived].to_s != '' and
-      not can_archive_result(@result)
+      not can_archive_result?(@result)
       render_403
     end
   end
diff --git a/app/controllers/result_tables_controller.rb b/app/controllers/result_tables_controller.rb
index 82b35dc78..fe0904e78 100644
--- a/app/controllers/result_tables_controller.rb
+++ b/app/controllers/result_tables_controller.rb
@@ -201,7 +201,7 @@ class ResultTablesController < ApplicationController
 
   def check_archive_permissions
     if result_params[:archived].to_s != '' and
-      not can_archive_result(@result)
+      not can_archive_result?(@result)
       render_403
     end
   end
diff --git a/app/controllers/result_texts_controller.rb b/app/controllers/result_texts_controller.rb
index edea09896..d9b716efa 100644
--- a/app/controllers/result_texts_controller.rb
+++ b/app/controllers/result_texts_controller.rb
@@ -207,7 +207,7 @@ class ResultTextsController < ApplicationController
 
   def check_archive_permissions
     if result_params[:archived].to_s != '' and
-      not can_archive_result(@result)
+      not can_archive_result?(@result)
       render_403
     end
   end
diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb
index 500994b2c..b57bdfa1d 100644
--- a/app/controllers/steps_controller.rb
+++ b/app/controllers/steps_controller.rb
@@ -609,7 +609,7 @@ class StepsController < ApplicationController
   end
 
   def check_view_permissions
-    render_403 unless can_read_protocol_in_module(@protocol) ||
+    render_403 unless can_read_protocol_in_module?(@protocol) ||
                       can_read_protocol_in_repository?(@protocol)
   end
 
diff --git a/app/views/my_modules/_result.html.erb b/app/views/my_modules/_result.html.erb
index 4d4fc49bc..8e79f6c7b 100644
--- a/app/views/my_modules/_result.html.erb
+++ b/app/views/my_modules/_result.html.erb
@@ -13,12 +13,12 @@
   <div class="panel panel-default">
     <div class="panel-heading">
       <div class="panel-options pull-right">
-        <% if can_edit_result(result) %>
+        <% if can_edit_result?(result) %>
           <a class="btn btn-link edit-result-button <%= edit_result_button_class(result) %>" id="<%= result.id %>_edit" href="<%= edit_result_link(result) %>" data-remote="true" title="<%= t'my_modules.results.options.edit_title' %>">
             <span class="glyphicon glyphicon-edit"></span>
           </a>
         <% end %>
-        <% if can_archive_result(result) && result_unlocked?(result) %>
+        <% if can_archive_result?(result) && result_unlocked?(result) %>
           <a href="#"
              class="btn btn-link form-submit-link"
              data-form-id="result-archive-form-<%= result.id %>"
diff --git a/app/views/projects/index/_project.html.erb b/app/views/projects/index/_project.html.erb
index 176035cde..89304b11a 100644
--- a/app/views/projects/index/_project.html.erb
+++ b/app/views/projects/index/_project.html.erb
@@ -17,7 +17,7 @@ data-project-users-tab-url="<%= url_for project_user_projects_path(project_id: p
           <li>
             <%= link_to t("projects.index.edit_option"), edit_project_path(project, format: :json), remote: true, "data-action" => "edit" %>
           </li>
-          <% if can_archive_project(project) %>
+          <% if can_archive_project?(project) %>
             <li><a href="#" class="form-submit-link" data-submit-form="<%= project_form.options[:html][:id] %>" data-confirm-form="<%= t("projects.index.archive_confirm") %>"><%= t 'projects.index.archive_option' %></a></li>
           <% end %>
         </ul>