sibu 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae660a877d92fc982f3f013404a4afd4d79e46de
-  data.tar.gz: 5b4221c6178eb1b5cb4b497bfef8801e989c77a3
+  metadata.gz: eeb7409413b51b5a0933c57ea35a968ea821227b
+  data.tar.gz: 61391deb0edaccb79e69867f9ab2af20323a497b
 SHA512:
-  metadata.gz: b954bf098086c3b9ac081be9538a5e565f93908ade83b99dd6dfb72f01e2efdb3a8f806d2bd8be10176a558723be7fbb3f3afc17893dcaa980e8d1ca414017cf
-  data.tar.gz: 2a9d4af45641c0db7453ae2439c944df92a577cb401c3ed588ac8bf523801102b4ca190ee5cc0a8f278ac40ba0e50c6d6b58f2ed0c70016e9592ead171414b2c
+  metadata.gz: 29e4d615c196138a7456fabb3bf6a12b06934729d0c30be4d2d57c9d867fa41e68c02b7530111f10238901090febb34b8f2f7e2230a0bc86e4b4bdeaf0086c92
+  data.tar.gz: ab65058f811c6d7c9c8b3c6fc8dd0fa55890819c13b8ba7ff0acb00ab05a65c1f4413b907d5f644183a3ca2c8780f2d906ca91ac1f3b24aed1ffde28ec169078

data/app/controllers/sibu/images_controller.rb

@@ -17,15 +17,15 @@ module Sibu
       @image = Sibu::Image.new(image_params)
       if @image.save
         if @page_id && @section_id && @element_id && @size
-          page = Sibu::Page.find(@page_id)
+          entity = @entity_type == 'site' ? @site : Sibu::Page.find(@page_id)
           ids = (@section_id.split('|') + @element_id.split('|')).uniq[0...-1]
-          elt = page.update_element(*ids, {"id" => @img_id, "src" => @image.file_url(@size.to_sym), "alt" => @image.alt})
+          elt = entity.update_element(*ids, {"id" => @img_id, "src" => @image.file_url(@size.to_sym), "alt" => @image.alt})
           if elt.nil?
             msg = {alert: "Une erreur s'est produite lors de la mise à jour de l'image."}
           else
             msg = {notice: "L'image a bien été mise à jour."}
           end
-          redirect_to site_page_edit_content_path(@site.id, page.id), msg
+          redirect_to site_page_edit_content_path(@site.id, @page_id), msg
         else
           redirect_to site_images_url(@image.site_id), notice: "L'image a bien été téléchargée."
         end
@@ -55,6 +55,7 @@ module Sibu
 
     def set_edition_context
       @page_id = params[:page_id]
+      @entity_type = params[:entity_type]
       @section_id = params[:section_id]
       @element_id = params[:element_id]
       @img_id = params[:img_id]

data/app/views/sibu/images/_form.html.erb

@@ -16,6 +16,7 @@
   </div>
   <%= f.hidden_field :site_id %>
   <%= hidden_field_tag :page_id, @page_id %>
+  <%= hidden_field_tag :entity_type, @entity_type %>
   <%= hidden_field_tag :element_id, @element_id %>
   <%= hidden_field_tag :section_id, @section_id %>
   <%= hidden_field_tag :img_id, @img_id %>

data/app/views/sibu/pages/_media_edit_panel.html.erb

@@ -4,7 +4,7 @@
 <div class="sibu_edit_form">
   <%= form_tag(update_element_site_page_path(@site.id, @page.id), method: :patch, remote: true) do |f| %>
     <div class="sibu_select_images sibu_field">
-      <p>Sélectionnez ou <%= link_to 'téléchargez', new_site_image_path(@site.id, page_id: @page.id, section_id: @section_id,
+      <p>Sélectionnez ou <%= link_to 'téléchargez', new_site_image_path(@site.id, page_id: @page.id, section_id: @section_id, entity_type: @entity_type,
                                                                         element_id: @element_id, img_id: @element["id"], size: @size) %> une image</p>
       <% site_images.each do |image| %>
       <div class="sibu_image" data-img-id="<%= image.id %>">

data/lib/sibu/version.rb

@@ -1,3 +1,3 @@
 module Sibu
-  VERSION = '0.1.26'
+  VERSION = '0.1.27'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sibu
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Jean-Baptiste Vilain