From ef0b230c9df6cce1fd6236ea9182fcc4c0e134d9 Mon Sep 17 00:00:00 2001 From: Oleg Date: Mon, 30 Dec 2019 15:10:56 -0500 Subject: [PATCH] fixing issue with rack 2.0.8 --- app/assets/config/manifest.js | 3 --- app/views/comfy/admin/cms/files/index.html.haml | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 8c54e8074..e69de29bb 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -1,3 +0,0 @@ -//= link_directory ../javascripts/comfy/cms .js -//= link_directory ../stylesheets/comfy/cms .css -//= link_directory ../fonts/comfy/cms .eot diff --git a/app/views/comfy/admin/cms/files/index.html.haml b/app/views/comfy/admin/cms/files/index.html.haml index a0d9cc3d9..706d4ad4f 100644 --- a/app/views/comfy/admin/cms/files/index.html.haml +++ b/app/views/comfy/admin/cms/files/index.html.haml @@ -2,11 +2,13 @@ = render "comfy/admin/cms/categories/index", type: "Comfy::Cms::File" :ruby + session_id = request.session_options[:id] + session_id_value = session_id.respond_to?(:public_id) ? session_id.public_id : session_id.to_s cms_uploader_data = { cms_uploader: { url: comfy_admin_cms_site_files_path(@site, source: :plupload, categories: params[:categories]), - token: {name: request_forgery_protection_token, value: form_authenticity_token}, - session: {name: Rails.application.config.session_options[:key], value: request.session_options[:id].public_id} + token: { name: request_forgery_protection_token, value: form_authenticity_token }, + session: { name: Rails.application.config.session_options[:key], value: session_id_value } } }