udongo 6.2.1 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29dca730c80a434de4529256c7c66f2a7aeface9
-  data.tar.gz: 34415ad5601d4798303e198d6222d930927d8bc4
+  metadata.gz: e38f8e29debafdfa34fa918c39c0b455a98fdfe3
+  data.tar.gz: 86ad83a3e6098a11ab2a415a47a0ddc17e312950
 SHA512:
-  metadata.gz: 47da2600be3624a3c92576caff5df06d634926e83fa0ad5ff8b06c372d309379aeeebf5c00ed334466d2844bb7a2ceba6419441b2d35c7044df26c76ca21496e
-  data.tar.gz: f1bdfd297a917f5f57dcd8e387b41be876798b58a2195b9494d364fe5692b125935b88e852de609da17c91d3748e85a3bc9e899b59e81bc0c1a22851cef944c2
+  metadata.gz: 7aa4bee65d5e3855210ec61792837f9491bb86cc57e14bfc4a6b5480fe5ca344f3363b737b77582c80e63e747a395a4358874892e634ad5b82db3d6ff16ede45
+  data.tar.gz: 92ff03bbd6e0ca03dd8e65e3f67971b767d472dbdc1335015db7ed7455b55c7590f6e55827ef9cb4fc9f775987c7e229bbb9a2ded6b067404cb2a8d9b2f59ee5

data/app/controllers/backend/tagbox_controller.rb

@@ -1,6 +1,6 @@
 class Backend::TagboxController < Backend::BaseController
   def index
-    tags = Tag.by_locale(locale).pluck(:name).map do |name|
+    tags = Tag.by_locale(locale).order(:name).pluck(:name).map do |name|
       { label: name, value: name }
     end
 

data/app/controllers/backend/tags_controller.rb

@@ -0,0 +1,52 @@
+class Backend::TagsController < Backend::BaseController
+  include Concerns::PaginationController
+
+  before_action -> { breadcrumb.add t('b.tags'), backend_tags_path }
+  before_action :find_model, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @search = Tag.ransack params[:q]
+    @tags = @search.result(distinct: true).order(:name).page(page_number).per_page(15)
+  end
+
+  def show
+    redirect_to edit_backend_tag_path(@tag)
+  end
+
+  def new
+    @tag = Tag.new
+  end
+
+  def create
+    @tag = Tag.new(allowed_params)
+
+    if @tag.save
+      redirect_to backend_tags_path, notice: translate_notice(:added, :tag)
+    else
+      render :new
+    end
+  end
+
+  def destroy
+    @tag.destroy
+    redirect_to backend_tags_path, notice: translate_notice(:deleted, :tag)
+  end
+
+  def update
+    if @tag.update_attributes allowed_params
+      redirect_to backend_tags_path, notice: translate_notice(:edited, :tag)
+    else
+      render :edit
+    end
+  end
+
+  private
+
+  def allowed_params
+    params.require(:tag).permit(:locale, :name, :slug)
+  end
+
+  def find_model
+    @tag = Tag.find params[:id]
+  end
+end

data/app/helpers/link_helper.rb

@@ -7,6 +7,17 @@ module LinkHelper
     )
   end
 
+  # Say you have a page with a title: 'Foo'. When calling this method with that
+  # page object, you would get a link to /backend/pages/edit/1 with the title
+  # as label.
+  def link_to_edit_with_label(value, locale)
+    link_to(
+      object_label(value, locale),
+      path_from_string_or_object(value, 'edit_'),
+      title: t('b.edit')
+    )
+  end
+
   def link_to_edit(value)
     link_to(
       icon(:pencil_square_o),
@@ -32,12 +43,23 @@ module LinkHelper
     )
   end
 
-  private
-
   def path_from_string_or_object(value, prefix = nil)
     return value if value.is_a?(String)
 
     str = "#{prefix}#{Udongo::ObjectPath.find(value)}"
     send(str, *Udongo::ObjectPath.remove_symbols(value))
   end
