qbrick 2.6.8 → 2.6.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/qbrick/page.rb +4 -4
- data/lib/qbrick/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 49695eed4e63d6e12b907b94559efad3d8915b24
|
|
4
|
+
data.tar.gz: 489b41c0a55c4bf8b1bac5e4f102d174df924d41
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0da33eb0ee68b0d091c01b0390fde7d63b65f5007017a42ba59afb2b55cc922aa9288ea2aab2d482388b56050a2196c8407c766f718241a1d3af572fa5989dac
|
|
7
|
+
data.tar.gz: ec2b3838042f44cd8dfdaaaf79d4227d0e250d0ef1aa17471f7dafbdcd7cf5aefe8b6d93b82481ff0303115e415ba9f2f068cbcf1a444e3c3951dd056c877d67
|
data/app/models/qbrick/page.rb
CHANGED
|
@@ -15,7 +15,7 @@ module Qbrick
|
|
|
15
15
|
default_scope { order 'position ASC' }
|
|
16
16
|
|
|
17
17
|
scope :published, -> { where locale_attr(:published) => Qbrick::PublishState::PUBLISHED }
|
|
18
|
-
scope :translated, -> { where.not locale_attr(:path) => nil }
|
|
18
|
+
scope :translated, -> { where.not locale_attr(:path) => [nil, ''], locale_attr(:title) => [nil, ''] }
|
|
19
19
|
|
|
20
20
|
scope :content_page, -> { where page_type: Qbrick::PageType::CONTENT }
|
|
21
21
|
|
|
@@ -80,10 +80,10 @@ module Qbrick
|
|
|
80
80
|
return true unless page_with_duplicated_paths.exists?
|
|
81
81
|
|
|
82
82
|
message = 'page ids: '
|
|
83
|
-
page_with_duplicated_paths.pluck(:id).each do |id|
|
|
84
|
-
message << "<a href=\"#{edit_cms_page_path id}#page-metadata\" target=\"_blank\">#{id}</a
|
|
83
|
+
page_with_duplicated_paths.order(:id).pluck(:id).each do |id|
|
|
84
|
+
message << "<a href=\"#{edit_cms_page_path id}#page-metadata\" target=\"_blank\">#{id}</a>, "
|
|
85
85
|
end
|
|
86
|
-
message = I18n.t 'activerecord.errors.models.qbrick/page.attributes.slug.duplicated_slug', append: " (#{message.
|
|
86
|
+
message = I18n.t 'activerecord.errors.models.qbrick/page.attributes.slug.duplicated_slug', append: " (#{message.sub(/, $/, '')})"
|
|
87
87
|
errors.add :slug, message.html_safe
|
|
88
88
|
end
|
|
89
89
|
|
data/lib/qbrick/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: qbrick
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.6.
|
|
4
|
+
version: 2.6.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Immanuel Häussermann
|
|
@@ -12,7 +12,7 @@ authors:
|
|
|
12
12
|
autorequire:
|
|
13
13
|
bindir: bin
|
|
14
14
|
cert_chain: []
|
|
15
|
-
date: 2015-07-
|
|
15
|
+
date: 2015-07-15 00:00:00.000000000 Z
|
|
16
16
|
dependencies:
|
|
17
17
|
- !ruby/object:Gem::Dependency
|
|
18
18
|
name: rspec-rails
|