From 7665cb2424634ac236ec73434fa45b6c4d507c47 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Tue, 23 Feb 2016 00:27:53 +0100 Subject: [PATCH] show/activitilog: make "disabled" property visible --- application/controllers/ShowController.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php index bf9a0603..e30f458d 100644 --- a/application/controllers/ShowController.php +++ b/application/controllers/ShowController.php @@ -55,9 +55,17 @@ class ShowController extends ActionController { $this->view->title = sprintf('%s config diff', $entry->object_name); $this->getTabs()->activate('diff'); + $old = $this->oldObject($entry); + $new = $this->newObject($entry); + + if ($old->disabled === 'y' && $new->disabled === 'n') { + $old = null; + } elseif ($old->disabled === 'n' && $new->disabled === 'y') { + $new = null; + } $d = ConfigDiff::create( - $this->oldObject($entry), - $this->newObject($entry) + $old, + $new ); $this->view->output = $d->renderHtml();