+
+  def object_label(value, locale)
+    obj = Udongo::ObjectPath.remove_symbols(value)
+    obj = obj.last if obj.is_a?(Array)
+
+    I18n.with_locale(locale) do
+      return obj.title if obj.respond_to?(:title)
+      return obj.name if obj.respond_to?(:name)
+      return obj.description if obj.respond_to?(:description)
+    end
+
+    "#{I18n.t("b.#{obj.class.name.underscore}")}: #{obj.id}"
+  end
 end

data/app/models/concerns/imageable.rb

@@ -3,7 +3,7 @@ module Concerns
     extend ActiveSupport::Concern
 
     included do
-      has_many :images, as: :imageable
+      has_many :images, as: :imageable, dependent: :destroy
     end
 
     def imageable?

data/app/models/concerns/taggable.rb

@@ -3,7 +3,7 @@ module Concerns
     extend ActiveSupport::Concern
 
     included do
-      has_many :tagged_items, as: :taggable
+      has_many :tagged_items, as: :taggable, dependent: :destroy
     end
 
     def related(locale = I18n.locale)

data/app/models/tag.rb

@@ -1,6 +1,8 @@
 class Tag < ApplicationRecord
   include Concerns::Locale
 
+  has_many :tagged_items, dependent: :destroy
+
   validates :locale, :name, :slug, presence: true
   validates :slug, uniqueness: { case_sensitive: false, scope: :locale }
 end

data/app/views/backend/assets/_asset_usages.html.erb

@@ -0,0 +1,36 @@
+<% count = asset.images.count + asset.content_pictures.count %>
+<% lbl = "#{t(true.to_s)} (#{count})" %>
+<%= link_to icon(:search, lbl), '#', data: { toggle: 'modal', target: "#asset-usages-#{asset.id}" }%>
+
+<div class="modal fade" id="asset-usages-<%= asset.id %>" tabindex="-1" role="dialog" aria-labelledby="asset-usages-title" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="asset-usages-title"><%= asset.description %></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t 'b.close' %>">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <ul>
+          <% asset.images.each do |img| %>
+            <li>
+              <%= t "b.#{img.imageable.class.name.underscore}" %> &gt;
+              <%= link_to_edit_with_label [:backend, img.imageable], default_app_locale %>
+            </li>
+          <% end %>
+
+          <% asset.content_pictures.each do |picture| %>
+            <li>
+              <%= t "b.#{picture.parent.class.name.underscore}" %> &gt; <%= t 'b.flexible_content' %> &gt;
+              <%= link_to_edit_with_label [:backend, picture.parent], default_app_locale %>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t 'b.close' %></button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -13,6 +13,7 @@
         <th><%= t 'b.type' %></th>
         <th><%= t 'b.size' %></th>
         <th><%= t 'b.description' %></th>
+        <th><%= t 'b.used' %></th>
         <th><%= t 'b.last_changed_at' %></th>
         <th>&nbsp;</th>
       </tr>
@@ -31,6 +32,13 @@
           <td><%= a.actual_filename.split('.').last.upcase %></td>
           <td><%= number_to_human_size a.filesize %></td>
           <td><%= simple_format a.description %></td>
+          <td>
+            <% if a.deletable? %>
+              <%= t false.to_s %>
+            <% else %>
+              <%= render 'asset_usages', asset: a %>
+            <% end %>
+          </td>
           <td><%= l a.updated_at, format: :short %></td>
           <td class="text-right">
             <%= link_to_edit [:backend, a] %>

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

@@ -0,0 +1,24 @@
+<div class="card filter">
+  <div class="card-block">
+    <%= search_form_for [:backend, @search] do |f| %>
+      <div class="row">
+        <div class="col-md-4 form-group">
+          <%= f.search_field :name_cont, placeholder: t('b.name'), class: 'form-control' %>
+        </div>
+
+        <div class="col-md-4 form-group">
+          <% selected_locale = params[:q] ? params[:q][:locale_eq] : nil %>
+          <% options = Udongo.config.i18n.app.locales %>
+          <%= f.select :locale_eq, options_for_select(options, selected_locale), { prompt: t('b.locale') }, class: 'form-control' %>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-md-6">
+          <%= f.submit class: 'btn btn-primary btn-sm' %>
+          <%= link_to t('b.erase_filters'), backend_tags_path, class: 'btn btn-link' %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/backend/tags/_form.html.erb

