Page MenuHomestyx hydra
Files F235789

No OneTemporary
Actions

View Options

diff --git a/src/applications/project/controller/PhabricatorProjectBoardController.php b/src/applications/project/controller/PhabricatorProjectBoardController.php
index 937d23cf2b..e93bda71fd 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardController.php
@@ -1,153 +1,138 @@
<?php
final class PhabricatorProjectBoardController
extends PhabricatorProjectController {
private $id;
public function shouldAllowPublic() {
return true;
}
public function willProcessRequest(array $data) {
$this->id = $data['id'];
}
public function processRequest() {
$request = $this->getRequest();
$viewer = $request->getUser();
$project = id(new PhabricatorProjectQuery())
->setViewer($viewer)
->withIDs(array($this->id))
->executeOne();
if (!$project) {
return new Aphront404Response();
}
$columns = id(new PhabricatorProjectColumnQuery())
->setViewer($viewer)
->withProjectPHIDs(array($project->getPHID()))
->execute();
- // TODO: Completely making this part up.
- $columns[] = id(new PhabricatorProjectColumn())
- ->setName('Backlog')
- ->setPHID(0)
- ->setSequence(0);
-
- $columns[] = id(new PhabricatorProjectColumn())
- ->setName('Assigned')
- ->setPHID(1)
- ->setSequence(1);
-
- $columns[] = id(new PhabricatorProjectColumn())
- ->setName('In Progress')
- ->setPHID(2)
- ->setSequence(2);
-
- $columns[] = id(new PhabricatorProjectColumn())
- ->setName('Completed')
- ->setPHID(3)
- ->setSequence(3);
-
msort($columns, 'getSequence');
$tasks = id(new ManiphestTaskQuery())
->setViewer($viewer)
->withAllProjects(array($project->getPHID()))
->withStatus(ManiphestTaskQuery::STATUS_OPEN)
->setOrderBy(ManiphestTaskQuery::ORDER_PRIORITY)
->execute();
$tasks = mpull($tasks, null, 'getPHID');
- // TODO: This is also made up.
+ // TODO: This is so made up.
$task_map = array();
foreach ($tasks as $task) {
- $task_map[mt_rand(0, 3)][] = $task->getPHID();
+ if ($columns) {
+ $random_column = $columns[array_rand($columns)]->getPHID();
+ } else {
+ $random_column = 0;
+ }
+ $task_map[$random_column][] = $task->getPHID();
}
$board = id(new PHUIWorkboardView())
->setUser($viewer)
->setFluidishLayout(true);
foreach ($columns as $column) {
$panel = id(new PHUIWorkpanelView())
- ->setHeader($column->getName());
+ ->setHeader($column->getName())
+ ->setEditURI('edit/'.$column->getID().'/');
$cards = id(new PHUIObjectItemListView())
->setUser($viewer)
->setCards(true)
->setFlush(true);
$task_phids = idx($task_map, $column->getPHID(), array());
foreach (array_select_keys($tasks, $task_phids) as $task) {
$cards->addItem($this->renderTaskCard($task));
}
$panel->setCards($cards);
$board->addPanel($panel);
}
$crumbs = $this->buildApplicationCrumbs();
$actions = id(new PhabricatorActionListView())
->setUser($viewer)
->addAction(
id(new PhabricatorActionView())
->setName(pht('Add Column/Milestone/Sprint'))
->setHref($this->getApplicationURI('board/'.$this->id.'/edit/'))
->setIcon('create'));
$plist = id(new PHUIPropertyListView());
// TODO: Need this to get actions to render.
$plist->addProperty(pht('Ignore'), pht('This Property'));
$plist->setActionList($actions);
$header = id(new PHUIObjectBoxView())
->setHeaderText($project->getName())
->addPropertyList($plist);
$board_box = id(new PHUIBoxView())
->appendChild($board)
->addMargin(PHUI::MARGIN_LARGE);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$board_box,
),
array(
'title' => pht('Board'),
'device' => true,
));
}
private function renderTaskCard(ManiphestTask $task) {
$request = $this->getRequest();
$viewer = $request->getUser();
$color_map = ManiphestTaskPriority::getColorMap();
$bar_color = idx($color_map, $task->getPriority(), 'grey');
// TODO: Batch this earlier on.
$can_edit = PhabricatorPolicyFilter::hasCapability(
$viewer,
$task,
PhabricatorPolicyCapability::CAN_EDIT);
return id(new PHUIObjectItemView())
->setObjectName('T'.$task->getID())
->setHeader($task->getTitle())
->setGrippable($can_edit)
->setHref('/T'.$task->getID())
->addAction(
id(new PHUIListItemView())
->setName(pht('Edit'))
->setIcon('edit')
->setHref('/maniphest/task/edit/'.$task->getID().'/')
->setWorkflow(true))
->setBarColor($bar_color);
}
}
diff --git a/src/applications/project/controller/PhabricatorProjectBoardEditController.php b/src/applications/project/controller/PhabricatorProjectBoardEditController.php
index 703f22654d..f9cea6169f 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardEditController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardEditController.php
@@ -1,109 +1,132 @@
<?php
final class PhabricatorProjectBoardEditController
extends PhabricatorProjectController {
private $id;
private $projectID;
public function willProcessRequest(array $data) {
$this->projectID = $data['projectID'];
$this->id = idx($data, 'id');
}
public function processRequest() {
$request = $this->getRequest();
$viewer = $request->getUser();
$project = id(new PhabricatorProjectQuery())
->setViewer($viewer)
->requireCapabilities(
array(
PhabricatorPolicyCapability::CAN_VIEW,
PhabricatorPolicyCapability::CAN_EDIT,
))
->withIDs(array($this->projectID))
->executeOne();
if (!$project) {
return new Aphront404Response();
}
$is_new = ($this->id ? false : true);
if (!$is_new) {
- // TODO: LATER!
- throw new Exception("When I'm ready!");
+ $column = id(new PhabricatorProjectColumnQuery())
+ ->setViewer($viewer)
+ ->withIDs(array($this->id))
+ ->requireCapabilities(
+ array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ PhabricatorPolicyCapability::CAN_EDIT,
+ ))
+ ->executeOne();
+ if (!$column) {
+ return new Aphront404Response();
+ }
} else {
$column = new PhabricatorProjectColumn();
}
$errors = array();
$e_name = true;
$error_view = null;
$view_uri = $this->getApplicationURI('/board/'.$this->projectID.'/');
if ($request->isFormPost()) {
$new_name = $request->getStr('name');
$column->setName($new_name);
if (!strlen($column->getName())) {
$errors[] = pht('Column name is required.');
$e_name = pht('Required');
} else {
$e_name = null;
}
- $column->setProjectPHID($project->getPHID());
- $column->attachProject($project);
- $column->setSequence(0);
+ if ($is_new) {
+ $column->setProjectPHID($project->getPHID());
+ $column->attachProject($project);
+
+ $columns = id(new PhabricatorProjectColumnQuery())
+ ->setViewer($viewer)
+ ->withProjectPHIDs(array($project->getPHID()))
+ ->execute();
+
+ $new_sequence = 1;
+ if ($columns) {
+ $values = mpull($columns, 'getSequence');
+ $new_sequence = max($values) + 1;
+ }
+ $column->setSequence($new_sequence);
+ }
if (!$errors) {
$column->save();
return id(new AphrontRedirectResponse())->setURI($view_uri);
}
}
$form = new AphrontFormView();
$form->setUser($request->getUser())
->appendChild(
id(new AphrontFormTextControl())
->setValue($column->getName())
->setLabel(pht('Name'))
->setName('name')
->setError($e_name)
->setCaption(
pht('This will be displayed as the header of the column.')));
if ($is_new) {
$title = pht('Create Column');
$submit = pht('Create Column');
} else {
$title = pht('Edit %s', $column->getName());
$submit = pht('Save Column');
}
$form->appendChild(
id(new AphrontFormSubmitControl())
->setValue($submit)
->addCancelButton($view_uri));
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb($title);
$form_box = id(new PHUIObjectBoxView())
->setHeaderText($title)
->setFormErrors($errors)
->setForm($form);
return $this->buildApplicationPage(
array(
$crumbs,
$form_box,
),
array(
'title' => $title,
'device' => true,
));
}
}
diff --git a/src/view/phui/PHUIWorkpanelView.php b/src/view/phui/PHUIWorkpanelView.php
index 037ede292a..d67a8eb1e5 100644
--- a/src/view/phui/PHUIWorkpanelView.php
+++ b/src/view/phui/PHUIWorkpanelView.php
@@ -1,80 +1,79 @@
<?php
final class PHUIWorkpanelView extends AphrontView {
private $cards = array();
private $header;
- private $headerAction;
+ private $editURI;
private $footerAction;
public function setCards(PHUIObjectItemListView $cards) {
$this->cards[] = $cards;
return $this;
}
public function setHeader($header) {
$this->header = $header;
return $this;
}
- public function setHeaderAction($header_action) {
- // TODO: This doesn't do anything?
- $this->headerAction = $header_action;
+ public function setEditURI($edit_uri) {
+ $this->editURI = $edit_uri;
return $this;
}
public function setFooterAction(PHUIListItemView $footer_action) {
$this->footerAction = $footer_action;
return $this;
}
public function render() {
require_celerity_resource('phui-workpanel-view-css');
$footer = '';
if ($this->footerAction) {
$footer_tag = $this->footerAction;
$footer = phutil_tag(
'ul',
array(
'class' => 'phui-workpanel-footer-action mst ps'
),
$footer_tag);
}
$header_edit = id(new PHUIIconView())
->setSpriteSheet(PHUIIconView::SPRITE_ACTIONS)
->setSpriteIcon('settings-grey')
- ->setHref('#');
+ ->setHref($this->editURI);
$header = id(new PhabricatorActionHeaderView())
->setHeaderTitle($this->header)
->setHeaderColor(PhabricatorActionHeaderView::HEADER_GREY)
->addAction($header_edit);
$body = phutil_tag(
'div',
array(
'class' => 'phui-workpanel-body'
),
$this->cards);
$view = phutil_tag(
'div',
array(
'class' => 'phui-workpanel-view-inner',
),
array(
$header,
$body,
$footer,
));
return phutil_tag(
'div',
array(
'class' => 'phui-workpanel-view'
),
$view);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jul 29, 5:37 AM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
188060
Default Alt Text
(11 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)