hello
diff --git a/lib/seek/publishing/publishing_common.rb b/lib/seek/publishing/publishing_common.rb
index f8410d2515..1ce8e6ab71 100644
--- a/lib/seek/publishing/publishing_common.rb
+++ b/lib/seek/publishing/publishing_common.rb
@@ -3,7 +3,7 @@ module Publishing
module PublishingCommon
def self.included(base)
base.before_action :set_asset, only: [:check_related_items, :publish_related_items, :check_gatekeeper_required, :publish, :published]
- base.before_action :set_assets, only: [:batch_publishing_preview]
+ base.before_action :set_assets, :set_investigations, only: [:batch_publishing_preview, :batch_sharing_permission_preview, :batch_sharing_permission_changed]
base.before_action :set_items_for_publishing, only: [:check_gatekeeper_required, :publish]
base.before_action :set_items_for_potential_publishing, only: [:check_related_items, :publish_related_items]
base.before_action :publish_auth, only: [:batch_publishing_preview, :check_related_items, :publish_related_items, :check_gatekeeper_required, :publish, :waiting_approval_assets, :cancel_publishing_request]
@@ -37,12 +37,8 @@ def publish_related_items
def check_gatekeeper_required
@waiting_for_publish_items = @items_for_publishing.select { |item| item.gatekeeper_required? && !User.current_user.person.is_asset_gatekeeper_of?(item) }
@items_for_immediate_publishing = @items_for_publishing - @waiting_for_publish_items
- unless @waiting_for_publish_items.empty?
- respond_to do |format|
- format.html { render template: 'assets/publishing/waiting_approval_list' }
- end
- else
- publish_final_confirmation
+ respond_to do |format|
+ format.html { render template: 'assets/publishing/publish_final_confirmation' }
end
end
@@ -53,12 +49,6 @@ def update_sharing_policies(*args)
super
end
- def publish_final_confirmation
- respond_to do |format|
- format.html { render template: 'assets/publishing/publish_final_confirmation' }
- end
- end
-
def publish
publish_requested_items
@@ -133,21 +123,41 @@ def set_asset
end
def set_assets
- # get the assets that current_user can manage, then take the one that can_publish?
+ # get the assets that current_user can manage
@assets = {}
- publishable_types = Seek::Util.authorized_types.select { |authorized_type| authorized_type.first.try(:is_in_isa_publishable?) }
- publishable_types.each do |klass|
+ Seek::Util.authorized_types.each do |klass|
can_manage_assets = klass.authorized_for 'manage', current_user
- can_manage_assets = can_manage_assets.select(&:can_publish?)
unless can_manage_assets.empty?
@assets[klass.name] = can_manage_assets
end
end
end
+ def set_investigations
+ @investigations = []
+ @assets['Investigation']&.each do |inv|
+ @investigations.push(inv)
+ end
+ @assets_not_in_isa = []
+ @assets.each do |type, klass|
+ next if %w[Investigation Study Assay].include? type
+ klass.each do |asset|
+ if !asset.respond_to?(:investigations) || asset.investigations.empty?
+ @assets_not_in_isa.push(asset)
+ else
+ asset.investigations.each do |inv|
+ next if @investigations.include?(inv)
+ @investigations.push(inv)
+ end
+ end
+ end
+ end
+ end
+
# sets the @items_for_publishing based on the :publish param, and filtered by whether than can_publish?
def set_items_for_publishing
@items_for_publishing = resolve_publish_params(params[:publish]).select(&:can_publish?)
+ @items_cannot_publish = resolve_publish_params(params[:publish]) - @items_for_publishing
end
# sets the @items_for_publishing based on the :publish param, and filtered by whether than can_publish? OR contains_publishable_items?
diff --git a/lib/seek/sharing/sharing_common.rb b/lib/seek/sharing/sharing_common.rb
index 8cfcce6438..f18426e7f0 100644
--- a/lib/seek/sharing/sharing_common.rb
+++ b/lib/seek/sharing/sharing_common.rb
@@ -7,11 +7,11 @@ def self.included(base)
end
def batch_change_permission_for_selected_items
- @items_for_sharing = resolve_sharing_params(params)
+ @items_for_sharing = resolve_sharing_params(params[:publish])
if @items_for_sharing.empty?
flash[:error] = "Please choose at least one item!"
if params[:single_page]
- redirect_to batch_sharing_permission_preview_person_url(current_user.person, { single_page: true })
+ render 'single_pages/sample_batch_sharing_permissions_changed', { layout: false }
else
redirect_to batch_sharing_permission_preview_person_url(current_user.person)
end
@@ -30,51 +30,34 @@ def batch_sharing_permission_preview
@batch_sharing_permission_changed = false
flash[:notice] = nil
respond_to do |format|
- if params[:single_page]
- format.html { render 'single_pages/sample_batch_sharing_permission_preview', { layout: false } }
- else
- format.html { render 'assets/sharing/batch_sharing_permission_preview' }
- end
+ format.html { render 'assets/sharing/batch_sharing_permission_preview' }
end
end
def batch_sharing_permission_changed
-
- @items_for_sharing = resolve_sharing_params(params)
+ @items_for_sharing = resolve_sharing_params(params[:publish])
@batch_sharing_permission_changed = true
- notice_count = 0
- gatekeeper_count = 0
- error_count = 0
- flash[:notice] = "The sharing policies for your selected #{"item".pluralize(@items_for_sharing.size)} were successfully updated:
"
- gatekeeper_flash = "Publishing the following #{"item".pluralize(@items_for_sharing.size)} requires approval from a gatekeeper: "
- flash[:error] = "The sharing policies for your selected #{"item".pluralize(@items_for_sharing.size)} were not successfully updated: "
+ @success = []
+ @gatekeeper_required = []
+ @error = []
@items_for_sharing.each do |item|
item.policy.update_with_bulk_sharing_policy(policy_params) if policy_params.present?
- begin
- item.save!
+ if item.save
request_publish_approval_batch_sharing(item) # Has to go before log_publishing_batch_sharing(item)
log_publishing_batch_sharing(item)
if item.is_waiting_approval? && is_gatekeeper_approval_required?(item)
- gatekeeper_count += 1
- gatekeeper_flash += "- #{item.title}
"
+ @gatekeeper_required << item
else
- notice_count += 1
- flash[:notice] += "- #{item.title}
"
+ @success << item
end
- rescue Exception => e
- error_count += 1
- flash[:error] += "- #{item.title}
"
- flash[:error] += "The reason: #{e.message} "
+ else
+ @error << item
end
end
- flash[:notice] = notice_count == 0 ? "": (flash[:notice]+"
").html_safe
- flash[:notice] += gatekeeper_count == 0 ? "": (gatekeeper_flash+"
"+"The #{"item".pluralize(gatekeeper_count)} will not be published until approved.").html_safe
- flash.now[:notice] = (notice_count+gatekeeper_count) == 0 ? nil: flash[:notice].html_safe
- flash.now[:error] = error_count == 0 ? nil: (flash[:error]+"
").html_safe
- respond_to do |format|
- if params[:single_page]
- format.html { render 'single_pages/sample_batch_sharing_permission_preview', { layout: false } }
- else
+ if params[:single_page]
+ render 'single_pages/sample_batch_sharing_permissions_changed', { layout: false }
+ else
+ respond_to do |format|
format.html { render 'assets/sharing/batch_sharing_permission_preview' }
end
end
@@ -104,15 +87,12 @@ def request_publish_approval_batch_sharing(object)
# returns an enumeration of assets for bulk sharing change based upon the parameters passed
def resolve_sharing_params(params)
- param_not_isa = params[:share_not_isa] || {}
- param_isa = params[:share_isa] || {}
-
- if param_not_isa.blank? && param_isa.blank?
+ if params.blank?
[@asset].compact
else
assets = []
Seek::Util.authorized_types.each do |klass|
- ids = (param_not_isa[klass.name]&.keys || []) | (param_isa[klass.name]&.keys || [])
+ ids = params[klass.name]&.keys || []
assets += klass.where(id: ids).to_a if ids.any?
end
assets.compact.uniq
diff --git a/test/functional/publishing/batch_publishing_test.rb b/test/functional/publishing/batch_publishing_test.rb
index b90cdd2993..6fa1bc2203 100644
--- a/test/functional/publishing/batch_publishing_test.rb
+++ b/test/functional/publishing/batch_publishing_test.rb
@@ -12,10 +12,10 @@ def setup
login_as(@user)
end
- test 'should have the -Publish your assets- only on your own profile' do
+ test 'should have the -Publish your items- only on your own profile' do
get :show, params: { id: User.current_user.person }
assert_response :success
- assert_select 'a[href=?]', batch_publishing_preview_person_path, text: /Publish your assets/
+ assert_select 'a[href=?]', batch_publishing_preview_person_path, text: /Publish your items/
get :batch_publishing_preview, params: { id: User.current_user.person.id }
assert_response :success
@@ -25,7 +25,7 @@ def setup
a_person = FactoryBot.create(:person)
get :show, params: { id: a_person }
assert_response :success
- assert_select 'a', text: /Publish your assets/, count: 0
+ assert_select 'a', text: /Publish your items/, count: 0
get :batch_publishing_preview, params: { id: a_person.id }
assert_redirected_to :root
@@ -44,42 +44,117 @@ def setup
assert a.can_publish?, 'The asset must not be publishable for this test to succeed'
assert a.gatekeeper_required?, "This asset must require gatekeeper's approval for this test to succeed"
end
+
total_asset_count = (publish_immediately_assets + gatekeeper_required_assets).count
get :batch_publishing_preview, params: { id: User.current_user.person.id }
assert_response :success
+ assert_select 'div#sorted_by_type,#sorted_by_isa', count: 2 do |sorted_by|
+ sorted_by.each do |sorted_by_block|
+ assert_select sorted_by_block, '.batch-selection-asset', count: total_asset_count + 1 do # event will also be shown
+ publish_immediately_assets.each do |a|
+ assert_select 'a[href=?]', eval("#{a.class.name.underscore}_path(#{a.id})"), text: /#{a.title}/
+ end
+ gatekeeper_required_assets.each do |a|
+ assert_select 'a[href=?]', eval("#{a.class.name.underscore}_path(#{a.id})"), text: /#{a.title}/
+ end
+ assert_select 'img[src*=?][title=?]', 'lock.png', 'Private', count: total_asset_count
+ end
+
+ assert_select sorted_by_block, '.parent-btn-checkbox', count: total_asset_count + 1 do # event will also be shown
+ publish_immediately_assets.each do |a|
+ assert_select "input[type='checkbox'][id=?]", "publish_#{a.class.name}_#{a.id}"
+ end
+ gatekeeper_required_assets.each do |a|
+ assert_select "input[type='checkbox'][id=?]", "publish_#{a.class.name}_#{a.id}"
+ end
+ end
+ end
+ end
+ end
+
+ test 'Cannot select already-published items in batch_publishing_preview' do
+ published_item = FactoryBot.create(:data_file,
+ contributor: User.current_user.person,
+ policy: FactoryBot.create(:public_policy))
+ assert published_item.is_published?
+
+ get :batch_publishing_preview, params: { id: User.current_user.person.id }
+ assert_response :success
+
+ assert_select '.batch-selection-asset .type_and_title a[href=?]', data_file_path(published_item)
+ assert_select "input[type='checkbox'].#{published_item.class.name}_#{published_item.id}", count: 0
+ end
+
+ test 'publish_final_confirmation' do
+ gatekeeper = FactoryBot.create(:asset_gatekeeper)
+ person = User.current_user.person
+ gatekept_project = gatekeeper.projects.first
+ publishable = FactoryBot.create(:data_file, projects: [person.projects.first], contributor: person)
+ gatekept = FactoryBot.create(:data_file, projects: [gatekept_project], contributor: person)
+ waiting = FactoryBot.create(:data_file, projects: [gatekept_project], contributor: person)
+ ResourcePublishLog.add_log(ResourcePublishLog::WAITING_FOR_APPROVAL, waiting, nil, person.user)
+
+ login_as(person.user)
+ assert publishable.can_publish?
+ assert gatekept.can_publish?
+ assert gatekept.gatekeeper_required?
+ assert !waiting.can_publish?
+
+ params = { publish: {} }
+ [publishable, gatekept, waiting].each do |asset|
+ params[:publish][asset.class.name] ||= {}
+ params[:publish][asset.class.name][asset.id.to_s] = '1'
+ end
+
+ get :check_gatekeeper_required, params: params.merge(id: person.id)
+ assert_response :success
- assert_select '.type_and_title', count: total_asset_count do
- publish_immediately_assets.each do |a|
- assert_select 'a[href=?]', eval("#{a.class.name.underscore}_path(#{a.id})"), text: /#{a.title}/
+ # Publishable shown in immediate publishing section
+ assert_select 'h2', text: /The following items will be published:/, count: 1
+ assert_select 'div.alert-info', text: /immediately accessible to the public/, count: 1
+ assert_select 'ul.publishing_options#publish_immediately', count: 1 do
+ assert_select 'li.type_and_title', count: 1 do
+ assert_select 'a[href=?]', data_file_path(publishable), text: publishable.title
end
- gatekeeper_required_assets.each do |a|
- assert_select 'a[href=?]', eval("#{a.class.name.underscore}_path(#{a.id})"), text: /#{a.title}/
+ end
+ # Gatekept explains waiting approval
+ assert_select 'h2', text: /The following items require approval:/, count: 1
+ assert_select 'div.alert-warning', text: /an email will be sent to that person, and they will either approve or reject/, count: 1
+ assert_select 'ul.publishing_options#waiting_approval', count: 1 do
+ assert_select 'li.type_and_title', count: 1 do
+ assert_select 'a[href=?]', data_file_path(gatekept), text: gatekept.title
end
- assert_select '.type_and_title img[src*=?][title=?]', 'lock.png', 'Private', count: total_asset_count
end
- assert_select '.parent-btn-checkbox', text: /Publish/, count: total_asset_count do
- publish_immediately_assets.each do |a|
- assert_select "input[type='checkbox'][id=?]", "publish_#{a.class.name}_#{a.id}"
- end
- gatekeeper_required_assets.each do |a|
- assert_select "input[type='checkbox'][id=?]", "publish_#{a.class.name}_#{a.id}"
+ # If not-publishable warning is issued
+ assert_select 'h2', text: /The following items cannot be published:/, count: 1
+ assert_select 'div.alert-danger', text: /One or more of the items you selected cannot be published/, count: 1
+ assert_select 'ul.publishing_options#cannot_publish', count: 1 do
+ assert_select 'li.type_and_title', count: 1 do
+ assert_select 'a[href=?]', data_file_path(waiting), text: waiting.title
end
end
end
- test 'do not have not-publishable items in batch_publishing_preview' do
- published_item = FactoryBot.create(:data_file,
- contributor: User.current_user.person,
- policy: FactoryBot.create(:public_policy))
- assert !published_item.can_publish?, 'This data file must not be publishable for the test to succeed'
+ test 'Events are skipped *in publish related items' do
+ person = User.current_user.person
+ assay = FactoryBot.create(:assay, contributor: person)
+ df = FactoryBot.create(:data_file, projects: [person.projects.first], assays: [assay], contributor: person)
+ event = FactoryBot.create(:event, contributor: person)
+ login_as(person.user)
+ assert df.can_publish?
+ assert event.can_publish?
- get :batch_publishing_preview, params: { id: User.current_user.person.id }
+ params = { publish: {} }
+ [df, event].each do |asset|
+ params[:publish][asset.class.name] ||= {}
+ params[:publish][asset.class.name][asset.id.to_s] = '1'
+ end
+
+ get :check_related_items, params: params.merge(id: person.id)
assert_response :success
- assert_select "input[type='checkbox'][id=?]", "publish_#{published_item.class.name}_#{published_item.id}",
- count: 0
end
test 'do not have not_publishable_type item in batch_publishing_preview' do
diff --git a/test/functional/publishing/single_publishing_test.rb b/test/functional/publishing/single_publishing_test.rb
index 8f77468a73..de0ecf3a37 100644
--- a/test/functional/publishing/single_publishing_test.rb
+++ b/test/functional/publishing/single_publishing_test.rb
@@ -109,21 +109,21 @@ def setup
assert_select '.type_and_title', text: /Investigation/, count: 1 do
assert_select 'a[href=?]', investigation_path(investigation), text: /#{investigation.title}/
end
- assert_select '.parent-btn-checkbox', text: /Publish/ do
+ assert_select '.parent-btn-checkbox' do
assert_select "input[type='checkbox'][id=?]", "publish_Investigation_#{investigation.id}"
end
assert_select '.type_and_title', text: /Study/, count: 1 do
assert_select 'a[href=?]', study_path(study), text: /#{study.title}/
end
- assert_select '.parent-btn-checkbox', text: /Publish/ do
+ assert_select '.parent-btn-checkbox' do
assert_select "input[type='checkbox'][id=?]", "publish_Study_#{study.id}"
end
assert_select '.type_and_title', text: /Assay/, count: 1 do
assert_select 'a[href=?]', assay_path(assay), text: /#{assay.title}/
end
- assert_select '.parent-btn-checkbox', text: /Publish/ do
+ assert_select '.parent-btn-checkbox' do
assert_select "input[type='checkbox'][id=?]", "publish_Assay_#{assay.id}"
end
@@ -133,12 +133,12 @@ def setup
assert_select 'a[href=?]', data_file_path(request_publishing_df), text: /#{request_publishing_df.title}/
assert_select 'a[href=?]', data_file_path(notifying_df), text: /#{notifying_df.title}/
end
- assert_select '.parent-btn-checkbox', text: /Publish/ do
+ assert_select '.parent-btn-checkbox' do
assert_select "input[type='checkbox'][id=?]", "publish_DataFile_#{publishing_df.id}"
assert_select "input[type='checkbox'][id=?]", "publish_DataFile_#{request_publishing_df.id}"
end
- assert_select 'span.label-warning', text: "Can't publish", count: 1
+ assert_select '.parent-btn-checkbox.btn-warning[data-tooltip=?]', 'You do not have permission to manage this item.', count: 1
end
test 'split-button recursive selection' do
@@ -162,15 +162,15 @@ def setup
# split-button dropdown menu shown for tree branches
should_have_dropdown.each do |asset|
- assert_select "._#{asset.id}", count: 1 do
+ assert_select '.isa-tree[data-asset-id=?]', "#{asset.class.name}_#{asset.id}", count: 1 do
assert_select '.parent-btn-dropdown', count: 1
assert_select '.dropdown-menu', count: 1 do
assert_select 'li', count: 2 do
- assert_select 'a.selectChildren', text: /Select this item and all of its sub-items./, count: 1 do
+ assert_select 'a.batch-selection-select-children', text: /Select this item and all of its sub-items./, count: 1 do
assert_select 'img[src=?]', '/assets/checkbox_select_all.svg'
end
- assert_select 'a.deselectChildren', text: /Deselect this item and all of its sub-items./, count: 1 do
+ assert_select 'a.batch-selection-deselect-children', text: /Deselect this item and all of its sub-items./, count: 1 do
assert_select 'img[src=?]', '/assets/checkbox_deselect_all.svg'
end
end
@@ -179,7 +179,7 @@ def setup
end
# split-button dropdown menu not shown for tree leafs
should_not_have_dropdown.each do |asset|
- assert_select "._#{asset.id}", count: 1 do
+ assert_select '.isa-tree[data-asset-id=?]', "#{asset.class.name}_#{asset.id}", count: 1 do
assert_select '.parent-btn-dropdown', count: 0
assert_select '.dropdown-menu', count: 0
end
diff --git a/test/functional/sharing/batch_sharing_change_test.rb b/test/functional/sharing/batch_sharing_change_test.rb
index a58e0ce1e3..5f56f0439c 100644
--- a/test/functional/sharing/batch_sharing_change_test.rb
+++ b/test/functional/sharing/batch_sharing_change_test.rb
@@ -38,32 +38,59 @@ def setup
login_as(@user)
person = User.current_user.person
- bulk_create_sharing_assets
+ bulk_create_sharing_assets # Creates one of each everything
+ Sop.last.assays = [Assay.last] # Links sop with isa structure
+
+ # Add manageable df link to isa that cannot be managed
+ other_user = FactoryBot.create(:user).person
+ o_inv=FactoryBot.create(:investigation, contributor: other_user)
+ o_study = FactoryBot.create(:study, investigation: o_inv, contributor: other_user)
+ o_assay = FactoryBot.create(:assay, study: o_study, contributor: other_user, policy: FactoryBot.create(:policy, access_type: Policy::VISIBLE))
+ df = FactoryBot.create(:data_file, contributor: @user.person, assay_ids: [o_assay.id])
+ assert df.can_manage?
+ assert !o_assay.can_manage?
+ assert !o_study.can_manage?
+ assert !o_inv.can_manage?
+
+ # Items that can be changed should be 1 of each except events(+1), investigations(+2), studies(+1) and datafiles(+1)
+ related_items_count = Seek::Util.authorized_types.length + 5
get :batch_sharing_permission_preview, params: { id: person.id }
assert_response :success
-
- assert_select 'a[href=?]', "/people/#{person.id}", text:/#{person.name}/, count:1
- assert_select 'div#jstree', count:1
- assert_select 'div#jstree_not_isa', count:1
+ assert_select 'h1', text: /items related to/, count: 1 do
+ assert_select 'a[href=?]', "/people/#{person.id}", text: /#{person.name}/, count: 1
+ end
+ assert_select 'div#sorted_by_type', count: 1 do
+ # Should see all items with policies
+ assert_select '.type_and_title', count: related_items_count
+ assert_select '[type=checkbox]', count: related_items_count
+ end
+ assert_select 'div#sorted_by_isa', count: 1 do
+ # Should see all items with policies and blocked ISA
+ assert_select '.type_and_title', count: related_items_count + 3
+ assert_select '[type=checkbox]', count: related_items_count
+ assert_select '.parent-btn-checkbox.cant_manage', count: 1
+ assert_select '.parent-btn-checkbox.not_visible', count: 2
+ assert_select '.type_and_title', text: /This item is hidden to you/, count: 2 # Doesn't even show title
+ end
end
test 'should list the selected items' do
- params = { share_not_isa: {}, share_isa: {}}
+ params = { publish: {} }
params= params.merge(id: @person.id)
post :batch_change_permission_for_selected_items, params: params
assert_response :redirect
assert_equal flash[:error], 'Please choose at least one item!'
- #selected items don't include downloadable items
- params[:share_not_isa] = {}
+ # selected items don't include downloadable items
+ params[:publish] = {}
event = FactoryBot.create(:event, contributor: @person)
- params[:share_not_isa][event.class.name]||= {}
- params[:share_not_isa][event.class.name][event.id.to_s] = '1'
+ params[:publish][event.class.name] ||= {}
+ params[:publish][event.class.name][event.id.to_s] = '1'
post :batch_change_permission_for_selected_items, params: params.merge(id: @person.id)
assert_select '.highlight-colour', count: 0
@@ -72,22 +99,22 @@ def setup
end
#selected items include downloadable items
- params[:share_not_isa] = {}
+ params[:publish] = {}
model = FactoryBot.create(:model, contributor: @person, projects: [@person.projects.first])
- params[:share_not_isa][model.class.name] ||= {}
- params[:share_not_isa][model.class.name][model.id.to_s] = '1'
+ params[:publish][model.class.name] ||= {}
+ params[:publish][model.class.name][model.id.to_s] = '1'
df = data_with_isa
- params[:share_isa][df.class.name]||= {}
- params[:share_isa][df.class.name][df.id.to_s] = '1'
+ params[:publish][df.class.name] ||= {}
+ params[:publish][df.class.name][df.id.to_s] = '1'
post :batch_change_permission_for_selected_items, params: params.merge(id: @person.id)
assert_select '.type_and_title', count: 2 do
- assert_select 'a[href=?]', data_file_path(df), text:/#{df.title}/
- assert_select 'a[href=?]', model_path(model), text:/#{model.title}/
+ assert_select 'a[href=?]', data_file_path(df), text: /#{df.title}/
+ assert_select 'a[href=?]', model_path(model), text: /#{model.title}/
assert_select '.icon', count: 2
end
- assert_select '.highlight-colour', count: 1, text:/Download/
+ assert_select '.highlight-colour', count: 1, text: /Download/
end
@@ -105,15 +132,15 @@ def setup
assert !df.can_download?(other_person)
- params = { share_not_isa: {}, share_isa: {}}
- params[:share_not_isa][model.class.name] ||= {}
- params[:share_not_isa][model.class.name][model.id.to_s] = '1'
- params[:share_isa][df.class.name]||= {}
- params[:share_isa][df.class.name][df.id.to_s] = '1'
- params[:share_isa]['Banana'] = { '123' => '1' } # Should be ignored
+ params = { publish: {} }
+ params[:publish][model.class.name] ||= {}
+ params[:publish][model.class.name][model.id.to_s] = '1'
+ params[:publish][df.class.name] ||= {}
+ params[:publish][df.class.name][df.id.to_s] = '1'
+ params[:publish]['Banana'] = { '123': '1' } # Should be ignored
# batch change sharing policy and grant other_people manage right
- params[:policy_attributes] = {access_type: Policy::NO_ACCESS, permissions_attributes: {'1' => {contributor_type: 'Person', contributor_id: other_person.id, access_type: Policy::MANAGING}}}
+ params[:policy_attributes] = {access_type: Policy::NO_ACCESS, permissions_attributes: {'1': {contributor_type: 'Person', contributor_id: other_person.id, access_type: Policy::MANAGING}}}
params= params.merge(id: @person.id)
post :batch_sharing_permission_changed, params: params
assert_response :success
@@ -150,13 +177,13 @@ def setup
assert !df.gatekeeper_required?
# Batch change sharing policy params
- params = { share_not_isa: {}, share_isa: {}}
- params[:share_not_isa][gk_model.class.name] ||= {}
- params[:share_not_isa][gk_model.class.name][gk_model.id.to_s] = '1'
- params[:share_isa][gk_df.class.name] ||= {}
- params[:share_isa][gk_df.class.name][gk_df.id.to_s] = '1'
- params[:share_isa][df.class.name] ||= {}
- params[:share_isa][df.class.name][df.id.to_s] = '1'
+ params = { publish: {} }
+ params[:publish][gk_model.class.name] ||= {}
+ params[:publish][gk_model.class.name][gk_model.id.to_s] = '1'
+ params[:publish][gk_df.class.name] ||= {}
+ params[:publish][gk_df.class.name][gk_df.id.to_s] = '1'
+ params[:publish][df.class.name] ||= {}
+ params[:publish][df.class.name][df.id.to_s] = '1'
params = params.merge(id: a_person.id)
# Can't make public without involving gatekeeper