effective_pages 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc498e340a48fc55a8059cc7bbaa980aaaaac603
-  data.tar.gz: a5a2b5379909e0228fe9a8afe5841ee289c255da
+  metadata.gz: fdc3d90510d3e7f24698870169dea7d15a2860ed
+  data.tar.gz: 374484d7237ab1dba337f02702db6f9164a1f4bc
 SHA512:
-  metadata.gz: da616415ef99d0c6cbdce36651628c36c76a05f131f5de724488ad40320f795cda2fa9e5658340feec1f87a3ecbbf48b0d0bedebd28fde0a1e4b7b75e5cb9823
-  data.tar.gz: 56bbbb4deb9e1bb2175c166bd37cb0b59c8d096d8313792ca7a0eb68464a9052044ee120433ea25084607826c3ba2c30c7cf54797a7cc3a2b23ca803ef719a4f
+  metadata.gz: e5f47e1f8e314a26935c3ac1cd038fd11e879dd9f556440c7bec032c4b6587791f4ee105586e8f6dc6463fed38f9e717daa9f79399c3267d78715ea26afd65c1
+  data.tar.gz: 535476f8e040412731310432f35e2de38a8385bacf1f032c0cca4298978fa394e12a5796a1019596bcd7d4b7970e1ad6aab8a856500ada3cc4c738ec6e1f88cd

data/app/controllers/admin/pages_controller.rb

@@ -25,10 +25,13 @@ module Admin
       authorize_effective_pages!
 
       if @page.save
-        if params[:commit] == 'Save and Edit Content' && defined?(EffectiveRegions)
+        if params[:commit] == 'Save and Edit Content'
           redirect_to effective_regions.edit_path(effective_pages.page_path(@page), :exit => effective_pages.edit_admin_page_path(@page))
         elsif params[:commit] == 'Save and Add New'
+          flash[:success] = 'Successfully created page'
           redirect_to effective_pages.new_admin_page_path
+        elsif params[:commit] == 'Save and View'
+          redirect_to effective_pages.page_path(@page)
         else
           flash[:success] = 'Successfully created page'
           redirect_to effective_pages.edit_admin_page_path(@page)
@@ -53,10 +56,24 @@ module Admin
       authorize_effective_pages!
 
       if @page.update_attributes(page_params)
-        if params[:commit] == 'Save and Edit Content' && defined?(EffectiveRegions)
+        if params[:commit] == 'Save and Edit Content'
           redirect_to effective_regions.edit_path(effective_pages.page_path(@page), :exit => effective_pages.edit_admin_page_path(@page))
         elsif params[:commit] == 'Save and Add New'
+          flash[:success] = 'Successfully updated page'
           redirect_to effective_pages.new_admin_page_path
+        elsif params[:commit] == 'Save and View'
+          redirect_to effective_pages.page_path(@page)
+        elsif params[:commit] == 'Duplicate'
+          begin
+            page = @page.duplicate!
+            flash[:success] = 'Successfully saved and duplicated page.'
+            flash[:info] = "You are now editting the duplicated page. This new page has been created as a Draft."
+          rescue => e
+            flash.delete(:success)
+            flash[:danger] = "Unable to duplicate page: #{e.message}"
+          end
+
+          redirect_to effective_pages.edit_admin_page_path(page || @page)
         else
           flash[:success] = 'Successfully updated page'
           redirect_to effective_pages.edit_admin_page_path(@page)

data/app/controllers/effective/pages_controller.rb

@@ -2,7 +2,7 @@ module Effective
   class PagesController < ApplicationController
     def show
       @pages = Effective::Page.all
-      @pages = @pages.published unless (params[:edit] || params[:preview])
+      @pages = @pages.published unless EffectivePosts.authorized?(self, :admin, :effective_pages)
 
       @page = @pages.find(params[:id])
 
@@ -14,7 +14,24 @@ module Effective
       @page_title = @page.title
       @meta_description = @page.meta_description
 
+      if EffectivePages.authorized?(self, :admin, :effective_pages)
+        flash.now[:warning] = [
+          'Hi Admin!',
+          ('You are viewing a hidden page.' unless @page.published?),
+          'Click here to',
+          ("<a href='#{effective_regions.edit_path(effective_pages.page_path(@page))}' class='alert-link'>edit page content</a> or" unless admin_edit?),
+          ("<a href='#{effective_pages.edit_admin_page_path(@page)}' class='alert-link'>edit page settings</a>.")
+        ].compact.join(' ')
+      end
+
       render @page.template, layout: @page.layout, locals: { page: @page }
     end
+
+    private
+
+    def admin_edit?
+      EffectivePages.authorized?(self, :admin, :effective_posts) && (params[:edit].to_s == 'true')
+    end
+
   end
 end

