udongo 5.3.1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d86f45348cbaf7e17874b28d0ed6127723114c69
-  data.tar.gz: 3720785fb4413c8da1e76fa990405c3c4023edc1
+  metadata.gz: 75a5407f853e677bc244654a801843f1b9663805
+  data.tar.gz: e3a9c0edbb2798d44ad7bd5fe934ee2c2826d5be
 SHA512:
-  metadata.gz: c890e82171a21337cf9fb70840042609383a69f3e2b14b4038b4655949ca41eb52d81fc261e7bb570467d3586b25213dac2661f9d685cb258126500f0aec5bc8
-  data.tar.gz: 9e1499743c8b7692e17fe11fc51d7470319eb86a0f251ea12214a4fea855b0b97707c5e5415e3fceb3287b21cbfcf17eeaf4dc2c91268154cb09b8d92bfffebd
+  metadata.gz: 4bc1535a00eded6212d6c39e0d0293ad7c28f99ac6809ec248f4bdf725d97a0d526711a65e2a4d80f5c065b3fcf026cb832e8c02faa4bc4e1c8f79edbf20b1e6
+  data.tar.gz: 3266aceac326318a4f86fd648f6b51e9c4f1f445b7e889fae6cb4e0d9c660a40b0202f08e61d89f8cc0b2400bba0fa0eca11d0a47b5d8c951038e308321f0d46

data/app/assets/javascripts/backend/sortable.js

