ecm_pictures2_backend 2.0.4 → 2.0.5
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2f50752c7159bb9e819a8b43e26fd162866f5fd7
|
4
|
+
data.tar.gz: d8720154af161c49381c59a756b6b25430822a97
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 9a093271ca0f3e9df73dc470d43660aa779d2341193315472394d927be53405f3f582db642cae466e1bd87711c8c9a1bd7431730c7f6b33ef46f17407c69aee6
|
7
|
+
data.tar.gz: 131e19857af70f387f8fca84fdea17b8c6ba5525953191e0dc22a6a0b08a7f0a70799214d1cc27ca3d9144a3b1dfda15667e8297102d344378f0bbfc7476bd34
|
@@ -5,10 +5,6 @@ class Ecm::Pictures::Backend::PicturesController < Itsf::Backend::Resource::Base
|
|
5
5
|
|
6
6
|
private
|
7
7
|
|
8
|
-
def request_includes_base64_image?
|
9
|
-
params[:ecm_pictures_picture].key?(:image_base64)
|
10
|
-
end
|
11
|
-
|
12
8
|
def extract_image_base64(encoded_image)
|
13
9
|
decoded_image = Base64.decode64(encoded_image.gsub(/^data\:image\/\w+\;base64\,/, '')).force_encoding('UTF-8')
|
14
10
|
content_type = encoded_image.split(';').first.split(':').last
|
@@ -24,11 +20,13 @@ class Ecm::Pictures::Backend::PicturesController < Itsf::Backend::Resource::Base
|
|
24
20
|
def permitted_params
|
25
21
|
processed_params = params.deep_dup
|
26
22
|
image_base64 = processed_params[:ecm_pictures_picture].try(:delete, :image_base64)
|
23
|
+
|
24
|
+
p = processed_params.require(:ecm_pictures_picture).permit(:picture_gallery_id, :name, :markup_language, :description, :tag_list, :image)
|
25
|
+
|
27
26
|
if image_base64.present?
|
28
|
-
image
|
29
|
-
|
27
|
+
p.merge(image: extract_image_base64(image_base64) )
|
28
|
+
else
|
29
|
+
p
|
30
30
|
end
|
31
|
-
processed_params.require(:ecm_pictures_picture)
|
32
|
-
.permit(:picture_gallery_id, :name, :markup_language, :description, :image, :tag_list)
|
33
31
|
end
|
34
32
|
end
|