fixing issue with rack 2.0.8

simplicitybg · Dec 30, 2019 · ef0b230 · ef0b230
1 parent 58c4ee3
commit ef0b230
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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 }
     }
   }