@@ -26,7 +26,7 @@ var sortable = sortable || {
   },
 
   update_position_listener: function(e, ui) {
-    var new_position = ui.item.index() + 1
+    var new_position = ui.item.index() + 1;
 
     $.ajax({
       data: { position: new_position },

data/app/controllers/backend/articles/base_controller.rb

@@ -0,0 +1,11 @@
+class Backend::Articles::BaseController < Backend::BaseController
+  before_action :find_article
+  before_action do
+    breadcrumb.add t('b.articles'), backend_articles_path
+    breadcrumb.add @article.title
+  end
+
+  def find_article
+    @article = Article.find params[:article_id]
+  end
+end

data/app/controllers/backend/articles/images_controller.rb

@@ -0,0 +1,15 @@
+class Backend::Articles::ImagesController < Backend::Articles::BaseController
+  include Concerns::Backend::PositionableController
+
+  before_action { breadcrumb.add t('b.images') }
+
+  def index
+    @images = @article.images
+  end
+
+  private
+
+  def find_model
+    @model = @article.images.find params[:id]
+  end
+end

data/app/controllers/backend/images_controller.rb

@@ -0,0 +1,56 @@
+class Backend::ImagesController < Backend::BaseController
+  before_action :find_model
+  before_action :init_image, only: [:index, :new, :create]
+  layout 'backend/lightbox'
+
+  def index
+    @search = Asset.ransack params[:q]
+    @assets = @search.result(distinct: true).image.where.not(id: @model.images.pluck(:asset_id)).order('id DESC')
+  end
+
+  def create
+    @image.build_asset
+    @image.asset.filename = params[:image][:asset][:filename]
+    @image.asset.description = params[:image][:asset][:description]
+
+    if @image.asset.filename && @image.asset.filename.content_type.to_s.include?('image') && @image.save
+      redirect_images_overview(:added)
+    else
+      @image.errors.add :filename, 'Ignore me'
+      render :new
+    end
+  end
+
+  def link
+    @model.images.create(asset: Asset.find(params[:asset_id]))
+    redirect_images_overview(:added)
+  end
+
+  def unlink
+    @model.images.find_by(asset_id: params[:asset_id]).destroy
+    redirect_images_overview(:deleted)
+  end
+
+  private
+
+  def find_model
+    begin
+      @model ||= params[:klass].constantize.find params[:id]
+    rescue
+      redirect_to backend_path
+    end
+  end
+
+  def allowed_params
+    params[:image].permit(asset_attributes: [:filename, :description])
+  end
+
+  def redirect_images_overview(action)
+    redirect_to send("backend_#{@model.class.name.underscore}_images_path", @model),
+                notice: translate_notice(action, :image)
+  end
+
+  def init_image
+    @image = @model.images.new
+  end
+end

data/app/models/article.rb

@@ -5,6 +5,7 @@ class Article < ApplicationRecord
   include Concerns::FlexibleContent
   include Concerns::Searchable
   include Concerns::Publishable
+  include Concerns::Imageable
 
   include Concerns::Translatable
   translatable_fields :title, :summary

data/app/models/asset.rb

@@ -5,6 +5,8 @@ class Asset < ApplicationRecord
 
   has_many :images, dependent: :destroy
 
+  scope :image, -> { where(content_type: %w(image/gif image/jpeg image/png)) }
+
   before_save :update_filesize, :update_content_type
 
   validates :filename, presence: true

data/app/models/concerns/visible.rb

@@ -5,8 +5,8 @@ module Concerns
     extend ActiveSupport::Concern
 
     included do
-      scope :visible, ->{ where(visible: true) }
-      scope :hidden, ->{ where('visible = 0 OR visible IS NULL') }
+      scope :visible, -> { where(visible: true) }
+      scope :hidden, -> { where('visible = 0 OR visible IS NULL') }
     end
 
     def hidden?

data/app/models/content_column.rb

@@ -12,13 +12,13 @@ class ContentColumn < ApplicationRecord
   belongs_to :row, class_name: 'ContentRow', touch: true
   belongs_to :content, polymorphic: true, dependent: :destroy
 
+  default_scope -> { order(:position) }
+
   validates :row, presence: true
   validates :width_xs, :width_sm, :width_md, :width_lg, :width_xl,
             presence: true,
             numericality: { greater_than: 0, less_than_or_equal_to: 12,  only_integer: true }
 
-  default_scope -> { order(:position) }
-
   def linked_to_searchable_parent?
     parent.present? && parent.searchable?
   end

data/app/models/image.rb

@@ -2,7 +2,7 @@ class Image < ApplicationRecord
   include Concerns::Visible
 
   include Concerns::Sortable
-  sortable scope: [:asset_id]
+  sortable scope: [:imageable_id]
 
   belongs_to :asset
   belongs_to :imageable, polymorphic: true

data/app/models/note.rb

@@ -1,7 +1,7 @@
 class Note < ApplicationRecord
   belongs_to :notable, polymorphic: true
 
-  validates :content, presence: true
-
   default_scope { order('created_at DESC') }
+
+  validates :content, presence: true
 end

data/app/models/queued_task.rb

@@ -1,11 +1,11 @@
 class QueuedTask < ApplicationRecord
-  validates :klass, presence: true
-
   serialize :data, Hash
 
   scope :locked, -> { where(locked: true) }
   scope :not_locked, -> { where('locked = 0 OR locked IS NULL') }
 
+  validates :klass, presence: true
+
   def lock!
     update_attribute :locked, true
   end

data/app/models/redirect.rb

@@ -1,10 +1,10 @@
 class Redirect < ApplicationRecord
-  validates :source_uri, :destination_uri, :status_code, presence: true
-  validates :source_uri, uniqueness: { case_sensitive: false }
-
   scope :disabled, -> { where(disabled: true) }
   scope :enabled, -> { where('disabled IS NULL or disabled = 0') }
 
+  validates :source_uri, :destination_uri, :status_code, presence: true
+  validates :source_uri, uniqueness: { case_sensitive: false }
+
   def enabled?
     !disabled?
   end

data/app/models/search_module.rb

@@ -1,8 +1,8 @@
 class SearchModule < ApplicationRecord
-  validates :name, presence: true
-
   scope :weighted, -> { order('weight DESC') }
 
+  validates :name, presence: true
+
   def indices
     SearchIndex.joins('INNER JOIN search_modules ON search_indices.searchable_type = search_modules.name')
       .where('search_modules.name = ?', name)

data/app/models/search_synonym.rb

@@ -1,5 +1,4 @@
 class SearchSynonym < ApplicationRecord
   validates :locale, :term, :synonyms, presence: true
-
   validates :term, uniqueness: { case_sensitive: false, scope: :locale }
 end

data/app/views/backend/articles/_tabs.html.erb

@@ -5,7 +5,7 @@
         <% klass = %w(nav-link) %>
         <% klass << 'active' if active == :general %>
 
-        <%= link_to t('b.general'), edit_backend_article_path(@model), class: klass %>
+        <%= link_to t('b.general'), edit_backend_article_path(model), class: klass %>
       </li>
 
       <% Udongo.config.i18n.app.locales.each do |locale| %>
@@ -13,11 +13,17 @@
           <% klass = %w(nav-link) %>
           <% klass << 'active' if active == locale.to_sym %>
 
-          <%= link_to locale.upcase, edit_translation_backend_article_path(@model, locale), class: klass %>
+          <%= link_to locale.upcase, edit_translation_backend_article_path(model, locale), class: klass %>
         </li>
       <% end %>
 
-      <!-- TODO show the images tab if Udongo.config.articles.images? -->
+      <% if Udongo.config.articles.images? %>
+        <li class="nav-item">
+          <% klass = %w(nav-link) %>
+          <% klass << 'active' if active == :images %>
+          <%= link_to icon(:image, t('b.images')), backend_article_images_path(model), class: klass %>
+        </li>
+      <% end %>
     </ul>
   </div>
 </div>

data/app/views/backend/articles/edit.html.erb

@@ -2,5 +2,5 @@
 <% breadcrumb.add t('b.edit') %>
 <%= render 'backend/breadcrumbs' %>
 
-<%= render 'tabs', active: :general %>
+<%= render 'tabs', model: @model, active: :general %>
 <%= render 'form', model: @model %>

data/app/views/backend/articles/edit_translation.html.erb

@@ -2,7 +2,7 @@
 <% breadcrumb.add t('b.edit') %>
 <%= render 'backend/breadcrumbs' %>
 
-<%= render 'tabs', active: params[:translation_locale].to_sym %>
+<%= render 'tabs', model: @model, active: params[:translation_locale].to_sym %>
 <%= render 'backend/general_form_error', object: @translation %>
 
 <%= simple_form_for([:backend, @translation], url: edit_translation_backend_article_path, html: { class: 'no-focus' }) do |f| %>

data/app/views/backend/articles/images/index.html.erb

@@ -0,0 +1,43 @@
+<% javascript 'backend/sortable' %>
+<%= render 'backend/breadcrumbs' %>
+<%= render 'backend/articles/tabs', model: @article, active: :images %>
+
+<p class="text-xs-right">
+  <%= link_to icon(:plus, t('b.add')), backend_images_path(klass: @article.class.name, id: @article.id), class: 'btn btn-primary btn-sm' %>
+</p>
+
+<% if @images.any? %>
+  <table class="table table-striped table-hover">
+    <thead class="thead-inverse">
+      <tr>
+        <th><%= t 'b.file' %></th>
+        <th><%= t 'g.type' %></th>
+        <th><%= t 'b.size' %></th>
+        <th><%= t 'b.description' %></th>
+        <th><%= t 'b.last_changed_at' %></th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @images.each do |img| %>
+        <% a = img.asset %>
+        <tr data-update-position="<%= update_position_backend_article_image_path(@article, img) %>">
+          <td>
+            <%= image_tag a.image.url(150, 150), alt: '', class: 'img-fluid' %>
+          </td>
+          <td><%= a.actual_filename.split('.').last.upcase %></td>
+          <td><%= number_to_human_size a.filesize %></td>
+          <td><%= simple_format a.description %></td>
+          <td><%= l a.updated_at %></td>
+          <td class="text-xs-right">
+            <%= link_to icon(:trash), unlink_backend_images_path(klass: @article.class.name, id: @article.id, asset_id: a.id), data: { confirm: t('b.msg.confirm') }, title: t('b.delete') %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+<% else %>
+  <p><%= t 'b.msg.no_items' %></p>
+<% end %>

data/app/views/backend/images/_filter.html.erb

@@ -0,0 +1,12 @@
+<%= search_form_for @search, url: backend_images_path do |f| %>
+  <%= hidden_field_tag :klass, @model.class.name %>
+  <%= hidden_field_tag :id, @model.id %>
+  <div class="row m-b-2">
+    <div class="col-md-6">
+      <%= f.search_field :description_cont, placeholder: t('b.description'), class: 'form-control' %>
+    </div>
+    <div class="col-md-6">
+      <%= f.submit class: 'btn btn-sn' %>
+    </div>
+  </div>
+<% end %>

data/app/views/backend/images/index.html.erb

@@ -0,0 +1,38 @@
+<%= simple_form_for @image, url: backend_images_path(klass: @model.class.name, id: @model.id) do |f| %>
+  <div class="card">
+    <div class="card-header">
+      <%= t 'b.upload_a_new_image' %>
+    </div>
+
+    <div class="card-block">
+      <%= f.simple_fields_for :asset do |fa| %>
+        <%= fa.input :filename, as: :file, label: false, required: false %>
+        <%= fa.input :description, as: :text, required: false %>
+      <% end %>
+
+      <div class="form-actions">
+        <button type="submit" class="btn btn-primary"><%= t 'b.save' %></button>
+      </div>
+    </div>
+  </div>
+<% end %>
+
+<div class="card">
+  <div class="card-header">
+    <%= t 'b.choose_an_existing_image' %>
+  </div>
+
+  <div class="card-block">
+    <%= render 'filter' %>
+
+    <div class="row">
+      <% @assets.each do |a| %>
+        <div class="col-sm-6 col-md-4 col-lg-3 col-xl-2">
+          <%= link_to link_backend_images_path(klass: @model.class, id: @model.id, asset_id: a.id), style: '' do %>
+            <%= image_tag a.image.url(550, 550, action: :resize_and_pad, background: :white), alt: '', class: 'img-fluid' %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/app/views/backend/images/new.html.erb

@@ -0,0 +1,24 @@
+<% if @image.errors.any? %>
+  <div class="alert alert-danger" role="alert">
+    <strong><%= t 'b.msg.something_went_wrong' %>!</strong>
+    <%= t 'b.msg.please_select_a_valid_image' %>
+  </div>
+<% end %>
+
+<%= simple_form_for @image, url: backend_images_path(klass: @model.class.name, id: @model.id) do |f| %>
+  <div class="card">
+    <div class="card-header">
+      <%= t 'b.image' %>
+    </div>
+
+    <div class="card-block">
+      <%= f.simple_fields_for :asset do |fa| %>
+        <%= fa.input :filename, as: :file, label: false %>
+        <%= fa.input :description, as: :text, required: false %>
+      <% end %>
+
+      <%= render 'backend/form_actions', cancel_url: backend_images_path(klass: @model.class.name, id: @model.id) %>
+    </div>
+  </div>
+
+<% end %>

data/changelog.md

@@ -1,3 +1,10 @@
+5.4.0 - 2017-03-08
+--
+* When enabled, you can add images to articles from the assets module.
+* Bugfix: the sortable scope for the ```Image``` wasn't properly set.
+* Images are now enabled by default for articles.
+
+
 5.3.1 - 2017-03-07
 --
 * Bugfix: there was an issue with loading the base module for the image

data/config/locales/en_backend.yml

@@ -35,6 +35,7 @@ en:
     general: General
     house_number: House number
     html_content: HTML content
+    images: Afbeeldingen
     last_changed_at: Last changed at
     last_name: Last name
     locale: Locale

data/config/locales/nl_backend.yml

@@ -10,6 +10,7 @@ nl:
     articles: Artikels
     author: Auteur
     cancel: Annuleren
+    choose_an_existing_image: Kies bestaande afbeelding
     content: Inhoud
     current_image: Huidige afbeelding
     custom_title: Aangepaste titel
@@ -35,6 +36,8 @@ nl:
     general: Algemeen
     house_number: Huisnummer
     html_content: HTML inhoud
+    image: Afbeelding
+    images: Afbeeldingen
     last_changed_at: Laatst gewijzigd op
     last_name: Achternaam
     locale: Taal
@@ -78,6 +81,7 @@ nl:
     title: Titel
     to: Naar
     up: Omhoog
+    upload_a_new_image: Upload nieuwe afbeelding
     used: Gebruikt
     user: Gebruiker
     users: Gebruikers
@@ -117,8 +121,10 @@ nl:
       no_title_set: Dit item heeft nog geen titel.
       pages:
         invisible: Deze pagina is niet zichtbaar op de website.
+      please_select_a_valid_image: Gelieve een geldige afbeelding te selecteren en opnieuw te proberen.
       saved: '%{actor} werd bewaard.'
       seo: SEO
+      something_went_wrong: Er liep iets fout!
       status_codes:
         '301': 301 (Moved Permanently)
         '303': 303 (See Other)

data/config/routes.rb

@@ -32,6 +32,10 @@ Rails.application.routes.draw do
 
     resources :articles, except: [:show] do
       concerns :translatable
+
+      resources :images, only: [:index], controller: 'articles/images' do
+        concerns :positionable
+      end
     end
 
     resources :navigations, only: [:index] do
@@ -82,6 +86,10 @@ Rails.application.routes.draw do
       end
     end
 
+    resources :images, only: [:index, :new, :create] do
+      collection { get 'link', 'unlink' }
+    end
+
     resources :assets
   end
 

data/lib/udongo/configs/articles.rb

@@ -6,7 +6,7 @@ module Udongo
       attribute :allow_html_in_title, Axiom::Types::Boolean, default: false
       attribute :allow_html_in_summary, Axiom::Types::Boolean, default: false
       attribute :editor_for_summary, Axiom::Types::Boolean, default: false
-      attribute :images, Axiom::Types::Boolean, default: false
+      attribute :images, Axiom::Types::Boolean, default: true
 
       def allow_html_in_title?
         allow_html_in_title === true

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '5.3.1'
+  VERSION = '5.4.0'
 end

data/readme.md

@@ -90,7 +90,7 @@ Udongo.config.articles.editor_for_summary = false
 
 ### images
 ```ruby
-Udongo.config.articles.images = false
+Udongo.config.articles.images = true
 ```
 
 # Concerns

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 5.3.1
+  version: 5.4.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -451,6 +451,8 @@ files:
 - app/assets/stylesheets/backend/pages/_login.scss
 - app/assets/stylesheets/backend/udongo.scss
 - app/controllers/backend/admins_controller.rb
+- app/controllers/backend/articles/base_controller.rb
+- app/controllers/backend/articles/images_controller.rb
 - app/controllers/backend/articles_controller.rb
 - app/controllers/backend/assets_controller.rb
 - app/controllers/backend/base_controller.rb
@@ -461,6 +463,7 @@ files:
 - app/controllers/backend/dashboard_controller.rb
 - app/controllers/backend/email_templates_controller.rb
 - app/controllers/backend/emails_controller.rb
+- app/controllers/backend/images_controller.rb
 - app/controllers/backend/navigation/items_controller.rb
 - app/controllers/backend/navigations_controller.rb
 - app/controllers/backend/pages_controller.rb
@@ -585,6 +588,7 @@ files:
 - app/views/backend/articles/_tabs.html.erb
 - app/views/backend/articles/edit.html.erb
 - app/views/backend/articles/edit_translation.html.erb
+- app/views/backend/articles/images/index.html.erb
 - app/views/backend/articles/index.html.erb
 - app/views/backend/articles/new.html.erb
 - app/views/backend/assets/_filter.html.erb
@@ -609,6 +613,9 @@ files:
 - app/views/backend/email_templates/new.html.erb
 - app/views/backend/emails/index.html.erb
 - app/views/backend/emails/show.html.erb
+- app/views/backend/images/_filter.html.erb
+- app/views/backend/images/index.html.erb
+- app/views/backend/images/new.html.erb
 - app/views/backend/navigation/items/_form.html.erb
 - app/views/backend/navigation/items/_tabs.html.erb
 - app/views/backend/navigation/items/edit.html.erb