'.
- '
'.
- 'Create New Task'.
- ''.
+ '
'.
+ '
'.
+ '
'.
+ '
'.
+ '| Status: | '.$status_links.' |
|---|
'.
+ '| Group: | '.$group_links.' |
|---|
'.
+ '| Order: | '.$order_links.' |
|---|
'.
+ '
'.
+ '
'.
+ '
'.
'
');
- $nav->appendChild($task_list);
+
+ $have_tasks = false;
+ foreach ($tasks as $group => $list) {
+ if (count($list)) {
+ $have_tasks = true;
+ break;
+ }
+ }
+
+ if (!$have_tasks) {
+ $nav->appendChild(
+ '');
+ } else {
+ foreach ($tasks as $group => $list) {
+ $task_list = new ManiphestTaskListView();
+ $task_list->setTasks($list);
+ $task_list->setHandles($handles);
+
+ $nav->appendChild(
+ '');
+ $nav->appendChild($task_list);
+ }
+ }
return $this->buildStandardPageResponse(
$nav,
array(
'title' => 'Task List',
));
}
- private function loadTasks() {
+ private function loadTasks(array $dict) {
$request = $this->getRequest();
$user = $request->getUser();
$phids = array($user->getPHID());
+ $task = new ManiphestTask();
+
+ $argv = array();
+
+ $status = $dict['status'];
+ if (!empty($status['open']) && !empty($status['closed'])) {
+ $status_clause = '1 = 1';
+ } else if (!empty($status['open'])) {
+ $status_clause = 'status = %d';
+ $argv[] = 0;
+ } else {
+ $status_clause = 'status > %d';
+ $argv[] = 0;
+ }
+
+ $extra_clause = '1 = 1';
switch ($this->view) {
case 'action':
- return id(new ManiphestTask())->loadAllWhere(
- 'ownerPHID in (%Ls) AND status = 0',
- $phids);
+ $extra_clause = 'ownerPHID in (%Ls)';
+ $argv[] = $phids;
+ break;
case 'created':
- return id(new ManiphestTask())->loadAllWhere(
- 'authorPHID in (%Ls) AND status = 0',
- $phids);
+ $extra_clause = 'authorPHID in (%Ls)';
+ $argv[] = $phids;
+ break;
case 'triage':
- return id(new ManiphestTask())->loadAllWhere(
- 'ownerPHID in (%Ls) and status = %d',
- $phids,
- ManiphestTaskPriority::PRIORITY_TRIAGE);
+ $extra_clause = 'ownerPHID in (%Ls) AND status = %d';
+ $argv[] = $phids;
+ $argv[] = ManiphestTaskPriority::PRIORITY_TRIAGE;
+ break;
case 'alltriage':
- return id(new ManiphestTask())->loadAllWhere(
- 'status = %d',
- ManiphestTaskPriority::PRIORITY_TRIAGE);
+ $extra_clause = 'status = %d';
+ $argv[] = ManiphestTaskPriority::PRIORITY_TRIAGE;
+ break;
case 'unassigned':
- return id(new ManiphestTask())->loadAllWhere(
- 'ownerPHID IS NULL');
- case 'allopen':
- return id(new ManiphestTask())->loadAllWhere(
- 'status = 0');
+ $extra_clause = 'ownerPHID is NULL';
+ break;
+ case 'all':
+ break;
+ }
+
+ switch ($dict['order']) {
+ case 'priority':
+ $order = 'priority DESC, dateModified DESC';
+ break;
+ case 'created':
+ $order = 'id DESC';
+ break;
+ default:
+ $order = 'dateModified DESC';
+ break;
+ }
+
+ $sql = "({$status_clause}) AND ({$extra_clause}) ORDER BY {$order}";
+
+ array_unshift($argv, $sql);
+
+ $data = call_user_func_array(array($task, 'loadAllWhere'), $argv);
+
+ $handle_phids = mpull($data, 'getOwnerPHID');
+ $handles = id(new PhabricatorObjectHandleData($handle_phids))
+ ->loadHandles();
+
+ switch ($dict['group']) {
+ case 'priority':
+ $data = mgroup($data, 'getPriority');
+ krsort($data);
+
+ $out = array();
+ foreach ($data as $pri => $tasks) {
+ $out[ManiphestTaskPriority::getTaskPriorityName($pri)] = $tasks;
+ }
+ $data = $out;
+
+ break;
+ case 'status':
+ $data = mgroup($data, 'getStatus');
+ ksort($data);
+
+ $out = array();
+ foreach ($data as $status => $tasks) {
+ $out[ManiphestTaskStatus::getTaskStatusFullName($status)] = $tasks;
+ }
+
+ $data = $out;
+ break;
+ case 'owner':
+ $data = mgroup($data, 'getOwnerPHID');
+
+ $out = array();
+ foreach ($data as $phid => $tasks) {
+ if ($phid) {
+ $out[$handles[$phid]->getFullName()] = $tasks;
+ } else {
+ $out['Unassigned'] = $tasks;
+ }
+ }
+ if (isset($out['Unassigned'])) {
+ // If any tasks are unassigned, move them to the front of the list.
+ $data = array('Unassigned' => $out['Unassigned']) + $out;
+ } else {
+ $data = $out;
+ }
+
+ ksort($data);
+ break;
+ default:
+ $data = array(
+ 'Tasks' => $data,
+ );
+ break;
+ }
+
+ return array($data, $handles);
+ }
+
+ public function renderStatusLinks() {
+ $request = $this->getRequest();
+
+ $sel = array(
+ 'open' => false,
+ 'closed' => false,
+ );
+
+ $status = $request->getStr('s');
+ if ($status == 'c') {
+ $sel['closed'] = true;
+ } else if ($status == 'oc') {
+ $sel['closed'] = true;
+ $sel['open'] = true;
+ } else {
+ $sel['open'] = true;
+ }
+
+ $just_one = (count(array_filter($sel)) == 1);
+
+ $flag_map = array(
+ 'Open' => 'open',
+ 'Closed' => 'closed',
+ );
+ $button_names = array(
+ 'Open' => 'o',
+ 'Closed' => 'c',
+ );
+
+ $base_flags = array();
+ foreach ($flag_map as $name => $key) {
+ $base_flags[$button_names[$name]] = $sel[$key];
+ }
+
+ foreach ($button_names as $name => $letter) {
+ $flags = $base_flags;
+ $flags[$letter] = !$flags[$letter];
+ $button_names[$name] = implode('', array_keys(array_filter($flags)));
+ }
+
+ $uri = $request->getRequestURI();
+
+ $links = array();
+ foreach ($button_names as $name => $value) {
+ $selected = $sel[$flag_map[$name]];
+ $fixed = ($selected && $just_one);
+
+ $more = null;
+ if ($fixed) {
+ $href = null;
+ $more .= ' toggle-fixed';
+ } else {
+ $href = $uri->alter('s', $value);
+ }
+
+ if ($selected) {
+ $more .= ' toggle-selected';
+ }
+
+ $links[] = phutil_render_tag(
+ 'a',
+ array(
+ 'href' => $href,
+ 'class' => 'toggle'.$more,
+ ),
+ $name);
+ }
+ $status_links = implode("\n", $links);
+
+ return array($sel, $status_links);
+ }
+
+ public function renderOrderLinks() {
+ $request = $this->getRequest();
+
+ $order = $request->getStr('o');
+ $orders = array(
+ 'u' => 'updated',
+ 'c' => 'created',
+ 'p' => 'priority',
+ );
+ if (empty($orders[$order])) {
+ $order = 'u';
+ }
+ $order_by = $orders[$order];
+
+ $order_names = array(
+ 'Updated' => 'u',
+ 'Created' => 'c',
+ 'Priority' => 'p',
+ );
+
+ $uri = $request->getRequestURI();
+
+ $links = array();
+ foreach ($order_names as $name => $param_key) {
+ if ($param_key == $order) {
+ $more = ' toggle-selected toggle-fixed';
+ $href = null;
+ } else {
+ $more = null;
+ $href = $uri->alter('o', $param_key);
+ }
+ $links[] = phutil_render_tag(
+ 'a',
+ array(
+ 'class' => 'toggle'.$more,
+ 'href' => $href,
+ ),
+ $name);
+ }
+ $order_links = implode("\n", $links);
+
+ return array($order_by, $order_links);
+ }
+
+ public function renderGroupLinks() {
+ $request = $this->getRequest();
+
+ $group = $request->getStr('g');
+ $groups = array(
+ 'n' => 'none',
+ 'p' => 'priority',
+ 's' => 'status',
+ 'o' => 'owner',
+ );
+ if (empty($groups[$group])) {
+ $group = 'n';
+ }
+ $group_by = $groups[$group];
+
+ $group_names = array(
+ 'None' => 'n',
+ 'Priority' => 'p',
+ 'Owner' => 'o',
+ 'Status' => 's',
+ );
+
+ $uri = $request->getRequestURI();
+
+ $links = array();
+ foreach ($group_names as $name => $param_key) {
+ if ($param_key == $group) {
+ $more = ' toggle-selected toggle-fixed';
+ $href = null;
+ } else {
+ $more = null;
+ $href = $uri->alter('g', $param_key);
+ }
+ $links[] = phutil_render_tag(
+ 'a',
+ array(
+ 'class' => 'toggle'.$more,
+ 'href' => $href,
+ ),
+ $name);
}
+ $group_links = implode("\n", $links);
- return array();
+ return array($group_by, $group_links);
}
}
diff --git a/src/applications/maniphest/controller/tasklist/__init__.php b/src/applications/maniphest/controller/tasklist/__init__.php
index 17b4309e1..aff31bc32 100644
--- a/src/applications/maniphest/controller/tasklist/__init__.php
+++ b/src/applications/maniphest/controller/tasklist/__init__.php
@@ -1,20 +1,22 @@
task = $task;
return $this;
}
public function setHandles(array $handles) {
$this->handles = $handles;
return $this;
}
public function render() {
$task = $this->task;
$handles = $this->handles;
require_celerity_resource('maniphest-task-summary-css');
return
'
'.
'| '.
'T'.$task->getID().
' | '.
+ ''.
+ ($task->getStatus() == ManiphestTaskStatus::STATUS_OPEN
+ ? 'Open'
+ : 'Closed').
+ ' | '.
''.
- $handles[$task->getOwnerPHID()]->renderLink().
+ ($task->getOwnerPHID()
+ ? $handles[$task->getOwnerPHID()]->renderLink()
+ : 'None').
' | '.
''.
phutil_render_tag(
'a',
array(
'href' => '/T'.$task->getID(),
),
phutil_escape_html($task->getTitle())).
' | '.
''.
ManiphestTaskPriority::getTaskPriorityName($task->getPriority()).
' | '.
''.
phabricator_format_timestamp($task->getDateModified()).
' | '.
'
';
}
}
diff --git a/src/applications/maniphest/view/tasksummary/__init__.php b/src/applications/maniphest/view/tasksummary/__init__.php
index 8c6a3ec78..c2612526b 100644
--- a/src/applications/maniphest/view/tasksummary/__init__.php
+++ b/src/applications/maniphest/view/tasksummary/__init__.php
@@ -1,17 +1,18 @@