@@ -0,0 +1,21 @@
+<%= render 'backend/general_form_error', object: model %>
+
+<%= simple_form_for [:backend, model] do |f| %>
+  <div class="row">
+    <div class="col-md-6">
+      <div class="card">
+        <div class="card-header">
+          <%= t 'b.general' %>
+        </div>
+
+        <div class="card-block">
+          <%= f.input :locale, collection: Udongo.config.i18n.app.locales, include_blank: false %>
+          <%= f.input :name %>
+          <%= f.input :slug %>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <%= render 'backend/form_actions', cancel_url: backend_tags_path %>
+<% end %>

data/app/views/backend/tags/_tag_usages.html.erb

@@ -0,0 +1,25 @@
+<div class="modal fade" id="tag-usages-<%= tag.id %>" tabindex="-1" role="dialog" aria-labelledby="tag-usages-title" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="tag-usages-title"><%= tag.name %></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="<%= t 'b.close' %>">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <ul>
+          <% tag.tagged_items.order(:taggable_type).each do |obj| %>
+            <li>
+              <%= t "b.#{obj.taggable.class.name.underscore}" %> &gt;
+              <%= link_to_edit_with_label [:backend, obj.taggable], tag.locale %>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t 'b.close' %></button>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,4 @@
+<% breadcrumb.add @tag.name %>
+<% breadcrumb.add t('b.edit') %>
+<%= render 'backend/breadcrumbs' %>
+<%= render 'form', model: @tag %>

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

@@ -0,0 +1,47 @@
+<%= render 'backend/breadcrumbs' %>
+<%= render 'filter' %>
+
+<p class="text-right">
+  <%= link_to icon(:plus, t('b.add')), new_backend_tag_path, class: 'btn btn-primary btn-sm' %>
+</p>
+
+<% if @tags.any? %>
+  <table class="table table-striped table-hover">
+    <thead class="thead-inverse">
+      <tr>
+        <th><%= t 'b.name' %></th>
+        <th><%= t 'b.locale' %></th>
+        <th><%= t 'b.used' %></th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @tags.each do |tag| %>
+        <tr>
+          <td><%= tag.name %></td>
+          <td><%= tag.locale.to_s.upcase %></td>
+          <td>
+            <% if tag.tagged_items.any? %>
+              <% lbl = "#{t(true.to_s)} (#{tag.tagged_items.count})" %>
+              <%= link_to icon(:search, lbl), '#', data: { toggle: 'modal', target: "#tag-usages-#{tag.id}" }%>
+
+              <%= render 'tag_usages', tag: tag %>
+
+            <% else %>
+              <%= t false.to_s %>
+            <% end %>
+          </td>
+          <td class="text-right">
+            <%= link_to_edit [:backend, tag] %>
+            <%= link_to_delete [:backend, tag] %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+  <%= udongo_paginate @tags %>
+<% else %>
+  <p><%= t 'b.msg.no_items' %></p>
+<% end %>

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

@@ -0,0 +1,3 @@
+<% breadcrumb.add t('b.new') %>
+<%= render 'backend/breadcrumbs' %>
+<%= render 'form', model: @tag %>

data/app/views/layouts/backend/_top_navigation.html.erb

@@ -8,6 +8,7 @@
         <%= link_to t('b.snippets'), backend_snippets_path, class: 'dropdown-item' %>
         <%= link_to t('b.files'), backend_assets_path, class: 'dropdown-item' %>
         <%= link_to t('b.forms'), backend_forms_path, class: 'dropdown-item' %>
+        <%= link_to t('b.tags'), backend_tags_path, class: 'dropdown-item' %>
       </div>
     </li>
 

data/changelog.md

@@ -1,3 +1,13 @@
+6.3.0 - 2017-06-05
+--
+* The tagbox autocomplete now orders its results alphabetically.
+* A general tag module was added. This allows you to see which tags have been
+  used throughout the system and add new ones.
+* Bugfix: when a taggable item is deleted, it's tagged items are now destroyed.
+* When checking the overview of files, you can now see if those assets are used.
+* Bugfix: the images relation was not dependent destroy.
+
+
 6.2.1 - 2017-06-04
 --
 * Added email and tel as valid form types for FormField.

data/config/locales/en_backend.yml

