From 5d586f149d9bacdbc7f37d9e81c579a80d6f6a80 Mon Sep 17 00:00:00 2001 From: epriestley Date: Wed, 9 Feb 2011 16:29:46 -0800 Subject: [PATCH] Improve task list filtering views. Summary: Test Plan: Reviewers: CC: --- .../tasklist/ManiphestTaskListController.php | 48 ++++++++++++++----- .../ManiphestTransactionEditor.php | 1 - webroot/rsrc/css/aphront/side-nav-view.css | 3 +- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php b/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php index 9613fb93f2..cc29ad47c7 100644 --- a/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php +++ b/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php @@ -27,31 +27,46 @@ class ManiphestTaskListController extends ManiphestController { public function processRequest() { $views = array( + 'Your Tasks', 'action' => 'Action Required', // 'activity' => 'Recently Active', // 'closed' => 'Recently Closed', 'created' => 'Created', 'triage' => 'Need Triage', + '
', + 'All Open Tasks', + 'alltriage' => 'Need Triage', + 'unassigned' => 'Unassigned', + 'allopen' => 'All Open', + ); if (empty($views[$this->view])) { - $this->view = key($views); + $this->view = 'action'; } $tasks = $this->loadTasks(); $nav = new AphrontSideNavView(); foreach ($views as $view => $name) { - $nav->addNavItem( - phutil_render_tag( - 'a', - array( - 'href' => '/maniphest/view/'.$view.'/', - 'class' => ($this->view == $view) - ? 'aphront-side-nav-selected' - : null, - ), - phutil_escape_html($name))); + if (is_integer($view)) { + $nav->addNavItem( + phutil_render_tag( + 'span', + array(), + $name)); + } else { + $nav->addNavItem( + phutil_render_tag( + 'a', + array( + 'href' => '/maniphest/view/'.$view.'/', + 'class' => ($this->view == $view) + ? 'aphront-side-nav-selected' + : null, + ), + phutil_escape_html($name))); + } } $handle_phids = mpull($tasks, 'getOwnerPHID'); @@ -93,9 +108,20 @@ class ManiphestTaskListController extends ManiphestController { 'authorPHID in (%Ls) AND status = 0', $phids); case 'triage': + return id(new ManiphestTask())->loadAllWhere( + 'ownerPHID in (%Ls) and status = %d', + $phids, + ManiphestTaskPriority::PRIORITY_TRIAGE); + case 'alltriage': return id(new ManiphestTask())->loadAllWhere( 'status = %d', ManiphestTaskPriority::PRIORITY_TRIAGE); + case 'unassigned': + return id(new ManiphestTask())->loadAllWhere( + 'ownerPHID IS NULL'); + case 'allopen': + return id(new ManiphestTask())->loadAllWhere( + 'status = 0'); } return array(); diff --git a/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php index 97bcb9886e..a6a0c8abbd 100644 --- a/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php +++ b/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php @@ -147,7 +147,6 @@ class ManiphestTransactionEditor { "TASK DETAIL\n". " ".$task_uri."\n"; - $base = substr(md5($task->getPHID()), 0, 27).' '.pack("N", time()); $thread_index = base64_encode($base); diff --git a/webroot/rsrc/css/aphront/side-nav-view.css b/webroot/rsrc/css/aphront/side-nav-view.css index 4ace0af0ee..fd4080e027 100644 --- a/webroot/rsrc/css/aphront/side-nav-view.css +++ b/webroot/rsrc/css/aphront/side-nav-view.css @@ -15,7 +15,8 @@ th.aphront-side-nav-navigation { border-right: 1px solid #bbbbbb; } -th.aphront-side-nav-navigation a { +th.aphront-side-nav-navigation a, +th.aphront-side-nav-navigation span { display: block; margin: 0 0 2px; min-width: 150px;