scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-09 05:18:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fixed permission error when accessing samples page.

Browse source
This commit is contained in:
Matej Zrimšek 2018-02-09 19:20:06 +01:00
parent 4c87fb4a55
commit f21c794a95
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/permissions/experiment.rb
View file

@ -72,9 +72,9 @@ Canaid::Permissions.register_for(MyModule) do
end end
# module: assign/unassign sample # module: assign/unassign sample
# NOTE: Use 'module_page? &&' before calling this permission!
can :assign_sample_to_module do |user, my_module| can :assign_sample_to_module do |user, my_module|
module_page? && user.is_technician_or_higher_of_project?(my_module.experiment.project)
user.is_technician_or_higher_of_project?(my_module.experiment.project)
end end
# module: complete/uncomplete # module: complete/uncomplete

2
app/views/shared/_samples.html.erb
View file

@ -109,7 +109,7 @@
</button> </button>
<% end %> <% end %>
<% if can_assign_sample_to_module?(@my_module) %> <% if module_page? && can_assign_sample_to_module?(@my_module) %>
<button type="button" class="btn btn-default" <button type="button" class="btn btn-default"
id="assignSamples" onclick="$(this).next().click();" disabled> id="assignSamples" onclick="$(this).next().click();" disabled>
<span class="glyphicon glyphicon-ok-circle"></span> <span class="glyphicon glyphicon-ok-circle"></span>