@@ -8,9 +8,12 @@ en:
     advanced: Advanced
     article: Article
     articles: Articles
+    asset: Asset
+    assets: Assets
     author: Author
     cancel: Cancel
     choose_an_existing_image: Choose an existing image
+    close: Close
     content: Content
     current_image: Current image
     custom_title: Custom title
@@ -27,6 +30,7 @@ en:
     email_template: E-mail template
     email_templates: E-mail templates
     enabled: Enabled
+    erase_filters: Erase filters
     extra: Extra
     file: File
     files: Files
@@ -84,6 +88,7 @@ en:
     status_code: Status code
     subject: Subject
     synonyms: Synonyms
+    tag: Tag
     tags: Tags
     telephone: Telephone
     title: Title

data/config/locales/en_forms.yml

@@ -46,6 +46,8 @@ en:
         seo_description: Description
         seo_keywords: Keywords
         seo_custom: Extra meta-tags
+        sitemap: Sitemap?
+        slug: Slug
         subject: Subject
         subtitle: Subtitle
         summary: Summary

data/config/locales/nl_backend.yml

@@ -8,9 +8,12 @@ nl:
     advanced: Geavanceerd
     article: Artikel
     articles: Artikels
+    asset: Bestand
+    assets: Bestanden
     author: Auteur
     cancel: Annuleren
     choose_an_existing_image: Kies bestaande afbeelding
+    close: Sluiten
     content: Inhoud
     current_image: Huidige afbeelding
     custom_title: Aangepaste titel
@@ -27,6 +30,7 @@ nl:
     email_template: E-mail template
     email_templates: E-mail templates
     enabled: Ingeschakeld
+    erase_filters: Wis filters
     extra: Extra
     file: Bestand
     files: Bestanden
@@ -84,6 +88,7 @@ nl:
     status_code: Statuscode
     subject: Onderwerp
     synonyms: Synoniemen
+    tag: Tag
     tags: Tags
     telephone: Telefoonnummer
     title: Titel

data/config/locales/nl_forms.yml

@@ -47,6 +47,7 @@ nl:
         seo_keywords: Sleutelwoorden
         seo_custom: Extra meta-tags
         sitemap: Sitemap?
+        slug: Slug
         subject: Onderwerp
         subtitle: Subtitel
         success_message: Melding bij succesvolle verzending

data/config/routes.rb

@@ -17,12 +17,12 @@ Rails.application.routes.draw do
     get 'search' => 'search#query'
     get 'seo/slugify' => 'seo#slugify'
 
-
     resources :sessions, only: [:new, :create, :destroy]
     resources :admins
     resources :users
     resources :redirects, except: :show
     resources :search_synonyms, except: :show
+    resources :tags
 
     resources :pages, except: [:show] do
       concerns :translatable

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '6.2.1'
+  VERSION = '6.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.3.0
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-04 00:00:00.000000000 Z
+date: 2017-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -486,6 +486,7 @@ files:
 - app/controllers/backend/sessions_controller.rb
 - app/controllers/backend/snippets_controller.rb
 - app/controllers/backend/tagbox_controller.rb
+- app/controllers/backend/tags_controller.rb
 - app/controllers/backend/users/base_controller.rb
 - app/controllers/backend/users_controller.rb
 - app/controllers/catch_all_controller.rb
@@ -621,6 +622,7 @@ files:
 - 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/_asset_usages.html.erb
 - app/views/backend/assets/_filter.html.erb
 - app/views/backend/assets/_form.html.erb
 - app/views/backend/assets/edit.html.erb
@@ -700,6 +702,12 @@ files:
 - app/views/backend/snippets/edit_translation.html.erb
 - app/views/backend/snippets/index.html.erb
 - app/views/backend/snippets/new.html.erb
+- app/views/backend/tags/_filter.html.erb
+- app/views/backend/tags/_form.html.erb
+- app/views/backend/tags/_tag_usages.html.erb
+- app/views/backend/tags/edit.html.erb
+- app/views/backend/tags/index.html.erb
+- app/views/backend/tags/new.html.erb
 - app/views/backend/users/_filter.html.erb
 - app/views/backend/users/_form.html.erb
 - app/views/backend/users/_tabs.html.erb