ecm_pictures2_backend 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b9cf1131af3dc346a6e1a627471b2a157bfe1d3
-  data.tar.gz: c18acd53df03a461ffad0d239dc4a49dd9a3296a
+  metadata.gz: 4e34db79ab78f1d829cae81c7b8d7d19ae57a33c
+  data.tar.gz: 2a25ce6e82d1b243dd86d1ac4fe5ccce1bff0678
 SHA512:
-  metadata.gz: 9222f4cab585e8d1e705c065ed04e77b5a3ef3556c29373a2aee7e40a6e26230be72324521622a360fbdaf9d548d5f6436111b85de683aa091bdf4d01ad55a62
-  data.tar.gz: 9c717864e2192223fcc06044dc687d1f8f0ae896ee5d12d637b00726b4b6c407e1dc726bda5130ff975959cc1f87d30560976cbb76533abe579dbfab33ebfea6
+  metadata.gz: 6e65e8f5c05cd16cc26d6c492e37ad39b91feda7e282ebceb75233093ee7211eaac80e4fbe1b9906edc7ed751ccbf5d3bab23dc54b8509a313363cc501131e84
+  data.tar.gz: 38b5631ba0c2862e3ab5bea37c2d4016a5c8c9ae33877e21a54819327ad97602e47bc42f7363c26628f9993adf21b63e479ad42626e20480bfb45d3d8de95156

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

@@ -1,4 +1,8 @@
 class Ecm::Pictures::Backend::GalleriesController < Itsf::Backend::Resource::BaseController
+  include ResourcesController::Sorting
+  include ResourcesController::ActsAsListConcern
+  include ResourcesController::ActsAsPublishedConcern
+
   def self.resource_class
     Ecm::Pictures::Gallery
   end
@@ -8,6 +12,6 @@ class Ecm::Pictures::Backend::GalleriesController < Itsf::Backend::Resource::Bas
   def permitted_params
     params
       .require(:gallery)
-      .permit(:name, :markup_language, :description, :link_images, :tag_list, picture_images: [])
+      .permit(:name, :markup_language, :description, :link_images, :tag_list, :published, picture_images: [])
   end
 end

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

@@ -1,53 +1,46 @@
-class Ecm::Pictures::Backend::PicturesController < Itsf::Backend::Resource::BaseController
-  module ColumnsHashFix
-    extend ActiveSupport::Concern
-    
-    included do
-      before_action :fix_columns_hash, only: [:update]
-    end
-
-    private
-
-    def fix_columns_hash
-      # @todo Find out what is causing the loss of columns in columns_hash
-      resource_class.reset_column_information
-    end
-  end
-
-  include ColumnsHashFix
-
-  def self.resource_class
-    Ecm::Pictures::Picture
-  end
-
-  private
-
-  def collection_scope
-    super.includes(:gallery)
-  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
-    basename = 'image'
-    extension = '.jpg'
-
-    image = Tempfile.new([basename, extension])
-    image.write decoded_image
-    image.rewind
-    image
-  end
-
-  def permitted_params
-    processed_params = params.deep_dup
-    image_base64 = processed_params[:picture].try(:delete, :image_base64)
-
-    p = processed_params.require(:picture).permit(:gallery_id, :name, :markup_language, :description, :tag_list, :image)
-
-    if image_base64.present?
-      p.merge(image: extract_image_base64(image_base64) ) 
-    else
-      p
+module Ecm
+  module Pictures
+    module Backend
+      class PicturesController < Itsf::Backend::Resource::BaseController
+        include ResourcesController::Sorting
+        include ResourcesController::ActsAsListConcern
+        include ResourcesController::ActsAsPublishedConcern
+
+        def self.resource_class
+          Ecm::Pictures::Picture
+        end
+
+        private
+
+        def load_collection_scope
+          super.includes(:gallery)
+        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
+          basename = 'image'
+          extension = '.jpg'
+
+          image = Tempfile.new([basename, extension])
+          image.write decoded_image
+          image.rewind
+          image
+        end
+
+        def permitted_params
+          processed_params = params.deep_dup
+          image_base64 = processed_params[:picture].try(:delete, :image_base64)
+
+          p = processed_params.require(:picture).permit(:gallery_id, :name, :markup_language, :description, :tag_list, :image, :published)
+
+          if image_base64.present?
+            p.merge(image: extract_image_base64(image_base64))
+          else
+            p
+          end
+        end
+      end
     end
   end
 end

