scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-11 17:36:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1139 from okriuchykhin/ok_SCI_2385

Browse source 
Fix task resore permissions [SCI-2385]
This commit is contained in:
okriuchykhin 2018-05-16 10:17:51 +02:00 committed by GitHub
commit 3e2b455d2c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/my_modules_controller.rb
View file

@ -144,12 +144,6 @@ class MyModulesController < ApplicationController
end end
def update def update
render_403 && return unless if my_module_params[:archived] == 'false'
can_restore_module?(@my_module)
else
can_manage_module?(@my_module)
end
@my_module.assign_attributes(my_module_params) @my_module.assign_attributes(my_module_params)
@my_module.last_modified_by = current_user @my_module.last_modified_by = current_user
description_changed = @my_module.description_changed? description_changed = @my_module.description_changed?
@ -669,7 +663,11 @@ class MyModulesController < ApplicationController
end end
def check_manage_permissions def check_manage_permissions
render_403 unless can_manage_module?(@my_module) render_403 && return unless if my_module_params[:archived] == 'false'
can_restore_module?(@my_module)
else
can_manage_module?(@my_module)
end
end end
def check_view_permissions def check_view_permissions