tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge 57bdb2b205 into 6a19ed9a35

This commit is contained in:
Sabina Talipova 2024-04-02 15:54:23 +13:00 committed by GitHub
parent 6a19ed9a35 57bdb2b205
commit 092b28719d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 121 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
code/Controllers/CMSMain.php
View File

@ -54,6 +54,7 @@ use SilverStripe\ORM\CMSPreviewable;
use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\FieldType\DBField;
use SilverStripe\ORM\FieldType\DBHTMLText;
use SilverStripe\ORM\HiddenClass;
use SilverStripe\ORM\Hierarchy\Hierarchy;
@ -1085,11 +1086,44 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
]));
}
$badge = null;
$status = $this->getStatusFlag($record);
if (count($status) > 0) {
$flags = '';
foreach ($status as $flag => $flagData) {
$titleAttrebute = sprintf(' title="%s"', Convert::raw2xml($flagData['title']));
$flags .= sprintf(
'<span class="badge version-status version-status--%s" %s>%s</span>',
'status-' . Convert::raw2xml($flag),
(isset($flagData['title'])) ? $titleAttrebute : '',
Convert::raw2xml($flagData['text'])
);
}
$badge = DBField::create_field('HTMLFragment', $flags);
}
$this->extend('updateBadge', $badge);
if ($badge) {
/** @var ArrayData $lastItem */
$lastItem = $items->last();
$lastItem->setField('Extra', $badge);
}
$this->extend('updateBreadcrumbs', $items);
return $items;
}
private function getStatusFlag(SiteTree $record): array
{
$flags = $record->getStatusFlags();
$this->extend('updateStatusFlags', $flags);
return $flags;
}
/**
* Create serialized JSON string with site tree hints data to be injected into
* 'data-hints' attribute of root node of jsTree.

4
code/Model/SiteTree.php
View File

@ -2465,7 +2465,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
// Get status of page
$isOnDraft = $this->isOnDraft();
$isPublished = $this->isPublished();
$stagesDiffer = $this->stagesDiffer();
$stagesDiffer = $this->_cache_statusFlags ? true : $this->stagesDifferRecursive();
// Check permissions
$canPublish = $this->canPublish();
@ -2952,7 +2952,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
'text' => _t(__CLASS__.'.ADDEDTODRAFTSHORT', 'Draft'),
'title' => _t(__CLASS__.'.ADDEDTODRAFTHELP', "Page has not been published yet")
];
} elseif ($this->isModifiedOnDraft()) {
} elseif ($this->isModifiedOnDraft() || $this->stagesDifferRecursive()) {
$flags['modified'] = [
'text' => _t(__CLASS__.'.MODIFIEDONDRAFTSHORT', 'Modified'),
'title' => _t(__CLASS__.'.MODIFIEDONDRAFTHELP', 'Page has unpublished changes'),

7
lang/en.yml
View File

@ -14,8 +14,11 @@ en:
SilverStripe\CMS\Controllers\CMSMain:
ACCESS: "Access to '{title}' section"
ACCESS_HELP: 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".'
ADDEDTODRAFTHELP: 'Page has not been published yet'
ARCHIVE: Archive
ARCHIVEDPAGE: "Archived page '{title}'"
ARCHIVEDPAGEHELP: 'Page is removed from draft and live'
ARCHIVEDPAGESHORT: 'Archived'
AddNew: 'Add new page'
AddNewButton: 'Add new'
AddPageRestriction: 'Note: Some page types are not allowed for this selection'
@ -31,7 +34,11 @@ en:
DUPLICATED: "Duplicated '{title}' successfully"
DUPLICATEDWITHCHILDREN: "Duplicated '{title}' and children successfully"
EMAIL: Email
MODIFIEDONDRAFTSHORT: 'Modified'
MODIFIEDONDRAFTHELP: 'Page has unpublished changes'
NEWPAGE: 'New {pagetype}'
ONLIVEONLYSHORT: 'On live only'
ONLIVEONLYSHORTHELP: 'Page is published, but has been deleted from draft'
PAGENOTEXISTS: "This page doesn't exist"
PAGES: 'Page status'
PAGESALLOPT: 'All pages'

78
tests/behat/features/page-with-versioned-objects.feature Normal file
View File

@ -0,0 +1,78 @@
Feature: Publish a page
As a site owner
I want see versioned badge on page with draft and modified versioned child objects
Background:
Given a "Test Page Versioned Object" "My Page" with "URLSegment"="my-page"
And the "Test Page Versioned Object" "My Page" is not published
And the "Versioned parent object" "My Versioned Parent Object" with "TestPageVersionedObject"="1"
And the "Non Versioned parent object" "My Non Versioned Parent Object" with "TestPageVersionedObject"="1"
And the "group" "EDITOR" has permissions "Access to 'Pages' section" and "TEST_DATAOBJECT_EDIT"
And I am logged in as a member of "EDITOR" group
Scenario: I should see versioned badge on page with draft and modified versioned child object
Given I go to "/admin/pages"
And I should see "My Page" in the tree
And I click on "My Page" in the tree
Then I should see "My Page" in the ".breadcrumbs-wrapper" element
And I should see "Draft" in the ".breadcrumbs-wrapper" element
And I click on the "#tab-Root_VersionedParentObjects" element
And I should see "My Versioned Parent Object" in the "#Form_EditForm" element
And I should see "Draft" in the "#Form_EditForm" element
Then I click "My Versioned Parent Object" in the "#Form_EditForm_VersionedParentObjects" element
And I should see "My Versioned Parent Object" in the ".breadcrumbs-wrapper" element
And I should see "Draft" in the ".breadcrumbs-wrapper" element
And I click "My Page" in the ".breadcrumbs-wrapper" element
And I should see "Draft" in the ".breadcrumbs-wrapper" element
Then I click "My Versioned Parent Object" in the "#Form_EditForm_VersionedParentObjects" element
And I press the "Publish" button
And I should not see "Draft" in the ".breadcrumbs-wrapper" element
And I click "My Page" in the ".breadcrumbs-wrapper" element
And I should see "Draft" in the ".breadcrumbs-wrapper" element
Then I click "My Versioned Parent Object" in the "#Form_EditForm_VersionedParentObjects" element
And I fill in "Name" with "My Versioned Parent Object with changes"
And I press the "Save" button
Then I should see "Modified" in the ".breadcrumbs-wrapper" element
And I click "My Page" in the ".breadcrumbs-wrapper" element
And I should see "Draft" in the ".breadcrumbs-wrapper" element
Then I press the "Publish" button
And I should not see "Modified" in the ".breadcrumbs-wrapper" element
And I should not see "Modified" in the "#Form_EditForm" element
Scenario: I should see versioned badge on page with draft and modified versioned grandchild object
Given I go to "/admin/pages"
And I should see "My Page" in the tree
And I click on "My Page" in the tree
Then I should see "My Page" in the ".breadcrumbs-wrapper" element
And I should see "Draft" in the ".breadcrumbs-wrapper" element
And I click on the "#tab-Root_NonVersionedParentObjects" element
Then I click "My Non Versioned Parent Object" in the "#Form_EditForm_NonVersionedParentObjects" element
And I should not see "Draft" in the ".breadcrumbs-wrapper" element
Then I click "Versioned child objects" in the ".ui-tabs-nav" element
And I click "Add Versioned Child Object" in the "#Form_ItemEditForm_VersionedChildObjects" element
And I fill in "Name" with "My Versioned child object"
And I press the "Create" button
And I wait 2 seconds
And I should see "Draft" in the ".breadcrumbs-wrapper" element
Then I click "My Non Versioned Parent Object" in the ".breadcrumbs-wrapper" element
And I should see "Modified" in the ".breadcrumbs-wrapper" element
Then I click "My Page" in the ".breadcrumbs-wrapper" element
And I should see "Draft" in the ".breadcrumbs-wrapper" element
And I should see "My Non Versioned Parent Object" in the "#Form_EditForm" element
And I should see "Modified" in the "#Form_EditForm" element
And I press the "Publish" button
Then I click "My Non Versioned Parent Object" in the "#Form_EditForm" element
Then I click "Versioned child objects" in the ".ui-tabs-nav" element
And I click "My Versioned child object" in the "#Form_ItemEditForm_VersionedChildObjects" element
And I fill in "Name" with "My Versioned child object with changes"
Then I press the "Save" button
And I should see "Modified" in the ".breadcrumbs-wrapper" element
Then I click "My Non Versioned Parent Object" in the ".breadcrumbs-wrapper" element
And I should see "Modified" in the ".breadcrumbs-wrapper" element
And I click "Versioned child objects" in the ".ui-tabs-nav" element
And I should see "Versioned child object with changes" in the "#Form_ItemEditForm_VersionedChildObjects" element
And I should see "Modified" in the "#Form_ItemEditForm_VersionedChildObjects" element
Then I click "My Page" in the ".breadcrumbs-wrapper" element
And I should see "Modified" in the ".breadcrumbs-wrapper" element
And I should see "My Non Versioned Parent Object" in the "#Form_EditForm" element
And I should see "Modified" in the "#Form_EditForm" element