qbrick 2.6.8 → 2.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67f8f765f6e3c6dd0cdb8132014bfc1995853e37
-  data.tar.gz: 076e84aea3b7ec757a33bb8e251c23af563d4b70
+  metadata.gz: 49695eed4e63d6e12b907b94559efad3d8915b24
+  data.tar.gz: 489b41c0a55c4bf8b1bac5e4f102d174df924d41
 SHA512:
-  metadata.gz: 6e39347857944a8718b1fb4998f68e463242c4e52c79e896240e3ee8f71d1bab13d1aa23ce2eff8896869166477cfd9dde08436f0b8884eb40809187b643d03b
-  data.tar.gz: 4c91219baac0fcffc31b148aad8d22f92fea7a9ac1be42aada653f9b64be0037af331da58bffb5e5ccff81a361ea089accab69103cd6275cfa5e4ee221e10c30
+  metadata.gz: 0da33eb0ee68b0d091c01b0390fde7d63b65f5007017a42ba59afb2b55cc922aa9288ea2aab2d482388b56050a2196c8407c766f718241a1d3af572fa5989dac
+  data.tar.gz: ec2b3838042f44cd8dfdaaaf79d4227d0e250d0ef1aa17471f7dafbdcd7cf5aefe8b6d93b82481ff0303115e415ba9f2f068cbcf1a444e3c3951dd056c877d67

data/app/models/qbrick/page.rb

@@ -15,7 +15,7 @@ module Qbrick
     default_scope { order 'position ASC' }
 
     scope :published, -> { where locale_attr(:published) => Qbrick::PublishState::PUBLISHED }
-    scope :translated, -> { where.not locale_attr(:path) => nil }
+    scope :translated, -> { where.not locale_attr(:path) => [nil, ''], locale_attr(:title) => [nil, ''] }
 
     scope :content_page, -> { where page_type: Qbrick::PageType::CONTENT }
 
@@ -80,10 +80,10 @@ module Qbrick
       return true unless page_with_duplicated_paths.exists?
 
       message = 'page ids: '
-      page_with_duplicated_paths.pluck(:id).each do |id|
-        message << "<a href=\"#{edit_cms_page_path id}#page-metadata\" target=\"_blank\">#{id}</a> "
+      page_with_duplicated_paths.order(:id).pluck(:id).each do |id|
+        message << "<a href=\"#{edit_cms_page_path id}#page-metadata\" target=\"_blank\">#{id}</a>, "
       end
-      message = I18n.t 'activerecord.errors.models.qbrick/page.attributes.slug.duplicated_slug', append: " (#{message.strip})"
+      message = I18n.t 'activerecord.errors.models.qbrick/page.attributes.slug.duplicated_slug', append: " (#{message.sub(/, $/, '')})"
       errors.add :slug, message.html_safe
     end
 

data/lib/qbrick/version.rb

@@ -1,3 +1,3 @@
 module Qbrick
-  VERSION = '2.6.8'
+  VERSION = '2.6.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: qbrick
 version: !ruby/object:Gem::Version
-  version: 2.6.8
+  version: 2.6.9
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails