udongo 7.4.0 → 7.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11b2aeb4979d4fca8f1274b0dce729807dbf797c
-  data.tar.gz: f684fbfb3794fcabf4d524c9d4d43113f060c98d
+  metadata.gz: 28903a7edca7d3bfe78fca2d62d42113f82a04f0
+  data.tar.gz: c28a923c17ec621dab67b20ec8489fb601b98150
 SHA512:
-  metadata.gz: 64861a406fc432d4e22a1a79cd1b034cd5168c076ef108b1a21adbce9799a8156e37c7f887bf369a6853c53dc796a0de4ba63dd7773d25fcd6da614b65064be6
-  data.tar.gz: 821bbab8349cbbbb2d16681fbf52c2b059c98d1670d8bf45b2073005db9b82bc6bb720b93c348d2ff107015a1642be3faed7e11149c92ec51ae2991473461a06
+  metadata.gz: 6ecf395c0d8b9b5cfb5ec8797125962bf8d3cf5c3e99a81b5f5324ec784ac33784e865506b81a22fdaf675be9b15c14ef5d08a4813c2bc05ed452f173d5e1933
+  data.tar.gz: bb058aaf7615b7ab06dab76cafb1a319cec2bef80fab28d6a528884738d706ebf371eefec891b1090e895ea42b286ae45c1571894667004ffba41ecdb298a252

data/app/controllers/backend/tags_controller.rb

@@ -1,5 +1,4 @@
 class Backend::TagsController < Backend::BaseController
-  include Concerns::Backend::TranslatableController
   include Concerns::PaginationController
 
   before_action :find_model, only: [:show, :edit, :update, :destroy]
@@ -22,11 +21,7 @@ class Backend::TagsController < Backend::BaseController
     @tag = Tag.new(allowed_params)
 
     if @tag.save
-      redirect_to edit_translation_backend_tag_path(
-                    @tag,
-                    translation_locale: default_app_locale,
-                    notice: translate_notice(:added, :article)
-                  )
+      redirect_to backend_tags_path, notice: translate_notice(:added, :tag)
     else
       render :new
     end
@@ -48,18 +43,13 @@ class Backend::TagsController < Backend::BaseController
   private
 
   def allowed_params
-    params.require(:tag).permit(:locale, :name, :slug)
+    params.require(:tag).permit(
+      :locale, :name, :seo_slug, :seo_title, :seo_description, :seo_keywords,
+      :seo_custom
+    )
   end
 
   def find_model
     @tag = Tag.find params[:id]
   end
-
-  def translation_form
-    Backend::TagTranslationForm.new(
-      @model,
-      @model.translation(params[:translation_locale]),
-      @model.seo(params[:translation_locale])
-    )
-  end
 end

data/app/models/tag.rb

@@ -1,12 +1,10 @@
 class Tag < ApplicationRecord
   include Concerns::Locale
-  include Concerns::Seo
-
-  include Concerns::Translatable
-  translatable_fields :summary
 
   has_many :tagged_items, dependent: :destroy
 
-  validates :locale, :name, :slug, presence: true
-  validates :slug, uniqueness: { case_sensitive: false, scope: :locale }
+  validates :locale, :name, :seo_slug, presence: true
+  validates :seo_slug, uniqueness: { case_sensitive: false, scope: :locale }
+
+  alias_attribute :slug, :seo_slug
 end

data/app/views/backend/_seo_form.html.erb

@@ -15,9 +15,9 @@
       <%= f.input :seo_slug, as: :string %>
     <% end %>
 
-    <%= f.input :seo_title, as: :string %>
-    <%= f.input :seo_description, as: :string %>
-    <%= f.input :seo_keywords, as: :string %>
-    <%= f.input :seo_custom, as: :text %>
+    <%= f.input(:seo_title, as: :string) if f.object.respond_to?(:seo_title) %>
+    <%= f.input(:seo_description, as: :string) if f.object.respond_to?(:seo_description) %>
+    <%= f.input(:seo_keywords, as: :string) if f.object.respond_to?(:seo_keywords) %>
+    <%= f.input(:seo_custom, as: :string) if f.object.respond_to?(:seo_custom) %>
   </div>
 <% end %>

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

@@ -11,11 +11,16 @@
         <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>
 
+  <div class="row">
+    <div class="col-md-6">
+      <%= render 'backend/seo_form', f: f, sluggable_field: 'name' %>
+    </div>
+  </div>
+
   <%= render 'backend/form_actions', cancel_url: backend_tags_path %>
 <% end %>

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

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

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

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

