udongo 7.4.0 → 7.4.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/backend/tags_controller.rb +5 -15
- data/app/models/tag.rb +4 -6
- data/app/views/backend/_seo_form.html.erb +4 -4
- data/app/views/backend/tags/_form.html.erb +6 -1
- data/app/views/backend/tags/edit.html.erb +1 -2
- data/app/views/backend/tags/new.html.erb +1 -1
- data/changelog.md +6 -0
- data/config/environment.rb +0 -0
- data/db/migrate/20180427144338_add_missing_seo_fields_to_tags.rb +9 -0
- data/db/migrate/20180427150844_remove_locales_and_seo_locales_from_tags.rb +6 -0
- data/lib/udongo/assets/resizer.rb +0 -1
- data/lib/udongo/version.rb +1 -1
- data/spec/factories/tags.rb +1 -1
- data/spec/support/concerns/taggable.rb +24 -25
- metadata +5 -4
- data/app/forms/backend/tag_translation_form.rb +0 -7
- data/app/views/backend/tags/edit_translation.html.erb +0 -31
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 28903a7edca7d3bfe78fca2d62d42113f82a04f0
|
4
|
+
data.tar.gz: c28a923c17ec621dab67b20ec8489fb601b98150
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6ecf395c0d8b9b5cfb5ec8797125962bf8d3cf5c3e99a81b5f5324ec784ac33784e865506b81a22fdaf675be9b15c14ef5d08a4813c2bc05ed452f173d5e1933
|
7
|
+
data.tar.gz: bb058aaf7615b7ab06dab76cafb1a319cec2bef80fab28d6a528884738d706ebf371eefec891b1090e895ea42b286ae45c1571894667004ffba41ecdb298a252
|
@@ -1,5 +1,4 @@
|
|
1
1
|
class Backend::TagsController < Backend::BaseController
|
2
|
-
include Concerns::Backend::TranslatableController
|
3
2
|
include Concerns::PaginationController
|
4
3
|
|
5
4
|
before_action :find_model, only: [:show, :edit, :update, :destroy]
|
@@ -22,11 +21,7 @@ class Backend::TagsController < Backend::BaseController
|
|
22
21
|
@tag = Tag.new(allowed_params)
|
23
22
|
|
24
23
|
if @tag.save
|
25
|
-
redirect_to
|
26
|
-
@tag,
|
27
|
-
translation_locale: default_app_locale,
|
28
|
-
notice: translate_notice(:added, :article)
|
29
|
-
)
|
24
|
+
redirect_to backend_tags_path, notice: translate_notice(:added, :tag)
|
30
25
|
else
|
31
26
|
render :new
|
32
27
|
end
|
@@ -48,18 +43,13 @@ class Backend::TagsController < Backend::BaseController
|
|
48
43
|
private
|
49
44
|
|
50
45
|
def allowed_params
|
51
|
-
params.require(:tag).permit(
|
46
|
+
params.require(:tag).permit(
|
47
|
+
:locale, :name, :seo_slug, :seo_title, :seo_description, :seo_keywords,
|
48
|
+
:seo_custom
|
49
|
+
)
|
52
50
|
end
|
53
51
|
|
54
52
|
def find_model
|
55
53
|
@tag = Tag.find params[:id]
|
56
54
|
end
|
57
|
-
|
58
|
-
def translation_form
|
59
|
-
Backend::TagTranslationForm.new(
|
60
|
-
@model,
|
61
|
-
@model.translation(params[:translation_locale]),
|
62
|
-
@model.seo(params[:translation_locale])
|
63
|
-
)
|
64
|
-
end
|
65
55
|
end
|
data/app/models/tag.rb
CHANGED
@@ -1,12 +1,10 @@
|
|
1
1
|
class Tag < ApplicationRecord
|
2
2
|
include Concerns::Locale
|
3
|
-
include Concerns::Seo
|
4
|
-
|
5
|
-
include Concerns::Translatable
|
6
|
-
translatable_fields :summary
|
7
3
|
|
8
4
|
has_many :tagged_items, dependent: :destroy
|
9
5
|
|
10
|
-
validates :locale, :name, :
|
11
|
-
validates :
|
6
|
+
validates :locale, :name, :seo_slug, presence: true
|
7
|
+
validates :seo_slug, uniqueness: { case_sensitive: false, scope: :locale }
|
8
|
+
|
9
|
+
alias_attribute :slug, :seo_slug
|
12
10
|
end
|
@@ -15,9 +15,9 @@
|
|
15
15
|
<%= f.input :seo_slug, as: :string %>
|
16
16
|
<% end %>
|
17
17
|
|
18
|
-
<%= f.input
|
19
|
-
<%= f.input
|
20
|
-
<%= f.input
|
21
|
-
<%= f.input
|
18
|
+
<%= f.input(:seo_title, as: :string) if f.object.respond_to?(:seo_title) %>
|
19
|
+
<%= f.input(:seo_description, as: :string) if f.object.respond_to?(:seo_description) %>
|
20
|
+
<%= f.input(:seo_keywords, as: :string) if f.object.respond_to?(:seo_keywords) %>
|
21
|
+
<%= f.input(:seo_custom, as: :string) if f.object.respond_to?(:seo_custom) %>
|
22
22
|
</div>
|
23
23
|
<% end %>
|
@@ -11,11 +11,16 @@
|
|
11
11
|
<div class="card-block">
|
12
12
|
<%= f.input :locale, collection: Udongo.config.i18n.app.locales, include_blank: false %>
|
13
13
|
<%= f.input :name %>
|
14
|
-
<%= f.input :slug %>
|
15
14
|
</div>
|
16
15
|
</div>
|
17
16
|
</div>
|
18
17
|
</div>
|
19
18
|
|
19
|
+
<div class="row">
|
20
|
+
<div class="col-md-6">
|
21
|
+
<%= render 'backend/seo_form', f: f, sluggable_field: 'name' %>
|
22
|
+
</div>
|
23
|
+
</div>
|
24
|
+
|
20
25
|
<%= render 'backend/form_actions', cancel_url: backend_tags_path %>
|
21
26
|
<% end %>
|
data/changelog.md
CHANGED
File without changes
|
@@ -0,0 +1,9 @@
|
|
1
|
+
class AddMissingSeoFieldsToTags < ActiveRecord::Migration[5.0]
|
2
|
+
def change
|
3
|
+
rename_column :tags, :slug, :seo_slug
|
4
|
+
add_column :tags, :seo_title, :text, after: :seo_slug
|
5
|
+
add_column :tags, :seo_description, :text, after: :seo_title
|
6
|
+
add_column :tags, :seo_keywords, :string, after: :seo_description
|
7
|
+
add_column :tags, :seo_custom, :text, after: :seo_keywords
|
8
|
+
end
|
9
|
+
end
|
@@ -14,7 +14,6 @@ module Udongo
|
|
14
14
|
background = options[:background].to_s.parameterize
|
15
15
|
|
16
16
|
str = action.to_s.split('_').last
|
17
|
-
# TODO: rekening houden met asset updated_at
|
18
17
|
str << "-q#{quality}" if quality.present?
|
19
18
|
str << "-g#{gravity}" if gravity.present?
|
20
19
|
str << "-b#{background}" if background.present?
|
data/lib/udongo/version.rb
CHANGED
data/spec/factories/tags.rb
CHANGED
@@ -1,51 +1,50 @@
|
|
1
1
|
require 'rails_helper'
|
2
2
|
|
3
3
|
shared_examples_for :taggable do
|
4
|
-
let(:
|
5
|
-
|
6
|
-
let(:instance) { create(klass) }
|
4
|
+
let(:klass) { described_class.to_s.underscore.to_sym }
|
5
|
+
subject { create(klass) }
|
7
6
|
|
8
7
|
it '#tags' do
|
9
|
-
tag = create(:tag, locale: :nl, name: 'foo',
|
10
|
-
|
11
|
-
expect(
|
8
|
+
tag = create(:tag, locale: :nl, name: 'foo', seo_slug: 'foo')
|
9
|
+
subject.tagged_items.create!(tag: tag)
|
10
|
+
expect(subject.tags(:nl)).to eq [tag]
|
12
11
|
end
|
13
12
|
|
14
13
|
it '#tags_string' do
|
15
|
-
tag1 = create(:tag, locale: :nl, name: 'foo',
|
16
|
-
tag2 = create(:tag, locale: :nl, name: 'bar',
|
17
|
-
|
18
|
-
|
19
|
-
expect(
|
14
|
+
tag1 = create(:tag, locale: :nl, name: 'foo', seo_slug: 'foo')
|
15
|
+
tag2 = create(:tag, locale: :nl, name: 'bar', seo_slug: 'bar')
|
16
|
+
subject.tagged_items.create!(tag: tag1)
|
17
|
+
subject.tagged_items.create!(tag: tag2)
|
18
|
+
expect(subject.tags_string(:nl)).to eq 'foo,bar'
|
20
19
|
end
|
21
20
|
|
22
21
|
describe '#related' do
|
23
|
-
let(:
|
24
|
-
let(:tag1) { create(:tag, locale: :nl, name: 'foo',
|
25
|
-
let(:tag2) { create(:tag, locale: :nl, name: 'bar',
|
22
|
+
let(:second) { create(klass) }
|
23
|
+
let(:tag1) { create(:tag, locale: :nl, name: 'foo', seo_slug: 'foo') }
|
24
|
+
let(:tag2) { create(:tag, locale: :nl, name: 'bar', seo_slug: 'bar') }
|
26
25
|
|
27
26
|
it :blank do
|
28
|
-
|
29
|
-
|
30
|
-
expect(
|
27
|
+
subject.tagged_items.create!(tag: tag1)
|
28
|
+
second.tagged_items.create!(tag: tag2)
|
29
|
+
expect(subject.related(:nl)).to eq []
|
31
30
|
end
|
32
31
|
|
33
32
|
it :results do
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
expect(
|
39
|
-
expect(
|
33
|
+
subject.tagged_items.create!(tag: tag1)
|
34
|
+
subject.tagged_items.create!(tag: tag2)
|
35
|
+
second.tagged_items.create!(tag: tag1)
|
36
|
+
second.tagged_items.create!(tag: tag2)
|
37
|
+
expect(subject.related(:nl)).to eq [second]
|
38
|
+
expect(second.related(:nl)).to eq [subject]
|
40
39
|
end
|
41
40
|
end
|
42
41
|
|
43
42
|
it '#taggable?' do
|
44
|
-
expect(
|
43
|
+
expect(subject).to be_taggable
|
45
44
|
end
|
46
45
|
|
47
46
|
it '#respond_to?' do
|
48
|
-
expect(
|
47
|
+
expect(described_class.new).to respond_to(:tagged_items, :related, :tags, :tags_string, :taggable?)
|
49
48
|
end
|
50
49
|
end
|
51
50
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: udongo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 7.4.
|
4
|
+
version: 7.4.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Davy Hellemans
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2018-04-
|
12
|
+
date: 2018-04-27 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -523,7 +523,6 @@ files:
|
|
523
523
|
- app/forms/backend/navigation_item_translation_form.rb
|
524
524
|
- app/forms/backend/page_translation_form.rb
|
525
525
|
- app/forms/backend/snippet_translation_form.rb
|
526
|
-
- app/forms/backend/tag_translation_form.rb
|
527
526
|
- app/forms/backend/translation_form.rb
|
528
527
|
- app/forms/backend/translation_with_seo_form.rb
|
529
528
|
- app/helpers/backend/dropdown_helper.rb
|
@@ -726,7 +725,6 @@ files:
|
|
726
725
|
- app/views/backend/tags/_tabs.html.erb
|
727
726
|
- app/views/backend/tags/_tag_usages.html.erb
|
728
727
|
- app/views/backend/tags/edit.html.erb
|
729
|
-
- app/views/backend/tags/edit_translation.html.erb
|
730
728
|
- app/views/backend/tags/index.html.erb
|
731
729
|
- app/views/backend/tags/new.html.erb
|
732
730
|
- app/views/backend/users/_filter.html.erb
|
@@ -747,6 +745,7 @@ files:
|
|
747
745
|
- app/views/layouts/backend/login.html.erb
|
748
746
|
- app/views/layouts/frontend/application.html.erb
|
749
747
|
- changelog.md
|
748
|
+
- config/environment.rb
|
750
749
|
- config/initializers/assets.rb
|
751
750
|
- config/initializers/ckeditor.rb
|
752
751
|
- config/initializers/core_ext/string.rb
|
@@ -867,6 +866,8 @@ files:
|
|
867
866
|
- db/migrate/20180301093228_add_locales_to_tags.rb
|
868
867
|
- db/migrate/20180301101320_add_seo_locales_to_tags.rb
|
869
868
|
- db/migrate/20180419115752_add_target_to_content_picture.rb
|
869
|
+
- db/migrate/20180427144338_add_missing_seo_fields_to_tags.rb
|
870
|
+
- db/migrate/20180427150844_remove_locales_and_seo_locales_from_tags.rb
|
870
871
|
- lib/tasks/task_extras.rb
|
871
872
|
- lib/tasks/udongo_tasks.rake
|
872
873
|
- lib/udongo.rb
|
@@ -1,31 +0,0 @@
|
|
1
|
-
<% breadcrumb.add truncate(@tag.name, length: 40), edit_backend_tag_path(@tag) %>
|
2
|
-
<% breadcrumb.add t('b.edit') %>
|
3
|
-
<%= render 'backend/breadcrumbs' %>
|
4
|
-
|
5
|
-
<%= render 'tabs', model: @tag, active: params[:translation_locale].to_sym %>
|
6
|
-
<%= render 'backend/general_form_error', object: @translation %>
|
7
|
-
|
8
|
-
<%= simple_form_for([:backend, @translation], url: edit_translation_backend_tag_path, html: { class: 'no-focus' }) do |f| %>
|
9
|
-
<%= trigger_dirty_inputs_warning %>
|
10
|
-
|
11
|
-
<div class="row">
|
12
|
-
<div class="col-md-12">
|
13
|
-
<!-- Content -->
|
14
|
-
<div class="card">
|
15
|
-
<div class="card-header">
|
16
|
-
<%= t 'b.content' %>
|
17
|
-
</div>
|
18
|
-
|
19
|
-
<div class="card-block">
|
20
|
-
<% summary_type = Udongo.config.tags.editor_for_summary? ? :ckeditor : :text %>
|
21
|
-
<%= f.input :summary, as: summary_type %>
|
22
|
-
</div>
|
23
|
-
</div>
|
24
|
-
|
25
|
-
<!-- SEO -->
|
26
|
-
<%= render 'backend/seo_form', f: f, slug: @tag.name %>
|
27
|
-
</div>
|
28
|
-
</div>
|
29
|
-
|
30
|
-
<%= render 'backend/form_actions', cancel_url: backend_tags_path %>
|
31
|
-
<% end %>
|