Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issue #1457: Comprehensive LDAP settings are to big for the DelayedJobs database table.

Browse source
This commit is contained in:
Thorsten Eckel 2017-10-24 17:00:48 +02:00
parent 378d19c691
commit aeb1feb826
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/concerns/integration/import_job_base.rb
View file

@ -30,15 +30,19 @@ module Integration::ImportJobBase
end end
def payload_dry_run def payload_dry_run
params clean_payload(params.permit!.to_h)
end end
def payload_import def payload_import
import_setting clean_payload(import_setting)
end end
private private
def clean_payload(payload)
payload.except(:wizardData, :action, :controller)
end
def answer_with def answer_with
result = yield result = yield
render json: result.merge(result: 'ok') render json: result.merge(result: 'ok')

2
app/controllers/integration/exchange_controller.rb
View file

@ -59,7 +59,7 @@ class Integration::ExchangeController < ApplicationController
# currently a workaround till LDAP is migrated to Sequencer # currently a workaround till LDAP is migrated to Sequencer
def payload_dry_run def payload_dry_run
{ {
ews_attributes: params[:attributes], ews_attributes: params[:attributes].permit!.to_h,
ews_folder_ids: params[:folders], ews_folder_ids: params[:folders],
ews_config: { ews_config: {
endpoint: params[:endpoint], endpoint: params[:endpoint],