data/app/models/effective/page.rb

@@ -37,6 +37,26 @@ module Effective
     def to_s
       title
     end
+
+    def published?
+      !draft?
+    end
+
+    # Returns a duplicated post object, or throws an exception
+    def duplicate!
+      Page.new(attributes.except('id', 'updated_at', 'created_at')).tap do |page|
+        page.title = page.title + ' (Copy)'
+        page.slug = page.slug + '-copy'
+        page.draft = true
+
+        regions.each do |region|
+          page.regions.build(region.attributes.except('id', 'updated_at', 'created_at'))
+        end
+
+        page.save!
+      end
+    end
+
   end
 
 end

data/app/views/admin/pages/_actions.html.haml

@@ -1,7 +1,7 @@
 = dropdown(variation: :dropleft) do
   = dropdown_link_to 'Edit', effective_pages.edit_admin_page_path(page)
   = dropdown_link_to 'Edit Content', effective_regions.edit_path(page), 'data-no-turbolink': true, target: '_blank'
-  = dropdown_link_to 'View', effective_pages.page_path(page, (page.draft? ? {preview: true} : nil)), 'data-no-turbolink': true, target: '_blank'
+  = dropdown_link_to 'View', effective_pages.page_path(page), 'data-no-turbolink': true, target: '_blank'
 
   = dropdown_link_to "Delete #{page}", effective_pages.admin_page_path(page),
     data: { method: :delete, confirm: "Really delete #{page}?" }

data/app/views/admin/pages/_form.html.haml

@@ -1,14 +1,5 @@
 = effective_form_with(model: page, url: (page.persisted? ? effective_pages.admin_page_path(page.id) : effective_pages.admin_pages_path)) do |f|
   = f.text_field :title, hint: 'The title of your page.', input_html: { maxlength: 255 }
-  = f.check_box :draft, label: 'Save this page as a draft.  It will not be accessible on the website.'
-
-  - if f.object.persisted? || f.object.errors.include?(:slug)
-    - current_url = (effective_pages.page_url(f.object) rescue nil)
-    = f.text_field :slug, hint: "The slug controls this page's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This page is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
-
-  = render partial: '/admin/pages/additional_fields', locals: { page: page, form: f, f: f }
-
-  = f.text_field :meta_description, hint: "A one or two sentence summary of this page. Appears on Google search results underneath the page title.", input_html: { maxlength: 150 }
 
   - if (templates = EffectivePages.templates).length == 1
     = f.hidden_field :template, value: templates.first
@@ -20,8 +11,22 @@
   - else
     = f.select :layout, layouts
 
+  - if f.object.persisted? || f.object.errors.include?(:slug)
+    - current_url = (effective_pages.page_url(f.object) rescue nil)
+    = f.text_field :slug, hint: "The slug controls this page's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This page is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
+
+  = f.text_field :meta_description, hint: "A one or two sentence summary of this page. Appears on Google search results underneath the page title.", input_html: { maxlength: 150 }
+
+  = render partial: '/admin/pages/additional_fields', locals: { page: page, form: f, f: f }
+
+  = f.check_box :draft, label: 'Save this page as a draft.  It will not be accessible on the website.'
+
+  - if defined?(EffectiveRoles) and f.object.respond_to?(:roles) && EffectivePages.use_effective_roles
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object), hint: '* leave blank for a regular public page that anyone can view'
+
   = f.submit do
     = f.save 'Save'
-    = f.save 'Save and Edit Content'
-    = f.save 'Save and Add New'
-    = link_to 'Cancel', effective_pages.admin_pages_path
+    = f.save 'Save and Edit Content', class: 'btn btn-secondary'
+    = f.save 'Save and View', class: 'btn btn-secondary'
+    - if f.object.persisted?
+      = f.save 'Duplicate', class: 'btn btn-info'

data/config/effective_pages.rb

@@ -38,6 +38,9 @@ EffectivePages.setup do |config|
   config.silence_missing_page_title_warnings = false
   config.silence_missing_meta_description_warnings = false
 
+  # Display the effective roles 'choose roles' input when an admin creates a new post
+  config.use_effective_roles = false
+
   # Authorization Method
   #
   # This method is called by all controller actions with the appropriate action and resource

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '2.0.1'.freeze
+  VERSION = '2.0.2'.freeze
 end

data/lib/effective_pages.rb

@@ -23,10 +23,12 @@ module EffectivePages
 
   mattr_accessor :silence_missing_page_title_warnings
   mattr_accessor :silence_missing_meta_description_warnings
+  
+  mattr_accessor :use_effective_roles
 
+  mattr_accessor :menu
   mattr_accessor :authorization_method
   mattr_accessor :layout
-  mattr_accessor :menu
 
   def self.setup
     yield self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails