diff --git a/app/controllers/my_module_shareable_links_controller.rb b/app/controllers/my_module_shareable_links_controller.rb index 814cf14be..539dcde8b 100644 --- a/app/controllers/my_module_shareable_links_controller.rb +++ b/app/controllers/my_module_shareable_links_controller.rb @@ -11,8 +11,8 @@ class MyModuleShareableLinksController < ApplicationController end def create - @my_module.shareable_link.create!( - signed_id: @my_module.signed_id, + @my_module.create_shareable_link( + uuid: @my_module.signed_id, description: params[:description], team: @my_module.team, created_by: current_user @@ -48,6 +48,6 @@ class MyModuleShareableLinksController < ApplicationController end def check_manage_permissions - render_403 unless can_manage_my_module?(@my_module) + render_403 unless can_share_my_module?(@my_module) end end diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 73ad70235..11e0e5ee8 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -452,7 +452,7 @@ class MyModule < ApplicationRecord end def shared? - current_team.shareable_links_enabled? && shareable_link.present? + team.shareable_links_enabled? && shareable_link.present? end def comments diff --git a/app/permissions/my_module.rb b/app/permissions/my_module.rb index 49bf2dec9..592ed8bda 100644 --- a/app/permissions/my_module.rb +++ b/app/permissions/my_module.rb @@ -44,6 +44,10 @@ Canaid::Permissions.register_for(MyModule) do my_module.permission_granted?(user, MyModulePermissions::MANAGE) end + can :share_my_module do |user, my_module| + my_module.permission_granted?(user, MyModulePermissions::SHARE) + end + can :restore_my_module do |user, my_module| my_module.archived? && my_module.permission_granted?(user, MyModulePermissions::MANAGE) end diff --git a/app/views/my_modules/shareable_links/_share_button.html.erb b/app/views/my_modules/shareable_links/_share_button.html.erb index 77251bb64..bfbb404a2 100644 --- a/app/views/my_modules/shareable_links/_share_button.html.erb +++ b/app/views/my_modules/shareable_links/_share_button.html.erb @@ -1,6 +1,6 @@