No OneTemporary
Actions

Size

33 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/resources/sql/autopatches/20140808.boardprop.1.sql b/resources/sql/autopatches/20140808.boardprop.1.sql
	new file mode 100644
	index 0000000000..9325c148a4
	--- /dev/null
	+++ b/resources/sql/autopatches/20140808.boardprop.1.sql
	@@ -0,0 +1,2 @@
	+ALTER TABLE {$NAMESPACE}_project.project_column
	+ ADD properties LONGTEXT NOT NULL COLLATE utf8_bin;
	diff --git a/resources/sql/autopatches/20140808.boardprop.2.sql b/resources/sql/autopatches/20140808.boardprop.2.sql
	new file mode 100644
	index 0000000000..d7716898dd
	--- /dev/null
	+++ b/resources/sql/autopatches/20140808.boardprop.2.sql
	@@ -0,0 +1,2 @@
	+UPDATE {$NAMESPACE}_project.project_column
	+ SET properties = '{}' WHERE properties = '';
	diff --git a/resources/sql/autopatches/20140808.boardprop.3.php b/resources/sql/autopatches/20140808.boardprop.3.php
	new file mode 100644
	index 0000000000..116cc773a3
	--- /dev/null
	+++ b/resources/sql/autopatches/20140808.boardprop.3.php
	@@ -0,0 +1,24 @@
	+<?php
	+
	+$table = new PhabricatorProjectColumn();
	+$conn_w = $table->establishConnection('w');
	+
	+foreach (new LiskMigrationIterator($table) as $column) {
	+ $id = $column->getID();
	+
	+ echo "Adjusting column {$id}...\n";
	+ if ($column->getSequence() == 0) {
	+
	+ $properties = $column->getProperties();
	+ $properties['isDefault'] = true;
	+
	+ queryfx(
	+ $conn_w,
	+ 'UPDATE %T SET properties = %s WHERE id = %d',
	+ $table->getTableName(),
	+ json_encode($properties),
	+ $id);
	+ }
	+}
	+
	+echo "Done.\n";
	diff --git a/src/applications/project/controller/PhabricatorProjectBoardImportController.php b/src/applications/project/controller/PhabricatorProjectBoardImportController.php
	index 75823b3308..4861582a20 100644
	--- a/src/applications/project/controller/PhabricatorProjectBoardImportController.php
	+++ b/src/applications/project/controller/PhabricatorProjectBoardImportController.php
	@@ -1,85 +1,86 @@
	<?php

	final class PhabricatorProjectBoardImportController
	extends PhabricatorProjectBoardController {

	private $projectID;

	public function willProcessRequest(array $data) {
	$this->projectID = $data['projectID'];
	}

	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();
	}
	$this->setProject($project);

	$columns = id(new PhabricatorProjectColumnQuery())
	->setViewer($viewer)
	->withProjectPHIDs(array($project->getPHID()))
	->execute();
	if ($columns) {
	return new Aphront400Response();
	}

	$project_id = $project->getID();
	$board_uri = $this->getApplicationURI("board/{$project_id}/");

	if ($request->isFormPost()) {
	$import_phid = $request->getArr('importProjectPHID');
	$import_phid = reset($import_phid);

	$import_columns = id(new PhabricatorProjectColumnQuery())
	->setViewer($viewer)
	->withProjectPHIDs(array($import_phid))
	->execute();
	if (!$import_columns) {
	return new Aphront400Response();
	}

	$table = id(new PhabricatorProjectColumn())
	->openTransaction();
	foreach ($import_columns as $import_column) {
	if ($import_column->isHidden()) {
	continue;
	}
	$new_column = PhabricatorProjectColumn::initializeNewColumn($viewer)
	->setSequence($import_column->getSequence())
	->setProjectPHID($project->getPHID())
	->setName($import_column->getName())
	+ ->setProperties($import_column->getProperties())
	->save();
	}
	$table->saveTransaction();

	return id(new AphrontRedirectResponse())->setURI($board_uri);
	}

	$proj_selector = id(new AphrontFormTokenizerControl())
	->setName('importProjectPHID')
	->setUser($viewer)
	->setDatasource(id(new PhabricatorProjectDatasource())
	->setParameters(array('mustHaveColumns' => true))
	->setLimit(1));
	return $this->newDialog()
	->setTitle(pht('Import Columns'))
	->setWidth(AphrontDialogView::WIDTH_FORM)
	->appendParagraph(pht('Choose a project to import columns from:'))
	->appendChild($proj_selector)
	->addCancelButton($board_uri)
	->addSubmitButton(pht('Import'));
	}

	}
	diff --git a/src/applications/project/controller/PhabricatorProjectBoardReorderController.php b/src/applications/project/controller/PhabricatorProjectBoardReorderController.php
	index 0660f8428a..864b28911f 100644
	--- a/src/applications/project/controller/PhabricatorProjectBoardReorderController.php
	+++ b/src/applications/project/controller/PhabricatorProjectBoardReorderController.php
	@@ -1,157 +1,142 @@
	<?php

	final class PhabricatorProjectBoardReorderController
	extends PhabricatorProjectBoardController {

	private $projectID;

	public function willProcessRequest(array $data) {
	$this->projectID = $data['projectID'];
	}

	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();
	}

	$this->setProject($project);


	$project_id = $project->getID();

	$board_uri = $this->getApplicationURI("board/{$project_id}/");
	$reorder_uri = $this->getApplicationURI("board/{$project_id}/reorder/");

	if ($request->isFormPost()) {
	// User clicked "Done", make sure the page reloads to show the new
	// column order.
	return id(new AphrontRedirectResponse())->setURI($board_uri);
	}

	$columns = id(new PhabricatorProjectColumnQuery())
	->setViewer($viewer)
	->withProjectPHIDs(array($project->getPHID()))
	->execute();
	$columns = msort($columns, 'getSequence');

	$column_phid = $request->getStr('columnPHID');
	if ($column_phid && $request->validateCSRF()) {

	$columns = mpull($columns, null, 'getPHID');
	if (empty($columns[$column_phid])) {
	return new Aphront404Response();
	}

	- // TODO: We could let you move the backlog column around if you really
	- // want, but for now we use sequence position 0 as magic.
	$target_column = $columns[$column_phid];
	$new_sequence = $request->getInt('sequence');
	- if ($target_column->isDefaultColumn() \|\| $new_sequence < 1) {
	+ if ($new_sequence < 0) {
	return new Aphront404Response();
	}

	// TODO: For now, we're not recording any transactions here. We probably
	// should, but this sort of edit is extremely trivial.

	// Resequence the columns so that the moved column has the correct
	// sequence number. Move columns after it up one place in the sequence.
	$new_map = array();
	foreach ($columns as $phid => $column) {
	$value = $column->getSequence();
	if ($column->getPHID() == $column_phid) {
	$value = $new_sequence;
	} else if ($column->getSequence() >= $new_sequence) {
	$value = $value + 1;
	}
	$new_map[$phid] = $value;
	}

	// Sort the columns into their new ordering.
	asort($new_map);

	// Now, compact the ordering and adjust any columns that need changes.
	$project->openTransaction();
	$sequence = 0;
	foreach ($new_map as $phid => $ignored) {
	$new_value = $sequence++;
	$cur_value = $columns[$phid]->getSequence();
	if ($new_value != $cur_value) {
	$columns[$phid]->setSequence($new_value)->save();
	}
	}
	$project->saveTransaction();

	return id(new AphrontAjaxResponse())->setContent(
	array(
	'sequenceMap' => mpull($columns, 'getSequence', 'getPHID'),
	));
	}

	$list_id = celerity_generate_unique_node_id();

	- $static_list = id(new PHUIObjectItemListView())
	- ->setUser($viewer)
	- ->setFlush(true)
	- ->setStackable(true);
	-
	$list = id(new PHUIObjectItemListView())
	->setUser($viewer)
	->setID($list_id)
	->setFlush(true)
	->setStackable(true);

	foreach ($columns as $column) {
	$item = id(new PHUIObjectItemView())
	->setHeader($column->getDisplayName());

	if ($column->isHidden()) {
	$item->setDisabled(true);
	}

	- if ($column->isDefaultColumn()) {
	- $item->setDisabled(true);
	- $static_list->addItem($item);
	- } else {
	- $item->setGrippable(true);
	- $item->addSigil('board-column');
	- $item->setMetadata(
	- array(
	- 'columnPHID' => $column->getPHID(),
	- 'columnSequence' => $column->getSequence(),
	- ));
	-
	- $list->addItem($item);
	- }
	+ $item->setGrippable(true);
	+ $item->addSigil('board-column');
	+ $item->setMetadata(
	+ array(
	+ 'columnPHID' => $column->getPHID(),
	+ 'columnSequence' => $column->getSequence(),
	+ ));

	+ $list->addItem($item);
	}

	Javelin::initBehavior(
	'reorder-columns',
	array(
	'listID' => $list_id,
	'reorderURI' => $reorder_uri,
	));

	return $this->newDialog()
	->setTitle(pht('Reorder Columns'))
	->setWidth(AphrontDialogView::WIDTH_FORM)
	- ->appendParagraph(pht('This column can not be moved:'))
	- ->appendChild($static_list)
	- ->appendParagraph(pht('Drag and drop these columns to reorder them:'))
	+ ->appendParagraph(pht('Drag and drop columns to reorder them.'))
	->appendChild($list)
	->addSubmitButton(pht('Done'));
	}

	}
	diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	index c670ef56cf..118593f39c 100644
	--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	@@ -1,618 +1,619 @@
	<?php

	final class PhabricatorProjectBoardViewController
	extends PhabricatorProjectBoardController {

	private $id;
	private $slug;
	private $handles;
	private $queryKey;
	private $filter;
	private $sortKey;
	private $showHidden;

	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$this->id = idx($data, 'id');
	$this->slug = idx($data, 'slug');
	$this->queryKey = idx($data, 'queryKey');
	$this->filter = (bool)idx($data, 'filter');
	}

	public function processRequest() {
	$request = $this->getRequest();
	$viewer = $request->getUser();

	$show_hidden = $request->getBool('hidden');
	$this->showHidden = $show_hidden;

	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	->needImages(true);
	if ($this->slug) {
	$project->withSlugs(array($this->slug));
	} else {
	$project->withIDs(array($this->id));
	}
	$project = $project->executeOne();
	if (!$project) {
	return new Aphront404Response();
	}

	$this->setProject($project);
	$this->id = $project->getID();

	$sort_key = $request->getStr('order');
	switch ($sort_key) {
	case PhabricatorProjectColumn::ORDER_NATURAL:
	case PhabricatorProjectColumn::ORDER_PRIORITY:
	break;
	default:
	$sort_key = PhabricatorProjectColumn::DEFAULT_ORDER;
	break;
	}
	$this->sortKey = $sort_key;

	$column_query = id(new PhabricatorProjectColumnQuery())
	->setViewer($viewer)
	->withProjectPHIDs(array($project->getPHID()));

	if (!$show_hidden) {
	$column_query->withStatuses(
	array(PhabricatorProjectColumn::STATUS_ACTIVE));
	}

	$columns = $column_query->execute();
	$columns = mpull($columns, null, 'getSequence');

	if (empty($columns[0])) {
	switch ($request->getStr('initialize-type')) {
	case 'backlog-only':
	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$column = PhabricatorProjectColumn::initializeNewColumn($viewer)
	->setSequence(0)
	+ ->setProperty('isDefault', true)
	->setProjectPHID($project->getPHID())
	->save();
	$column->attachProject($project);
	$columns[0] = $column;
	unset($unguarded);
	break;
	case 'import':
	return id(new AphrontRedirectResponse())
	->setURI(
	$this->getApplicationURI('board/'.$project->getID().'/import/'));
	break;
	default:
	return $this->initializeWorkboardDialog($project);
	break;
	}
	}

	ksort($columns);

	$board_uri = $this->getApplicationURI('board/'.$project->getID().'/');

	$engine = id(new ManiphestTaskSearchEngine())
	->setViewer($viewer)
	->setBaseURI($board_uri)
	->setIsBoardView(true);

	if ($request->isFormPost()) {
	$saved = $engine->buildSavedQueryFromRequest($request);
	$engine->saveQuery($saved);
	return id(new AphrontRedirectResponse())->setURI(
	$this->getURIWithState(
	$engine->getQueryResultsPageURI($saved->getQueryKey())));
	}

	$query_key = $this->queryKey;
	if (!$query_key) {
	$query_key = 'open';
	}
	$this->queryKey = $query_key;

	$custom_query = null;
	if ($engine->isBuiltinQuery($query_key)) {
	$saved = $engine->buildSavedQueryFromBuiltin($query_key);
	} else {
	$saved = id(new PhabricatorSavedQueryQuery())
	->setViewer($viewer)
	->withQueryKeys(array($query_key))
	->executeOne();

	if (!$saved) {
	return new Aphront404Response();
	}

	$custom_query = $saved;
	}

	if ($this->filter) {
	$filter_form = id(new AphrontFormView())
	->setUser($viewer);
	$engine->buildSearchForm($filter_form, $saved);

	return $this->newDialog()
	->setWidth(AphrontDialogView::WIDTH_FULL)
	->setTitle(pht('Advanced Filter'))
	->appendChild($filter_form->buildLayoutView())
	->setSubmitURI($board_uri)
	->addSubmitButton(pht('Apply Filter'))
	->addCancelButton($board_uri);
	}

	$task_query = $engine->buildQueryFromSavedQuery($saved);

	$tasks = $task_query
	->addWithAllProjects(array($project->getPHID()))
	->setOrderBy(ManiphestTaskQuery::ORDER_PRIORITY)
	->setViewer($viewer)
	->execute();
	$tasks = mpull($tasks, null, 'getPHID');

	if ($tasks) {
	$positions = id(new PhabricatorProjectColumnPositionQuery())
	->setViewer($viewer)
	->withObjectPHIDs(mpull($tasks, 'getPHID'))
	->withColumns($columns)
	->execute();
	$positions = mpull($positions, null, 'getObjectPHID');
	} else {
	$positions = array();
	}

	$task_map = array();
	$default_phid = $columns[0]->getPHID();
	foreach ($tasks as $task) {
	$task_phid = $task->getPHID();

	$column_phid = null;
	if (isset($positions[$task_phid])) {
	$column_phid = $positions[$task_phid]->getColumnPHID();
	}
	$column_phid = nonempty($column_phid, $default_phid);

	$task_map[$column_phid][] = $task_phid;
	}

	// If we're showing the board in "natural" order, sort columns by their
	// column positions.
	if ($this->sortKey == PhabricatorProjectColumn::ORDER_NATURAL) {
	foreach ($task_map as $column_phid => $task_phids) {
	$order = array();
	foreach ($task_phids as $task_phid) {
	if (isset($positions[$task_phid])) {
	$order[$task_phid] = $positions[$task_phid]->getOrderingKey();
	} else {
	$order[$task_phid] = 0;
	}
	}
	asort($order);
	$task_map[$column_phid] = array_keys($order);
	}
	}

	$task_can_edit_map = id(new PhabricatorPolicyFilter())
	->setViewer($viewer)
	->requireCapabilities(array(PhabricatorPolicyCapability::CAN_EDIT))
	->apply($tasks);

	$board_id = celerity_generate_unique_node_id();

	$board = id(new PHUIWorkboardView())
	->setUser($viewer)
	->setID($board_id);

	$this->initBehavior(
	'project-boards',
	array(
	'boardID' => $board_id,
	'projectPHID' => $project->getPHID(),
	'moveURI' => $this->getApplicationURI('move/'.$project->getID().'/'),
	'createURI' => '/maniphest/task/create/',
	'order' => $this->sortKey,
	));

	$this->handles = ManiphestTaskListView::loadTaskHandles($viewer, $tasks);

	foreach ($columns as $column) {
	$panel = id(new PHUIWorkpanelView())
	->setHeader($column->getDisplayName())
	->setHeaderColor($column->getHeaderColor());

	$column_menu = $this->buildColumnMenu($project, $column);
	$panel->addHeaderAction($column_menu);

	$cards = id(new PHUIObjectItemListView())
	->setUser($viewer)
	->setFlush(true)
	->setAllowEmptyList(true)
	->addSigil('project-column')
	->setMetadata(
	array(
	'columnPHID' => $column->getPHID(),
	));

	$task_phids = idx($task_map, $column->getPHID(), array());
	foreach (array_select_keys($tasks, $task_phids) as $task) {
	$owner = null;
	if ($task->getOwnerPHID()) {
	$owner = $this->handles[$task->getOwnerPHID()];
	}
	$can_edit = idx($task_can_edit_map, $task->getPHID(), false);
	$cards->addItem(id(new ProjectBoardTaskCard())
	->setViewer($viewer)
	->setTask($task)
	->setOwner($owner)
	->setCanEdit($can_edit)
	->getItem());
	}
	$panel->setCards($cards);

	if (!$task_phids) {
	$cards->addClass('project-column-empty');
	}

	$board->addPanel($panel);
	}

	Javelin::initBehavior(
	'boards-dropdown',
	array());

	$sort_menu = $this->buildSortMenu(
	$viewer,
	$sort_key);

	$filter_menu = $this->buildFilterMenu(
	$viewer,
	$custom_query,
	$engine,
	$query_key);

	$manage_menu = $this->buildManageMenu($project, $show_hidden);

	$header_link = phutil_tag(
	'a',
	array(
	'href' => $this->getApplicationURI('view/'.$project->getID().'/')
	),
	$project->getName());

	$header = id(new PHUIHeaderView())
	->setHeader($header_link)
	->setUser($viewer)
	->setNoBackground(true)
	->setImage($project->getProfileImageURI())
	->setImageURL($this->getApplicationURI('view/'.$project->getID().'/'))
	->addActionLink($sort_menu)
	->addActionLink($filter_menu)
	->addActionLink($manage_menu)
	->setPolicyObject($project);

	$board_box = id(new PHUIBoxView())
	->appendChild($board)
	->addClass('project-board-wrapper');

	return $this->buildApplicationPage(
	array(
	$header,
	$board_box,
	),
	array(
	'title' => pht('%s Board', $project->getName()),
	));
	}

	private function buildSortMenu(
	PhabricatorUser $viewer,
	$sort_key) {

	$sort_icon = id(new PHUIIconView())
	->setIconFont('fa-sort-amount-asc bluegrey');

	$named = array(
	PhabricatorProjectColumn::ORDER_NATURAL => pht('Natural'),
	PhabricatorProjectColumn::ORDER_PRIORITY => pht('Sort by Priority'),
	);

	$base_uri = $this->getURIWithState();

	$items = array();
	foreach ($named as $key => $name) {
	$is_selected = ($key == $sort_key);
	if ($is_selected) {
	$active_order = $name;
	}

	$item = id(new PhabricatorActionView())
	->setIcon('fa-sort-amount-asc')
	->setSelected($is_selected)
	->setName($name);

	$uri = $base_uri->alter('order', $key);
	$item->setHref($uri);

	$items[] = $item;
	}

	$sort_menu = id(new PhabricatorActionListView())
	->setUser($viewer);
	foreach ($items as $item) {
	$sort_menu->addAction($item);
	}

	$sort_button = id(new PHUIButtonView())
	->setText(pht('Sort: %s', $active_order))
	->setIcon($sort_icon)
	->setTag('a')
	->setHref('#')
	->addSigil('boards-dropdown-menu')
	->setMetadata(
	array(
	'items' => hsprintf('%s', $sort_menu),
	));

	return $sort_button;
	}
	private function buildFilterMenu(
	PhabricatorUser $viewer,
	$custom_query,
	PhabricatorApplicationSearchEngine $engine,
	$query_key) {

	$filter_icon = id(new PHUIIconView())
	->setIconFont('fa-search-plus bluegrey');

	$named = array(
	'open' => pht('Open Tasks'),
	'all' => pht('All Tasks'),
	);

	if ($viewer->isLoggedIn()) {
	$named['assigned'] = pht('Assigned to Me');
	}

	if ($custom_query) {
	$named[$custom_query->getQueryKey()] = pht('Custom Filter');
	}

	$items = array();
	foreach ($named as $key => $name) {
	$is_selected = ($key == $query_key);
	if ($is_selected) {
	$active_filter = $name;
	}

	$is_custom = false;
	if ($custom_query) {
	$is_custom = ($key == $custom_query->getQueryKey());
	}

	$item = id(new PhabricatorActionView())
	->setIcon('fa-search')
	->setSelected($is_selected)
	->setName($name);

	if ($is_custom) {
	$uri = $this->getApplicationURI(
	'board/'.$this->id.'/filter/query/'.$key.'/');
	$item->setWorkflow(true);
	} else {
	$uri = $engine->getQueryResultsPageURI($key);
	}

	$uri = $this->getURIWithState($uri);
	$item->setHref($uri);

	$items[] = $item;
	}

	$items[] = id(new PhabricatorActionView())
	->setIcon('fa-cog')
	->setHref($this->getApplicationURI('board/'.$this->id.'/filter/'))
	->setWorkflow(true)
	->setName(pht('Advanced Filter...'));

	$filter_menu = id(new PhabricatorActionListView())
	->setUser($viewer);
	foreach ($items as $item) {
	$filter_menu->addAction($item);
	}

	$filter_button = id(new PHUIButtonView())
	->setText(pht('Filter: %s', $active_filter))
	->setIcon($filter_icon)
	->setTag('a')
	->setHref('#')
	->addSigil('boards-dropdown-menu')
	->setMetadata(
	array(
	'items' => hsprintf('%s', $filter_menu),
	));

	return $filter_button;
	}

	private function buildManageMenu(
	PhabricatorProject $project,
	$show_hidden) {

	$request = $this->getRequest();
	$viewer = $request->getUser();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$project,
	PhabricatorPolicyCapability::CAN_EDIT);

	$manage_icon = id(new PHUIIconView())
	->setIconFont('fa-cog bluegrey');

	$manage_items = array();

	$manage_items[] = id(new PhabricatorActionView())
	->setIcon('fa-plus')
	->setName(pht('Add Column'))
	->setHref($this->getApplicationURI('board/'.$this->id.'/edit/'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit);

	$manage_items[] = id(new PhabricatorActionView())
	->setIcon('fa-exchange')
	->setName(pht('Reorder Columns'))
	->setHref($this->getApplicationURI('board/'.$this->id.'/reorder/'))
	->setDisabled(!$can_edit)
	->setWorkflow(true);

	if ($show_hidden) {
	$hidden_uri = $this->getURIWithState()
	->setQueryParam('hidden', null);
	$hidden_icon = 'fa-eye-slash';
	$hidden_text = pht('Hide Hidden Columns');
	} else {
	$hidden_uri = $this->getURIWithState()
	->setQueryParam('hidden', 'true');
	$hidden_icon = 'fa-eye';
	$hidden_text = pht('Show Hidden Columns');
	}

	$manage_items[] = id(new PhabricatorActionView())
	->setIcon($hidden_icon)
	->setName($hidden_text)
	->setHref($hidden_uri);

	$manage_menu = id(new PhabricatorActionListView())
	->setUser($viewer);
	foreach ($manage_items as $item) {
	$manage_menu->addAction($item);
	}

	$manage_button = id(new PHUIButtonView())
	->setText(pht('Manage Board'))
	->setIcon($manage_icon)
	->setTag('a')
	->setHref('#')
	->addSigil('boards-dropdown-menu')
	->setMetadata(
	array(
	'items' => hsprintf('%s', $manage_menu),
	));

	return $manage_button;
	}

	private function buildColumnMenu(
	PhabricatorProject $project,
	PhabricatorProjectColumn $column) {

	$request = $this->getRequest();
	$viewer = $request->getUser();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$viewer,
	$project,
	PhabricatorPolicyCapability::CAN_EDIT);

	$column_items = array();

	$column_items[] = id(new PhabricatorActionView())
	->setIcon('fa-plus')
	->setName(pht('Create Task...'))
	->setHref('/maniphest/task/create/')
	->addSigil('column-add-task')
	->setMetadata(
	array(
	'columnPHID' => $column->getPHID(),
	))
	->setDisabled(!$can_edit);

	$edit_uri = $this->getApplicationURI(
	'board/'.$this->id.'/column/'.$column->getID().'/');

	$column_items[] = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setName(pht('Edit Column'))
	->setHref($edit_uri)
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit);

	$column_menu = id(new PhabricatorActionListView())
	->setUser($viewer);
	foreach ($column_items as $item) {
	$column_menu->addAction($item);
	}

	$column_button = id(new PHUIIconView())
	->setIconFont('fa-caret-down')
	->setHref('#')
	->addSigil('boards-dropdown-menu')
	->setMetadata(
	array(
	'items' => hsprintf('%s', $column_menu),
	));

	return $column_button;
	}

	private function initializeWorkboardDialog(PhabricatorProject $project) {

	$instructions = pht('This workboard has not been setup yet.');
	$new_selector = id(new AphrontFormRadioButtonControl())
	->setName('initialize-type')
	->setValue('backlog-only')
	->addButton(
	'backlog-only',
	pht('New Empty Board'),
	pht('Create a new board with just a backlog column.'))
	->addButton(
	'import',
	pht('Import Columns'),
	pht('Import board columns from another project.'));

	$dialog = id(new AphrontDialogView())
	->setUser($this->getRequest()->getUser())
	->setTitle(pht('New Workboard'))
	->addSubmitButton('Continue')
	->addCancelButton($this->getApplicationURI('view/'.$project->getID().'/'))
	->appendParagraph($instructions)
	->appendChild($new_selector);

	return id(new AphrontDialogResponse())
	->setDialog($dialog);
	}


	/**
	* Add current state parameters (like order and the visibility of hidden
	* columns) to a URI.
	*
	* This allows actions which toggle or adjust one piece of state to keep
	* the rest of the board state persistent. If no URI is provided, this method
	* starts with the request URI.
	*
	* @param string\|null URI to add state parameters to.
	* @return PhutilURI URI with state parameters.
	*/
	private function getURIWithState($base = null) {
	if ($base === null) {
	$base = $this->getRequest()->getRequestURI();
	}

	$base = new PhutilURI($base);

	if ($this->sortKey != PhabricatorProjectColumn::DEFAULT_ORDER) {
	$base->setQueryParam('order', $this->sortKey);
	} else {
	$base->setQueryParam('order', null);
	}

	$base->setQueryParam('hidden', $this->showHidden ? 'true' : null);

	return $base;
	}

	}
	diff --git a/src/applications/project/storage/PhabricatorProjectColumn.php b/src/applications/project/storage/PhabricatorProjectColumn.php
	index f602b7b217..eec88dbcbc 100644
	--- a/src/applications/project/storage/PhabricatorProjectColumn.php
	+++ b/src/applications/project/storage/PhabricatorProjectColumn.php
	@@ -1,117 +1,131 @@
	<?php

	final class PhabricatorProjectColumn
	extends PhabricatorProjectDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorDestructibleInterface {

	const STATUS_ACTIVE = 0;
	const STATUS_HIDDEN = 1;

	const DEFAULT_ORDER = 'natural';
	const ORDER_NATURAL = 'natural';
	const ORDER_PRIORITY = 'priority';

	protected $name;
	protected $status;
	protected $projectPHID;
	protected $sequence;
	+ protected $properties = array();

	private $project = self::ATTACHABLE;

	public static function initializeNewColumn(PhabricatorUser $user) {
	return id(new PhabricatorProjectColumn())
	->setName('')
	->setStatus(self::STATUS_ACTIVE);
	}

	public function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	+ self::CONFIG_SERIALIZATION => array(
	+ 'properties' => self::SERIALIZATION_JSON,
	+ ),
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorProjectColumnPHIDType::TYPECONST);
	}

	public function attachProject(PhabricatorProject $project) {
	$this->project = $project;
	return $this;
	}

	public function getProject() {
	return $this->assertAttached($this->project);
	}

	public function isDefaultColumn() {
	- return ($this->getSequence() == 0);
	+ return (bool)$this->getProperty('isDefault');
	}

	public function isHidden() {
	return ($this->getStatus() == self::STATUS_HIDDEN);
	}

	public function getDisplayName() {
	$name = $this->getName();
	if (strlen($name)) {
	return $name;
	}

	if ($this->isDefaultColumn()) {
	return pht('Backlog');
	}

	return pht('Unnamed Column');
	}

	public function getHeaderColor() {
	if ($this->isHidden()) {
	return PHUIActionHeaderView::HEADER_LIGHTRED;
	}

	if ($this->isDefaultColumn()) {
	return PHUIActionHeaderView::HEADER_DARK_GREY;
	}
	+
	return PHUIActionHeaderView::HEADER_GREY;
	}

	+ public function getProperty($key, $default = null) {
	+ return idx($this->properties, $key, $default);
	+ }
	+
	+ public function setProperty($key, $value) {
	+ $this->properties[$key] = $value;
	+ return $this;
	+ }
	+

	/* -( PhabricatorPolicyInterface )----------------------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	return $this->getProject()->getPolicy($capability);
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return $this->getProject()->hasAutomaticCapability(
	$capability,
	$viewer);
	}

	public function describeAutomaticCapability($capability) {
	return pht('Users must be able to see a project to see its board.');
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */

	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$this->delete();
	$this->saveTransaction();
	}

	}
	diff --git a/webroot/rsrc/js/application/projects/behavior-reorder-columns.js b/webroot/rsrc/js/application/projects/behavior-reorder-columns.js
	index 8b0a2c33fa..0125f4d0e3 100644
	--- a/webroot/rsrc/js/application/projects/behavior-reorder-columns.js
	+++ b/webroot/rsrc/js/application/projects/behavior-reorder-columns.js
	@@ -1,58 +1,58 @@
	/**
	* @provides javelin-behavior-reorder-columns
	* @requires javelin-behavior
	* javelin-stratcom
	* javelin-workflow
	* javelin-dom
	* phabricator-draggable-list
	*/

	JX.behavior('reorder-columns', function(config) {

	var root = JX.$(config.listID);

	var list = new JX.DraggableList('board-column', root)
	.setFindItemsHandler(function() {
	return JX.DOM.scry(root, 'li', 'board-column');
	});

	list.listen('didDrop', function(node) {
	var nodes = list.findItems();

	var node_data = JX.Stratcom.getData(node);

	// Find the column sequence of the previous node.
	var sequence = null;
	var data;
	for (var ii = 0; ii < nodes.length; ii++) {
	data = JX.Stratcom.getData(nodes[ii]);
	if (data.columnPHID === node_data.columnPHID) {
	break;
	}
	sequence = data.columnSequence;
	}

	list.lock();
	JX.DOM.alterClass(node, 'drag-sending', true);

	var parameters = {
	columnPHID: node_data.columnPHID,
	- sequence: (sequence === null) ? 1 : (parseInt(sequence, 10) + 1)
	+ sequence: (sequence === null) ? 0 : (parseInt(sequence, 10) + 1)
	};

	new JX.Workflow(config.reorderURI, parameters)
	.setHandler(function(r) {

	// Adjust metadata for the new sequence numbers.
	for (var ii = 0; ii < nodes.length; ii++) {
	var data = JX.Stratcom.getData(nodes[ii]);
	data.columnSequence = r.sequenceMap[data.columnPHID];
	}

	list.unlock();
	JX.DOM.alterClass(node, 'drag-sending', false);
	})
	.start();
	});

	});

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 14:31 (3 w, 2 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1125529
Default Alt Text: (33 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions