From c4ced7215806fa3dd1859a1b24ec6a8c4a704744 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Wed, 11 Aug 2021 10:21:44 -0400 Subject: [PATCH] Minor updates in ProcessPageEdit "who can view" section --- .../Process/ProcessPageEdit/ProcessPageEdit.js | 16 ---------------- .../ProcessPageEdit/ProcessPageEdit.module | 9 +++++++-- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.js b/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.js index 704d966f..b3533775 100644 --- a/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.js +++ b/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.js @@ -90,20 +90,4 @@ function initPageEditForm() { $title.text(val.length > 0 ? val : title); }); } - - /* - $('#ProcessPageEdit').on('submit', function() { - var changes = []; - $('.InputfieldStateChanged').each(function() { - var name = $(this).attr('id'); - if(name.indexOf('wrap_Inputfield_') === 0) { - name = name.replace('wrap_Inputfield_', ''); - } else if(name.indexOf('wrap_') === 0) { - name = name.substring(5); - } - changes.push(name); - $('#_page_edit_changes').val(changes.join(',')); - }); - }); - */ } diff --git a/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module b/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module index 30875206..7e9e4c2c 100644 --- a/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module +++ b/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module @@ -1855,6 +1855,8 @@ class ProcessPageEdit extends Process implements WirePageEditor, ConfigurableMod /** @var MarkupAdminDataTable $table */ $table = $this->modules->get("MarkupAdminDataTable"); + $pageHasTemplateFile = $this->page->template->filenameExists(); + if($this->input->get('renderInputfieldAjax') == 'ProcessPageEditRoles') { $roles = $this->page->getAccessRoles(); $accessTemplate = $this->page->getAccessTemplate('edit'); @@ -1884,7 +1886,7 @@ class ProcessPageEdit extends Process implements WirePageEditor, ConfigurableMod $permissions = array(); $roleName = $role->name; if($roleName == 'guest') $roleName .= " " . $this->_('(everyone)'); // Identifies who guest is (everyone) - $permissions["page-view"] = 'view'; + $permissions["page-view"] = 'view' . ($pageHasTemplateFile ? '' : '¹'); $checkEditable = true; if($hasPublishPermission && !$this->page->hasStatus(Page::statusUnpublished) @@ -1938,10 +1940,13 @@ class ProcessPageEdit extends Process implements WirePageEditor, ConfigurableMod $accessParent = $this->page->getAccessParent(); if($accessParent === $this->page) { - $field->notes = sprintf($this->_('Access is defined with this page\'s template: %s'), $accessParent->template); // Where access is defined: with this page's template + $field->notes = sprintf($this->_('Access is defined with this page’s template: %s'), $accessParent->template); // Where access is defined: with this page's template } else { $field->notes = sprintf($this->_('Access is inherited from page "%1$s" and defined with template: %2$s'), $accessParent->path, $accessParent->template); // Where access is defined: inherited from a parent } + if(!$pageHasTemplateFile) { + $field->notes = trim("¹ " . $this->_('Viewable by its URL if page had a template file (it does not currently).') . "\n$field->notes"); + } return $field; }