pageflow 14.3.0 → 14.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b1dccc2159c3f19167d16c7e852a0a0fd3ccd4a068f01e72c060ee2b60a5e1d
-  data.tar.gz: 6a60400394872ee81248de6d251d41637630c56bacded5c9fd8b79d1f205a80b
+  metadata.gz: 83633ca0a4d539fe72289335da8fadc780b40861611367e6b457a8ea5021541a
+  data.tar.gz: 836e8c19598fe2f86ef5797baab839d27d884216b5de86f39a46606b1d427ff8
 SHA512:
-  metadata.gz: 4efd4cea653cb672ef04f9bcb27cd3a0b15c64d9abb162eb9dc1d845eb350ec52f8dd4048c62638a9b48253897d1afe92e63ef9570f89419a6091c5c0df62339
-  data.tar.gz: 7e8bd3b5cd259a41c69c52799ce1679b008cb48bdde5db83c94843d8316a4cc8faaf11bff6948ca1a6789eb32669b44c70525cc9b58995335350f41faee04696
+  metadata.gz: 05ef59f396f6726ec8022d9fcc2605600204c0e0554cf5b6c1514f7968303e09db7f2deab55e2a58da6902e254ef373e961adf888c531f3069409ad9bc56585a
+  data.tar.gz: bae10300d19ce28fe2ca218d091ee71ae9267a3c0d9f756596bb88d36a3532e75173dd1139484b0b9cc177ac3a7435dec7dc2504dda3c4895705e62aac266ddb

data/CHANGELOG.md

@@ -1,26 +1,16 @@
 # CHANGELOG
 
-### Version 14.3.0
+### Version 14.4.0
 
-2019-07-24
+2019-08-13
 
-[Compare changes](https://github.com/codevise/pageflow/compare/14-2-stable...v14.3.0)
+[Compare changes](https://github.com/codevise/pageflow/compare/14-3-stable...v14.4.0)
 
-- Add text position center option
-  ([#1183](https://github.com/codevise/pageflow/pull/1183))
-- Add `failed?` method to file models
-  ([#1191](https://github.com/codevise/pageflow/pull/1191))
-- Structured data improvements
-  ([#1189](https://github.com/codevise/pageflow/pull/1189))
-- Remove margin right of links in page text
-  ([#1188](https://github.com/codevise/pageflow/pull/1188))
-- Add theme option for alternative content link icon
-  ([#1184](https://github.com/codevise/pageflow/pull/1184))
-- Support CDN that redirects to HTTPS
-  ([#1190](https://github.com/codevise/pageflow/pull/1190))
-- Bug fix: Prevent hiding links in credits menu
-  ([#1182](https://github.com/codevise/pageflow/pull/1182))
+- Fix entry membership create error
+  ([#1200](https://github.com/codevise/pageflow/pull/1200))
+- Move meta data defaults to attribute reader
+  ([#1198](https://github.com/codevise/pageflow/pull/1198))
 
 See
-[14-2-stable branch](https://github.com/codevise/pageflow/blob/14-2-stable/CHANGELOG.md)
+[14-3-stable branch](https://github.com/codevise/pageflow/blob/14-3-stable/CHANGELOG.md)
 for previous changes.

data/app/helpers/pageflow/meta_tags_helper.rb

@@ -7,9 +7,9 @@ module Pageflow
 
     def meta_tags_data_for_entry(entry)
       {
-        keywords: entry.keywords.presence || Pageflow.config.default_keywords_meta_tag,
-        author: entry.author.presence || Pageflow.config.default_author_meta_tag,
-        publisher: entry.publisher.presence || Pageflow.config.default_publisher_meta_tag
+        keywords: entry.keywords.presence,
+        author: entry.author.presence,
+        publisher: entry.publisher.presence
       }
     end
   end

data/app/models/pageflow/membership.rb

@@ -11,7 +11,7 @@ module Pageflow
                foreign_key: 'entity_id',
                optional: true
 
-    validates :user, :entity, :role, presence: true
+    validates :entity, :role, presence: true
     validates :user_id, uniqueness: {scope: [:entity_type, :entity_id]}
     validate :account_membership_exists, if: :on_entry?
     validates :role,
@@ -38,9 +38,8 @@ module Pageflow
     private
 
     def account_membership_exists
-      unless user.accounts.include?(entity.account)
-        errors[:base] << 'Entry Membership misses presupposed Membership on account of entry'
-      end
+      errors[:base] << 'Entry Membership misses presupposed Membership on account of entry' if
+        user.present? && !user.accounts.include?(entity.account)
     end
 
     def on_entry?

data/app/models/pageflow/revision.rb

@@ -97,6 +97,18 @@ module Pageflow
       self[:share_providers] || entry.theming.default_share_providers
     end
 
+    def author
+      read_attribute(:author) || Pageflow.config.default_author_meta_tag
+    end
+
+    def publisher
+      read_attribute(:publisher) || Pageflow.config.default_publisher_meta_tag
+    end
+
+    def keywords
+      read_attribute(:keywords) || Pageflow.config.default_keywords_meta_tag
+    end
+
     def active_share_providers
       share_providers.select { |_k, v| v }.keys
     end

data/config/locales/de.yml

@@ -351,6 +351,10 @@ de:
           attributes:
             folder:
               must_be_same_account: Ordner muss zu gleichem Konto gehören wie Beitrag
+        pageflow/membership:
+          attributes:
+            user:
+              required: Benutzer muss ausgewählt sein
     models:
       account:
         one: Konto

data/config/locales/en.yml

@@ -351,6 +351,10 @@ en:
           attributes:
             folder:
               must_be_same_account: Folder must belong to same account as story
+        pageflow/membership:
+          attributes:
+            user:
+              required: User must be selected
     models:
       account:
         one: Account

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '14.3.0'.freeze
+  VERSION = '14.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 14.3.0
+  version: 14.4.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails