From 7d9960e522997f3967966694a090ac098f3a1c64 Mon Sep 17 00:00:00 2001 From: vrana Date: Mon, 23 Jul 2012 16:11:35 -0700 Subject: [PATCH] Display committed date in audits Summary: Our auditors requested displaying this field and I can image that it can be useful. Test Plan: /audit/ Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D3044 --- .../audit/controller/PhabricatorAuditListController.php | 1 + src/applications/audit/view/PhabricatorAuditListView.php | 9 +++++++++ .../controller/PhabricatorDirectoryMainController.php | 1 + 3 files changed, 11 insertions(+) diff --git a/src/applications/audit/controller/PhabricatorAuditListController.php b/src/applications/audit/controller/PhabricatorAuditListController.php index 2203d9ca70..71a1939aa0 100644 --- a/src/applications/audit/controller/PhabricatorAuditListController.php +++ b/src/applications/audit/controller/PhabricatorAuditListController.php @@ -389,6 +389,7 @@ final class PhabricatorAuditListController extends PhabricatorAuditController { $view = new PhabricatorAuditListView(); $view->setAudits($audits); $view->setCommits($query->getCommits()); + $view->setUser($request->getUser()); $view->setNoDataString($nodata); $phids = $view->getRequiredHandlePHIDs(); diff --git a/src/applications/audit/view/PhabricatorAuditListView.php b/src/applications/audit/view/PhabricatorAuditListView.php index 67769584b2..94f6ef7f1e 100644 --- a/src/applications/audit/view/PhabricatorAuditListView.php +++ b/src/applications/audit/view/PhabricatorAuditListView.php @@ -136,12 +136,17 @@ final class PhabricatorAuditListView extends AphrontView { $rows = array(); foreach ($this->audits as $audit) { $commit_phid = $audit->getCommitPHID(); + $committed = null; if ($last == $commit_phid) { $commit_name = null; $commit_desc = null; } else { $commit_name = $this->getHandle($commit_phid)->renderLink(); $commit_desc = $this->getCommitDescription($commit_phid); + $commit = idx($this->commits, $commit_phid); + if ($commit && $this->user) { + $committed = phabricator_datetime($commit->getEpoch(), $this->user); + } $last = $commit_phid; } @@ -158,6 +163,7 @@ final class PhabricatorAuditListView extends AphrontView { $rows[] = array( $commit_name, phutil_escape_html($commit_desc), + $committed, $auditor_handle->renderLink(), phutil_escape_html($status), $reasons, @@ -175,6 +181,7 @@ final class PhabricatorAuditListView extends AphrontView { array( 'Commit', 'Description', + 'Committed', 'Auditor', 'Status', 'Details', @@ -185,11 +192,13 @@ final class PhabricatorAuditListView extends AphrontView { ($this->showDescriptions ? 'wide' : ''), '', '', + '', ($this->showDescriptions ? '' : 'wide'), )); $table->setRowClasses($rowc); $table->setColumnVisibility( array( + $this->showDescriptions, $this->showDescriptions, $this->showDescriptions, true, diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php index bfa22e065f..af192b8a0a 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php @@ -619,6 +619,7 @@ final class PhabricatorDirectoryMainController $view = new PhabricatorAuditListView(); $view->setAudits($audits); $view->setCommits($commits); + $view->setUser($user); $phids = $view->getRequiredHandlePHIDs(); $handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();