data/app/views/ecm/pictures/backend/galleries/_form.html.haml

@@ -7,6 +7,7 @@
 
 .well
   = form.input :link_images
+  = form.input :published, as: :boolean
 
 .well
   = form.input :picture_images, as: :file, input_html: { multiple: 'multiple' }

data/app/views/ecm/pictures/backend/galleries/_show.haml

@@ -4,7 +4,7 @@
 = table.row :pictures_count
 = table.row :position
 = table.row :markup_language
-= table.row :markup_language
+= table.row :published
 = table.row(:tenant, as: :association) if table.resource.respond_to?(:tenant)
 = table.row(:tag_list) if table.resource.respond_to?(:tag_list)
 = table.row :display_code_for_erb

data/app/views/ecm/pictures/backend/galleries/_table.html.haml

@@ -1,6 +1,10 @@
-= table.column :name, sortable: true, class: 'truncate-chars truncate-chars-30'
-= table.column :description, sortable: true, class: 'truncate-chars truncate-chars-30'
-= table.column :link_images, sortable: true
-= table.column :pictures_count, sortable: true do |gallery|
-  %span.label.label-default= gallery.pictures_count
-= table.timestamps
+= table.acts_as_list_actions
+= table.column :name, sort: true, class: 'truncate-chars truncate-chars-30'
+= table.column :description, sort: true, class: 'truncate-chars truncate-chars-30'
+= table.boolean :link_images, sort: true
+= table.column :pictures_count do |gallery|
+  - capture_haml do
+    %span.label.label-default
+      = gallery.pictures_count
+= table.timestamps(sort: true)
+= table.acts_as_published_actions

data/app/views/ecm/pictures/backend/pictures/_form.html.haml

@@ -8,6 +8,9 @@
   = form.input :markup_language, collection: Ecm::Pictures::markup_languages
   = form.input :description, input_html: { 'data-add-editor': Itsf::Backend.features?(:'ace-rails-ap'), 'data-editor-syntax': :textile }
 
+.well
+  = form.input :published, as: :boolean
+
 .well
   = form.input :image
   = image_tag(form.object.image.url(:default_thumb)) if form.object.image.present?

data/app/views/ecm/pictures/backend/pictures/_show.html.haml

@@ -12,5 +12,6 @@
   = table.row :tag_list
 = table.row :display_code_for_textile
 = table.row :display_code_for_erb
+= table.row :published
 = table.row :created_at
 = table.row :updated_at

data/app/views/ecm/pictures/backend/pictures/_table.html.haml

@@ -1,7 +1,12 @@
-= table.association :gallery # , sortable: :gallery_name
+= table.acts_as_list_actions
+= table.association :gallery, sort: { column_name: 'ecm_pictures_galleries.name' }
 = table.column(:preview_picture) do |picture|
-  %img.img-responsive.bottom-margin-2{ src: picture.image.url(:default_thumb) }
-= table.column :name, sortable: true, class: 'truncate-chars truncate-chars-30'
-= table.column :description, sortable: true, class: 'truncate-chars truncate-chars-30'
-= table.column(:image_file_size, sortable: true) { |picture| number_to_human_size(picture.image_file_size) }
-= table.timestamps
+  - capture_haml do
+    %img.img-responsive.bottom-margin-2{ src: picture.image.url(:default_thumb) }
+= table.column :name, sort: true, class: 'truncate-chars truncate-chars-30'
+= table.column :description, sort: true, class: 'truncate-chars truncate-chars-30'
+= table.column(:image_file_size, sort: true) do |picture|
+  - capture_haml do
+    = number_to_human_size(picture.image_file_size)
+= table.timestamps(sort: true)
+= table.acts_as_published_actions

data/config/routes.rb

@@ -1,6 +1,12 @@
 Ecm::Pictures::Backend::Engine.routes.draw do
-  backend_resources :galleries
-  backend_resources :pictures
+  backend_resources :galleries do
+    post :reposition, on: :member
+    post :toggle_published, on: :member
+  end
+  backend_resources :pictures do
+    post :reposition, on: :member
+    post :toggle_published, on: :member
+  end
 
   root to: 'home#index'
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_pictures2_backend
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails