ENH Updated UI for versioned objects and all its versioned relations

silverstripe · Dec 21, 2023 · 11391a0 · 11391a0
1 parent d5faa01
commit 11391a0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
@@ -54,6 +54,7 @@
 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;
@@ -1089,6 +1090,29 @@ public function Breadcrumbs($unlinked = false)
             ]));
         }
 
+        $badge = null;
+
+        if ($record->stagesDifferRecursive()) {
+            $status = [
+                'class' => 'modified',
+                'title' => _t(__CLASS__ . '.MODIFIED', 'Modified'),
+            ];
+            // Generate badge
+            $badge = DBField::create_field('HTMLFragment', sprintf(
+                '<span class="badge version-status version-status--%s">%s</span>',
+                $status['class'],
+                $status['title']
+            ));
+        }
+
+        $this->extend('updateBadge', $badge);
+
+        if ($badge) {
+            /** @var ArrayData $lastItem */
+            $lastItem = $items->last();
+            $lastItem->setField('Extra', $badge);
+        }
+
         $this->extend('updateBreadcrumbs', $items);
 
         return $items;

diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php
@@ -2473,7 +2473,7 @@ public function getCMSActions()
         // Get status of page
         $isOnDraft = $this->isOnDraft();
         $isPublished = $this->isPublished();
-        $stagesDiffer = $this->stagesDiffer();
+        $stagesDiffer = $this->stagesDifferRecursive();
 
         // Check permissions
         $canPublish = $this->canPublish();
@@ -2960,7 +2960,7 @@ public function getStatusFlags($cached = true)
                     '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'),