refinerycms-pages 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8308e3073c942d0214a2decd15f895cb59337a2
-  data.tar.gz: 7bdadb6128ddc13e5bc6d82417bd6aa8218f22fe
+  metadata.gz: e66573e24ded851715eb030ec7e56c42c7d5fcba
+  data.tar.gz: a5e7e009811a415a95e5911fcf739d32d3d77151
 SHA512:
-  metadata.gz: ab53d5bb3c0f277efae545eb8ad0fe8baf2d2f7ef6c5d2839647c6bae25b9835bf6b8fe7c98553614051b9b75b0f6546fd6f5bc7250554cd1496d8e723eda8cd
-  data.tar.gz: 78d2d2482e752f92ec9c5ba6288e7c5d90986b363075fd1e8992d520f8c182dddf8959366f94c7e4b8400cb1f1f58ce3f31286fa035922faa741a6ae89b10d82
+  metadata.gz: 11f6602c5142b8d36d9663d81d4af8cb99e85c57964b76315dd1c0d49a64ac4d3ff0b2273377ae042e29f77cc31cb54ecd9c5dd5449dada00b332c38fd90d24f
+  data.tar.gz: 9583d10fff14df271d377f178e3d5763ef4177ec7218888c86227a43fad848f2dec191380c93b423ae04496d20bc9678e1b05d05db8145996997fb0fe494b988

data/app/controllers/refinery/pages_controller.rb

@@ -3,7 +3,7 @@ module Refinery
     include Pages::RenderOptions
 
     before_action :find_page, :set_canonical
-    before_action :error_404, :unless => :current_user_can_view_page?
+    before_action :error_404, unless: :current_user_can_view_page?
 
     # Save whole Page after delivery
     after_action :write_cache?
@@ -60,9 +60,13 @@ module Refinery
     end
 
     def current_user_can_view_page?
-      page.live? || authorisation_manager.allow?(:plugin, "refinery_pages")
+      page.live? || current_refinery_user_can_access?("refinery_pages")
     end
 
+    def current_refinery_user_can_access?(plugin)
+      admin? && authorisation_manager.allow?(:plugin, plugin)
+    end
+    
     def first_live_child
       page.children.order('lft ASC').live.first
     end

data/app/views/refinery/admin/pages/_form.html.erb

@@ -44,7 +44,7 @@
         , "<%= refinery.admin_page_parts_path %>"
       );
 
-      $("#preview-button").click(function(e) {
+      $(document).on('click', '#preview-button', function(e) {
         var $form = $(this).parents('form');
         var prev_url = $form.attr('action');
         var prev_target = $form.attr('target') || '';

data/config/locales/fr.yml

@@ -37,9 +37,11 @@ fr:
         new: Ajouter une nouvelle sous-page
         expand_collapse: Développer ou réduire les sous-pages
         page:
-          view_live_html: Voir cette page<br/><em>(Ouvre une nouvelle fenêtre)</em>
-          hidden: caché
           draft: brouillon
+          hidden: caché
+          redirected: redirigé
+          skip_to_first_child: redirigé vers 1er enfant
+          view_live_html: Voir cette page<br/><em>(Ouvre une nouvelle fenêtre)</em>
         form:
           preview: Prévisualiser
           preview_changes: Prévisualiser vos changements avant de les appliquer

data/db/seeds.rb

@@ -25,7 +25,7 @@ if Refinery::Page.where(menu_match: "^/$").empty?
   )
   page_not_found_page.parts.create(
     title: "Body",
-    body: "<h2>Sorry, there was a problem...</h2><p>The page you requested was not found.</p><p><a href='/'>Return to the home page</a></p>",
+    body: '<h2>Sorry, there was a problem...</h2><p>The page you requested was not found.</p><p><a href="/">Return to the home page</a></p>',
     position: 0
   )
 

data/lib/refinery/pages/configuration.rb

@@ -24,7 +24,7 @@ module Refinery
     self.layout_template_whitelist = ["application"]
     self.add_whitelist_elements = %w[ source track ]
     # Note: "data-" attributes are whitelisted by default. See https://github.com/refinery/refinerycms/pull/3187
-    self.add_whitelist_attributes = %w[ kind srclang placeholder controls ]
+    self.add_whitelist_attributes = %w[ kind srclang placeholder controls required ]
 
 
     class << self

data/spec/features/refinery/pages_spec.rb

@@ -336,6 +336,30 @@ module Refinery
         end
       end
     end
+
+    describe 'when draft is set to true' do
+      before { allow_any_instance_of(PagesController).to receive(:find_page).and_return(:draft_page) }
+
+      describe 'for vistor' do
+        it 'redirect to the 404 error page' do
+          allow_any_instance_of(PagesController).to receive(:current_refinery_user_can_access?).and_return(false)
+          
+          visit refinery.page_path(draft_page)
+
+          expect(page).to have_http_status(404)
+        end
+      end
+
+      describe 'for admin' do
+        it 'displays draft page message not live' do
+          allow_any_instance_of(PagesController).to receive(:current_refinery_user_can_access?).and_return(true)
+
+          visit refinery.page_path(draft_page)
+
+          expect(page).to have_content(::I18n.t('refinery.draft_page_message.not_live'))
+        end
+      end
+    end
   end
 
   context "with multiple locales" do

data.tar.gz.sig

@@ -1,2 +1 @@
-O��������w�]�!3|�e�umğ�3�C�w�c6�^����<�F��n#�5�2ě�̎��K��!�*6��{:Rn�ބ~���_����i��K����Q.�y���fC�|�;��T'F+i����GY���%�;|�yŬ����
-xU�ꭙc�3����\��$��u&���+Pե#i�ua��g�GL��F�Z��	V��S���r)�Sb�n��[��!�3W.oɸ�m��"��9�x
+o�6IҞ�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Philip Arndt
@@ -32,7 +32,7 @@ cert_chain:
   +wsbjPvdIWsjWQMn6MasZYIVTnenwP2jg+z9HSNxW0NL2vZx8VabpsWGWfrb+koj
   rE1h12GTgwaC3r9FOkdnSpClgPYAzTTCJ8kD74qO2zC9pGegrUXdWFM6
   -----END CERTIFICATE-----
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_id
@@ -108,14 +108,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 2.6.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Pages extension for Refinery CMS