data/changelog.md

@@ -1,3 +1,9 @@
+7.4.1 - 2018-04-27
+--
+* Removed the translatable content from tags again.
+* Added the b/seo_form partial to b/tags#index.
+
+
 7.4.0 - 2018-04-19
 --
 * Add target to content pictures (eg _blank).

data/db/migrate/20180427144338_add_missing_seo_fields_to_tags.rb

@@ -0,0 +1,9 @@
+class AddMissingSeoFieldsToTags < ActiveRecord::Migration[5.0]
+  def change
+    rename_column :tags, :slug, :seo_slug
+    add_column :tags, :seo_title, :text, after: :seo_slug
+    add_column :tags, :seo_description, :text, after: :seo_title
+    add_column :tags, :seo_keywords, :string, after: :seo_description
+    add_column :tags, :seo_custom, :text, after: :seo_keywords
+  end
+end

data/db/migrate/20180427150844_remove_locales_and_seo_locales_from_tags.rb

@@ -0,0 +1,6 @@
+class RemoveLocalesAndSeoLocalesFromTags < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :tags, :locales
+    remove_column :tags, :seo_locales
+  end
+end

data/lib/udongo/assets/resizer.rb

@@ -14,7 +14,6 @@ module Udongo
         background = options[:background].to_s.parameterize
 
         str = action.to_s.split('_').last
-        # TODO: rekening houden met asset updated_at
         str << "-q#{quality}" if quality.present?
         str << "-g#{gravity}" if gravity.present?
         str << "-b#{background}" if background.present?

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '7.4.0'
+  VERSION = '7.4.1'
 end

data/spec/factories/tags.rb

@@ -2,6 +2,6 @@ FactoryGirl.define do
   factory :tag do
     locale 'nl'
     sequence(:name) { |n| "tag #{n}" }
-    sequence(:slug) { |n| "tag-#{n}" }
+    sequence(:seo_slug) { |n| "tag-#{n}" }
   end
 end

data/spec/support/concerns/taggable.rb

@@ -1,51 +1,50 @@
 require 'rails_helper'
 
 shared_examples_for :taggable do
-  let(:model) { described_class }
-  let(:klass) { model.to_s.underscore.to_sym }
-  let(:instance) { create(klass) }
+  let(:klass) { described_class.to_s.underscore.to_sym }
+  subject { create(klass) }
 
   it '#tags' do
-    tag = create(:tag, locale: :nl, name: 'foo', slug: 'foo')
-    instance.tagged_items.create!(tag: tag)
-    expect(instance.tags(:nl)).to eq [tag]
+    tag = create(:tag, locale: :nl, name: 'foo', seo_slug: 'foo')
+    subject.tagged_items.create!(tag: tag)
+    expect(subject.tags(:nl)).to eq [tag]
   end
 
   it '#tags_string' do
-    tag1 = create(:tag, locale: :nl, name: 'foo', slug: 'foo')
-    tag2 = create(:tag, locale: :nl, name: 'bar', slug: 'bar')
-    instance.tagged_items.create!(tag: tag1)
-    instance.tagged_items.create!(tag: tag2)
-    expect(instance.tags_string(:nl)).to eq 'foo,bar'
+    tag1 = create(:tag, locale: :nl, name: 'foo', seo_slug: 'foo')
+    tag2 = create(:tag, locale: :nl, name: 'bar', seo_slug: 'bar')
+    subject.tagged_items.create!(tag: tag1)
+    subject.tagged_items.create!(tag: tag2)
+    expect(subject.tags_string(:nl)).to eq 'foo,bar'
   end
 
   describe '#related' do
-    let(:instance2) { create(klass) }
-    let(:tag1) { create(:tag, locale: :nl, name: 'foo', slug: 'foo') }
-    let(:tag2) { create(:tag, locale: :nl, name: 'bar', slug: 'bar') }
+    let(:second) { create(klass) }
+    let(:tag1) { create(:tag, locale: :nl, name: 'foo', seo_slug: 'foo') }
+    let(:tag2) { create(:tag, locale: :nl, name: 'bar', seo_slug: 'bar') }
 
     it :blank do
-      instance.tagged_items.create!(tag: tag1)
-      instance2.tagged_items.create!(tag: tag2)
-      expect(instance.related(:nl)).to eq []
+      subject.tagged_items.create!(tag: tag1)
+      second.tagged_items.create!(tag: tag2)
+      expect(subject.related(:nl)).to eq []
     end
 
     it :results do
