ecm_pictures2_backend 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce0f36da3bef9676cd20ae846bdf4e5192930ed1
-  data.tar.gz: d2347b3a3fcad6e1d664555471230c3d7f0b5030
+  metadata.gz: 2f50752c7159bb9e819a8b43e26fd162866f5fd7
+  data.tar.gz: d8720154af161c49381c59a756b6b25430822a97
 SHA512:
-  metadata.gz: 4e322d6962198e1e76923b7576bb8c46ac72cef3853f2b02d79b8f7df4c3489be4c45e90cc82994fd99c525205e1cc7d4b045bc45de784614d7681d33cb34c2a
-  data.tar.gz: 8708eeedc87704e1cea1eb25f176e8d71b4b65e0df14862c9c527c090ead5b42b553698cedf02f43a4f18cb6383cc997f5fc1c7a5b2eec6159f0300c988fc42b
+  metadata.gz: 9a093271ca0f3e9df73dc470d43660aa779d2341193315472394d927be53405f3f582db642cae466e1bd87711c8c9a1bd7431730c7f6b33ef46f17407c69aee6
+  data.tar.gz: 131e19857af70f387f8fca84fdea17b8c6ba5525953191e0dc22a6a0b08a7f0a70799214d1cc27ca3d9144a3b1dfda15667e8297102d344378f0bbfc7476bd34

data/app/controllers/ecm/pictures/backend/pictures_controller.rb

@@ -5,10 +5,6 @@ class Ecm::Pictures::Backend::PicturesController < Itsf::Backend::Resource::Base
 
   private
 
-  def request_includes_base64_image?
-    params[:ecm_pictures_picture].key?(:image_base64)
-  end
-
   def extract_image_base64(encoded_image)
     decoded_image = Base64.decode64(encoded_image.gsub(/^data\:image\/\w+\;base64\,/, '')).force_encoding('UTF-8')
     content_type = encoded_image.split(';').first.split(':').last
@@ -24,11 +20,13 @@ class Ecm::Pictures::Backend::PicturesController < Itsf::Backend::Resource::Base
   def permitted_params
     processed_params = params.deep_dup
     image_base64 = processed_params[:ecm_pictures_picture].try(:delete, :image_base64)
+    
+    p = processed_params.require(:ecm_pictures_picture).permit(:picture_gallery_id, :name, :markup_language, :description, :tag_list, :image)
+
     if image_base64.present?
-      image = extract_image_base64(image_base64) 
-      processed_params[:ecm_pictures_picture].merge!(image: image)
+      p.merge(image: extract_image_base64(image_base64) ) 
+    else
+      p
     end
-    processed_params.require(:ecm_pictures_picture)
-                      .permit(:picture_gallery_id, :name, :markup_language, :description, :image, :tag_list)
   end
 end

data/lib/ecm/pictures/backend/version.rb

@@ -1,7 +1,7 @@
 module Ecm
   module Pictures
     module Backend
-      VERSION = '2.0.4'.freeze
+      VERSION = '2.0.5'.freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ecm_pictures2_backend
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Roberto Vasquez Angel