Merge pull request 'master' (#18 ) from 123/seminar:master into master

Reviewed-on: https://gitlab.tp.rulingcom.com/spen/seminar/pulls/18
fix error after update carrierwave
2024-04-09 13:06:06 +00:00 · 2024-04-09 12:57:03 +08:00 · 2024-03-21 22:24:39 +08:00
2 changed files with 2 additions and 2 deletions
--- a/custom_gallery/app/controllers/admin/custom_galleries_controller.rb
+++ b/custom_gallery/app/controllers/admin/custom_galleries_controller.rb
@ -502,7 +502,7 @@ class Admin::CustomGalleriesController < OrbitAdminController
                 theater_link: admin_image_path(values),
                 description: values.description,
                 title: values.title,
-                 file: values.file.as_json[:file],
+                 file: values.file.as_json,
                 custom_gallery_custom_album_id: values.custom_album_id,
                 order: values.order,
                 tags: values.tags}
--- a/custom_gallery/app/controllers/custom_galleries_controller.rb
+++ b/custom_gallery/app/controllers/custom_galleries_controller.rb
@ -242,7 +242,7 @@ class CustomGalleriesController < ApplicationController
                  title: values.title,
                  alt_title: alt_text,
                  url: values.file.url,
-                  file: values.file.as_json[:file],
+                  file: values.file.as_json,
                  custom_gallery_custom_album_id: values.custom_album_id,
                  tags: values.tags}
    end
Author	SHA1	Message	Date
chiu	be3af16a12	Merge pull request 'master' (#18 ) from 123/seminar:master into master Reviewed-on: https://gitlab.tp.rulingcom.com/spen/seminar/pulls/18	2024-04-09 13:06:06 +00:00
邱博亞	382df44068	fix error after update carrierwave	2024-04-09 12:57:03 +08:00
邱博亞	cb7cad9c74	Fix bug.	2024-03-21 22:24:39 +08:00