-      instance.tagged_items.create!(tag: tag1)
-      instance.tagged_items.create!(tag: tag2)
-      instance2.tagged_items.create!(tag: tag1)
-      instance2.tagged_items.create!(tag: tag2)
-      expect(instance.related(:nl)).to eq [instance2]
-      expect(instance2.related(:nl)).to eq [instance]
+      subject.tagged_items.create!(tag: tag1)
+      subject.tagged_items.create!(tag: tag2)
+      second.tagged_items.create!(tag: tag1)
+      second.tagged_items.create!(tag: tag2)
+      expect(subject.related(:nl)).to eq [second]
+      expect(second.related(:nl)).to eq [subject]
     end
   end
 
   it '#taggable?' do
-    expect(instance).to be_taggable
+    expect(subject).to be_taggable
   end
 
   it '#respond_to?' do
-    expect(model.new).to respond_to(:tagged_items, :related, :tags, :tags_string, :taggable?)
+    expect(described_class.new).to respond_to(:tagged_items, :related, :tags, :tags_string, :taggable?)
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 7.4.0
+  version: 7.4.1
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2018-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -523,7 +523,6 @@ files:
 - app/forms/backend/navigation_item_translation_form.rb
 - app/forms/backend/page_translation_form.rb
 - app/forms/backend/snippet_translation_form.rb
-- app/forms/backend/tag_translation_form.rb
 - app/forms/backend/translation_form.rb
 - app/forms/backend/translation_with_seo_form.rb
 - app/helpers/backend/dropdown_helper.rb
@@ -726,7 +725,6 @@ files:
 - app/views/backend/tags/_tabs.html.erb
 - app/views/backend/tags/_tag_usages.html.erb
 - app/views/backend/tags/edit.html.erb
-- app/views/backend/tags/edit_translation.html.erb
 - app/views/backend/tags/index.html.erb
 - app/views/backend/tags/new.html.erb
 - app/views/backend/users/_filter.html.erb
@@ -747,6 +745,7 @@ files:
 - app/views/layouts/backend/login.html.erb
 - app/views/layouts/frontend/application.html.erb
 - changelog.md
+- config/environment.rb
 - config/initializers/assets.rb
 - config/initializers/ckeditor.rb
 - config/initializers/core_ext/string.rb
@@ -867,6 +866,8 @@ files:
 - db/migrate/20180301093228_add_locales_to_tags.rb
 - db/migrate/20180301101320_add_seo_locales_to_tags.rb
 - db/migrate/20180419115752_add_target_to_content_picture.rb
+- db/migrate/20180427144338_add_missing_seo_fields_to_tags.rb
+- db/migrate/20180427150844_remove_locales_and_seo_locales_from_tags.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb

data/app/forms/backend/tag_translation_form.rb

@@ -1,7 +0,0 @@
-class Backend::TagTranslationForm < Backend::TranslationWithSeoForm
-  attribute :summary, String
-
-  def self.model_name
-    Tag.model_name
-  end
-end

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

@@ -1,31 +0,0 @@
-<% breadcrumb.add truncate(@tag.name, length: 40), edit_backend_tag_path(@tag) %>
-<% breadcrumb.add t('b.edit') %>
-<%= render 'backend/breadcrumbs' %>
-
-<%= render 'tabs', model: @tag, active: params[:translation_locale].to_sym %>
-<%= render 'backend/general_form_error', object: @translation %>
-
-<%= simple_form_for([:backend, @translation], url: edit_translation_backend_tag_path, html: { class: 'no-focus' }) do |f| %>
-  <%= trigger_dirty_inputs_warning %>
-
-  <div class="row">
-    <div class="col-md-12">
-      <!-- Content -->
-      <div class="card">
-        <div class="card-header">
-          <%= t 'b.content' %>
-        </div>
-
-        <div class="card-block">
-          <% summary_type = Udongo.config.tags.editor_for_summary? ? :ckeditor : :text %>
-          <%= f.input :summary, as: summary_type %>
-        </div>
-      </div>
-
-      <!-- SEO -->
-      <%= render 'backend/seo_form', f: f, slug: @tag.name %>
-    </div>
-  </div>
-
-  <%= render 'backend/form_actions', cancel_url: backend_tags_path %>
-<% end %>