Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: updates to upstream 5 Oct
4d5278af1148f211d52244e3fb61712ed24b9d1f
......................................................................
updates to upstream 5 Oct 4d5278af1148f211d52244e3fb61712ed24b9d1f
Bug:T110443
Change-Id: Iaa98d82fb9eb1c7577f95eea3361b2ef68a8100f
---
M src/controller/board/SprintBoardColumnDetailController.php
M src/controller/board/SprintBoardColumnEditController.php
M src/controller/board/SprintBoardColumnHideController.php
M src/controller/board/SprintBoardMoveController.php
M src/controller/board/SprintBoardReorderController.php
M src/controller/board/SprintBoardViewController.php
M src/view/SprintUIObjectBoxView.php
7 files changed, 162 insertions(+), 170 deletions(-)
Approvals:
jenkins-bot: Verified
diff --git a/src/controller/board/SprintBoardColumnDetailController.php
b/src/controller/board/SprintBoardColumnDetailController.php
index 5b06486..b0e28a8 100644
--- a/src/controller/board/SprintBoardColumnDetailController.php
+++ b/src/controller/board/SprintBoardColumnDetailController.php
@@ -40,7 +40,7 @@
new PhabricatorProjectColumnTransactionQuery());
$timeline->setShouldTerminate(true);
- $title = pht('%s', $column->getDisplayName());
+ $title = $column->getDisplayName();
$header = $this->buildHeaderView($column);
$actions = $this->buildActionView($column);
@@ -112,15 +112,6 @@
->setUser($viewer)
->setObject($column)
->setActionList($actions);
-
- $descriptions = PhabricatorPolicyQuery::renderPolicyDescriptions(
- $viewer,
- $column);
-
- $properties->addProperty(
- pht('Editable By'),
- $descriptions[PhabricatorPolicyCapability::CAN_EDIT]);
-
$limit = $column->getPointLimit();
$properties->addProperty(
diff --git a/src/controller/board/SprintBoardColumnEditController.php
b/src/controller/board/SprintBoardColumnEditController.php
index 9233f7a..afd2ea5 100644
--- a/src/controller/board/SprintBoardColumnEditController.php
+++ b/src/controller/board/SprintBoardColumnEditController.php
@@ -15,7 +15,7 @@
PhabricatorPolicyCapability::CAN_VIEW,
PhabricatorPolicyCapability::CAN_EDIT,
))
- ->withIDs(array($project_id ))
+ ->withIDs(array($project_id))
->needImages(true)
->executeOne();
@@ -148,7 +148,7 @@
$nav->appendChild($form_box);
return $this->buildApplicationPage(
- $nav,
+ $nav,
array(
'title' => $title,
));
diff --git a/src/controller/board/SprintBoardColumnHideController.php
b/src/controller/board/SprintBoardColumnHideController.php
index 6966ef5..cc3f6f5 100644
--- a/src/controller/board/SprintBoardColumnHideController.php
+++ b/src/controller/board/SprintBoardColumnHideController.php
@@ -61,9 +61,9 @@
$type_status = PhabricatorProjectColumnTransaction::TYPE_STATUS;
$xactions = array(
- id(new PhabricatorProjectColumnTransaction())
- ->setTransactionType($type_status)
- ->setNewValue($new_status),
+ id(new PhabricatorProjectColumnTransaction())
+ ->setTransactionType($type_status)
+ ->setNewValue($new_status),
);
$editor = id(new PhabricatorProjectColumnTransactionEditor())
diff --git a/src/controller/board/SprintBoardMoveController.php
b/src/controller/board/SprintBoardMoveController.php
index 411876f..45cd4cf 100644
--- a/src/controller/board/SprintBoardMoveController.php
+++ b/src/controller/board/SprintBoardMoveController.php
@@ -95,22 +95,22 @@
if ($task_phids && ($order == PhabricatorProjectColumn::ORDER_PRIORITY)) {
$tasks = id(new ManiphestTaskQuery())
- ->setViewer($viewer)
- ->withPHIDs($task_phids)
- ->requireCapabilities(
- array(
- PhabricatorPolicyCapability::CAN_VIEW,
- PhabricatorPolicyCapability::CAN_EDIT,
- ))
- ->execute();
+ ->setViewer($viewer)
+ ->withPHIDs($task_phids)
+ ->requireCapabilities(
+ array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ PhabricatorPolicyCapability::CAN_EDIT,
+ ))
+ ->execute();
if (count($tasks) != count($task_phids)) {
return new Aphront404Response();
}
$tasks = mpull($tasks, null, 'getPHID');
$try = array(
- array($after_phid, true),
- array($before_phid, false),
+ array($after_phid, true),
+ array($before_phid, false),
);
$pri = null;
@@ -120,21 +120,21 @@
$task = idx($tasks, $task_phid);
if ($task) {
list($pri, $sub) =
ManiphestTransactionEditor::getAdjacentSubpriority(
- $task,
- $is_after);
+ $task,
+ $is_after);
break;
}
}
if ($pri !== null) {
$xactions[] = id(new ManiphestTransaction())
- ->setTransactionType(ManiphestTransaction::TYPE_PRIORITY)
- ->setNewValue($pri);
+ ->setTransactionType(ManiphestTransaction::TYPE_PRIORITY)
+ ->setNewValue($pri);
$xactions[] = id(new ManiphestTransaction())
- ->setTransactionType(ManiphestTransaction::TYPE_SUBPRIORITY)
- ->setNewValue($sub);
+ ->setTransactionType(ManiphestTransaction::TYPE_SUBPRIORITY)
+ ->setNewValue($sub);
}
- }
+ }
$editor = id(new ManiphestTransactionEditor())
->setActor($viewer)
diff --git a/src/controller/board/SprintBoardReorderController.php
b/src/controller/board/SprintBoardReorderController.php
index 7c1dbc5..0090b8c 100644
--- a/src/controller/board/SprintBoardReorderController.php
+++ b/src/controller/board/SprintBoardReorderController.php
@@ -124,8 +124,8 @@
));
$note = id(new PHUIInfoView())
- ->appendChild(pht('Drag and drop columns to reorder them.'))
- ->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
+ ->appendChild(pht('Drag and drop columns to reorder them.'))
+ ->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
return $this->newDialog()
->setTitle(pht('Reorder Columns'))
diff --git a/src/controller/board/SprintBoardViewController.php
b/src/controller/board/SprintBoardViewController.php
index 23ea90c..d2d2058 100755
--- a/src/controller/board/SprintBoardViewController.php
+++ b/src/controller/board/SprintBoardViewController.php
@@ -105,17 +105,17 @@
$saved = $engine->buildSavedQueryFromRequest($request);
$engine->saveQuery($saved);
$filter_form = id(new AphrontFormView())
- ->setUser($viewer);
+ ->setUser($viewer);
$engine->buildSearchForm($filter_form, $saved);
if ($engine->getErrors()) {
return $this->newDialog()
- ->setWidth(AphrontDialogView::WIDTH_FULL)
- ->setTitle(pht('Advanced Filter'))
- ->appendChild($filter_form->buildLayoutView())
- ->setErrors($engine->getErrors())
- ->setSubmitURI($board_uri)
- ->addSubmitButton(pht('Apply Filter'))
- ->addCancelButton($board_uri);
+ ->setWidth(AphrontDialogView::WIDTH_FULL)
+ ->setTitle(pht('Advanced Filter'))
+ ->appendChild($filter_form->buildLayoutView())
+ ->setErrors($engine->getErrors())
+ ->setSubmitURI($board_uri)
+ ->addSubmitButton(pht('Apply Filter'))
+ ->addCancelButton($board_uri);
}
return id(new AphrontRedirectResponse())->setURI(
$this->getURIWithState(
@@ -165,10 +165,10 @@
$task_query = $engine->buildQueryFromSavedQuery($saved);
$tasks = $task_query
- ->withEdgeLogicPHIDs(
- PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
- PhabricatorQueryConstraint::OPERATOR_AND,
- array($project->getPHID()))
+ ->withEdgeLogicPHIDs(
+ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
+ PhabricatorQueryConstraint::OPERATOR_AND,
+ array($project->getPHID()))
->setOrder(ManiphestTaskQuery::ORDER_PRIORITY)
->setViewer($viewer)
->execute();
@@ -247,12 +247,12 @@
if (!$batch_tasks) {
$cancel_uri = $this->getURIWithState($board_uri);
return $this->newDialog()
- ->setTitle(pht('No Editable Tasks'))
- ->appendParagraph(
- pht(
- 'The selected column contains no visible tasks which you '.
- 'have permission to edit.'))
- ->addCancelButton($board_uri);
+ ->setTitle(pht('No Editable Tasks'))
+ ->appendParagraph(
+ pht(
+ 'The selected column contains no visible tasks which you '.
+ 'have permission to edit.'))
+ ->addCancelButton($board_uri);
}
$batch_ids = mpull($batch_tasks, 'getID');
@@ -335,18 +335,18 @@
$panel->setHeaderTag($count_tag);
- $cards = id(new PHUIObjectItemListView())
- ->setUser($viewer)
- ->setFlush(true)
- ->setAllowEmptyList(true)
- ->addSigil('project-column')
- ->setMetadata(
- array(
- 'columnPHID' => $column->getPHID(),
- 'countTagID' => $tag_id,
- 'countTagContentID' => $tag_content_id,
- 'pointLimit' => $column->getPointLimit(),
- ));
+ $cards = id(new PHUIObjectItemListView())
+ ->setUser($viewer)
+ ->setFlush(true)
+ ->setAllowEmptyList(true)
+ ->addSigil('project-column')
+ ->setMetadata(
+ array(
+ 'columnPHID' => $column->getPHID(),
+ 'countTagID' => $tag_id,
+ 'countTagContentID' => $tag_content_id,
+ 'pointLimit' => $column->getPointLimit(),
+ ));
foreach ($column_tasks as $task) {
$owner = null;
@@ -404,8 +404,8 @@
->setPolicyObject($project);
$header_box = id(new PHUIBoxView())
- ->appendChild($header)
- ->addClass('project-board-header');
+ ->appendChild($header)
+ ->addClass('project-board-header');
$board_box = id(new PHUIBoxView())
->appendChild($board)
@@ -416,7 +416,7 @@
$nav->appendChild($board_box);
return $this->buildApplicationPage(
- $nav,
+ $nav,
array(
'title' => pht('%s Board', $project->getName()),
'showFooter' => false,
@@ -605,15 +605,15 @@
$batch_edit_uri = $request->getRequestURI();
$batch_edit_uri->setQueryParam('batch', self::BATCH_EDIT_ALL);
$can_batch_edit = PhabricatorPolicyFilter::hasCapability(
- $viewer,
- PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
- ManiphestBulkEditCapability::CAPABILITY);
+ $viewer,
+ PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
+ ManiphestBulkEditCapability::CAPABILITY);
$manage_items[] = id(new PhabricatorActionView())
- ->setIcon('fa-list-ul')
- ->setName(pht('Batch Edit Visible Tasks...'))
- ->setHref($batch_edit_uri)
- ->setDisabled(!$can_batch_edit);
+ ->setIcon('fa-list-ul')
+ ->setName(pht('Batch Edit Visible Tasks...'))
+ ->setHref($batch_edit_uri)
+ ->setDisabled(!$can_batch_edit);
$manage_menu = id(new PhabricatorActionListView())
->setUser($viewer);
@@ -663,15 +663,15 @@
$batch_edit_uri = $request->getRequestURI();
$batch_edit_uri->setQueryParam('batch', $column->getID());
$can_batch_edit = PhabricatorPolicyFilter::hasCapability(
- $viewer,
- PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
- ManiphestBulkEditCapability::CAPABILITY);
+ $viewer,
+ PhabricatorApplication::getByClass('PhabricatorManiphestApplication'),
+ ManiphestBulkEditCapability::CAPABILITY);
$column_items[] = id(new PhabricatorActionView())
- ->setIcon('fa-list-ul')
- ->setName(pht('Batch Edit Tasks...'))
- ->setHref($batch_edit_uri)
- ->setDisabled(!$can_batch_edit);
+ ->setIcon('fa-list-ul')
+ ->setName(pht('Batch Edit Tasks...'))
+ ->setHref($batch_edit_uri)
+ ->setDisabled(!$can_batch_edit);
$edit_uri = $this->getApplicationURI(
'board/'.$this->id.'/column/'.$column->getID().'/');
diff --git a/src/view/SprintUIObjectBoxView.php
b/src/view/SprintUIObjectBoxView.php
index 1e98cfc..309fca1 100644
--- a/src/view/SprintUIObjectBoxView.php
+++ b/src/view/SprintUIObjectBoxView.php
@@ -45,8 +45,8 @@
}
public function addPropertyList(
- PHUIPropertyListView $property_list,
- $tab = null) {
+ PHUIPropertyListView $property_list,
+ $tab = null) {
if (!($tab instanceof PHUIListItemView) &&
($tab !== null)) {
@@ -69,9 +69,9 @@
if (empty($this->tabs[$key])) {
$tab->addSigil('phui-object-box-tab');
$tab->setMetadata(
- array(
- 'tabKey' => $key,
- ));
+ array(
+ 'tabKey' => $key,
+ ));
if (!$tab->getHref()) {
$tab->setHref('#');
@@ -109,8 +109,8 @@
public function setFormErrors(array $errors, $title = null) {
if ($errors) {
$this->formErrors = id(new PHUIInfoView())
- ->setTitle($title)
- ->setErrors($errors);
+ ->setTitle($title)
+ ->setErrors($errors);
}
return $this;
}
@@ -121,8 +121,8 @@
}
if ($saved) {
$save = id(new PHUIInfoView())
- ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
- ->appendChild($text);
+ ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
+ ->appendChild($text);
$this->formSaved = $save;
}
return $this;
@@ -184,19 +184,19 @@
}
public function setValidationException(
- PhabricatorApplicationTransactionValidationException $ex = null) {
+ PhabricatorApplicationTransactionValidationException $ex = null) {
$this->validationException = $ex;
return $this;
}
public function render() {
-
require_celerity_resource('phui-object-box-css', 'sprint');
$header = $this->header;
+
if ($this->headerText) {
$header = id(new PHUIHeaderView())
- ->setHeader($this->headerText);
+ ->setHeader($this->headerText);
}
$showhide = null;
@@ -204,6 +204,7 @@
if (!$header) {
$header = id(new PHUIHeaderView());
}
+
Javelin::initBehavior('phabricator-reveal-content');
$hide_action_id = celerity_generate_unique_node_id();
@@ -213,43 +214,43 @@
$hide_style = ($this->showHideOpen ? 'display: none;': null);
$show_style = ($this->showHideOpen ? null : 'display: none;');
$hide_action = id(new PHUIButtonView())
- ->setTag('a')
- ->addSigil('reveal-content')
- ->setID($hide_action_id)
- ->setStyle($hide_style)
- ->setHref($this->showHideHref)
- ->setMetaData(
- array(
- 'hideIDs' => array($hide_action_id),
- 'showIDs' => array($content_id, $show_action_id),
- ))
- ->setText($this->showAction);
+ ->setTag('a')
+ ->addSigil('reveal-content')
+ ->setID($hide_action_id)
+ ->setStyle($hide_style)
+ ->setHref($this->showHideHref)
+ ->setMetaData(
+ array(
+ 'hideIDs' => array($hide_action_id),
+ 'showIDs' => array($content_id, $show_action_id),
+ ))
+ ->setText($this->showAction);
$show_action = id(new PHUIButtonView())
- ->setTag('a')
- ->addSigil('reveal-content')
- ->setStyle($show_style)
- ->setHref('#')
- ->setID($show_action_id)
- ->setMetaData(
- array(
- 'hideIDs' => array($content_id, $show_action_id),
- 'showIDs' => array($hide_action_id),
- ))
- ->setText($this->hideAction);
+ ->setTag('a')
+ ->addSigil('reveal-content')
+ ->setStyle($show_style)
+ ->setHref('#')
+ ->setID($show_action_id)
+ ->setMetaData(
+ array(
+ 'hideIDs' => array($content_id, $show_action_id),
+ 'showIDs' => array($hide_action_id),
+ ))
+ ->setText($this->hideAction);
$header->addActionLink($hide_action);
$header->addActionLink($show_action);
$showhide = array(
- phutil_tag(
- 'div',
- array(
- 'class' => 'phui-object-box-hidden-content',
- 'id' => $content_id,
- 'style' => $show_style,
- ),
- $this->showHideContent),
+ phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phui-object-box-hidden-content',
+ 'id' => $content_id,
+ 'style' => $show_style,
+ ),
+ $this->showHideContent),
);
}
@@ -257,22 +258,22 @@
if ($this->actionListID) {
$icon_id = celerity_generate_unique_node_id();
$icon = id(new PHUIIconView())
- ->setIconFont('fa-bars');
+ ->setIconFont('fa-bars');
$meta = array(
- 'map' => array(
- $this->actionListID => 'phabricator-action-list-toggle',
- $icon_id => 'phuix-dropdown-open',
- ),
+ 'map' => array(
+ $this->actionListID => 'phabricator-action-list-toggle',
+ $icon_id => 'phuix-dropdown-open',
+ ),
);
$mobile_menu = id(new PHUIButtonView())
- ->setTag('a')
- ->setText(pht('Actions'))
- ->setHref('#')
- ->setIcon($icon)
- ->addClass('phui-mobile-menu')
- ->setID($icon_id)
- ->addSigil('jx-toggle-class')
- ->setMetadata($meta);
+ ->setTag('a')
+ ->setText(pht('Actions'))
+ ->setHref('#')
+ ->setIcon($icon)
+ ->addClass('phui-mobile-menu')
+ ->setID($icon_id)
+ ->addSigil('jx-toggle-class')
+ ->setMetadata($meta);
$header->addActionLink($mobile_menu);
}
@@ -285,7 +286,7 @@
}
if ($messages) {
$exception_errors = id(new PHUIInfoView())
- ->setErrors($messages);
+ ->setErrors($messages);
}
}
@@ -332,12 +333,12 @@
}
$tab_lists[] = phutil_tag(
- 'div',
- array(
- 'style' => $style,
- 'id' => $tab_id,
- ),
- $group);
+ 'div',
+ array(
+ 'style' => $style,
+ 'id' => $tab_id,
+ ),
+ $group);
} else {
if ($this->tabs) {
$group->addClass('phui-property-group-noninitial');
@@ -349,7 +350,7 @@
$tabs = null;
if ($this->tabs) {
$tabs = id(new PHUIListView())
- ->setType(PHUIListView::NAVBAR_LIST);
+ ->setType(PHUIListView::NAVBAR_LIST);
foreach ($this->tabs as $tab) {
$tabs->addMenuItem($tab);
}
@@ -358,29 +359,29 @@
}
$content = id(new PHUIBoxView())
- ->appendChild(
- array(
- ($this->showHideOpen == false ? $this->anchor : null),
- $header,
- $this->infoView,
- $this->formErrors,
- $this->formSaved,
- $exception_errors,
- $this->form,
- $tabs,
- $tab_lists,
- $showhide,
- ($this->showHideOpen == true ? $this->anchor : null),
- $property_lists,
- $this->table,
- $this->renderChildren(),
- ))
- ->setBorder(true)
- ->setID($this->id)
- ->addMargin(PHUI::MARGIN_LARGE_TOP)
- ->addMargin(PHUI::MARGIN_LARGE_LEFT)
- ->addMargin(PHUI::MARGIN_LARGE_RIGHT)
- ->addClass('sprintui-object-box');
+ ->appendChild(
+ array(
+ ($this->showHideOpen == false ? $this->anchor : null),
+ $header,
+ $this->infoView,
+ $this->formErrors,
+ $this->formSaved,
+ $exception_errors,
+ $this->form,
+ $tabs,
+ $tab_lists,
+ $showhide,
+ ($this->showHideOpen == true ? $this->anchor : null),
+ $property_lists,
+ $this->table,
+ $this->renderChildren(),
+ ))
+ ->setBorder(true)
+ ->setID($this->id)
+ ->addMargin(PHUI::MARGIN_LARGE_TOP)
+ ->addMargin(PHUI::MARGIN_LARGE_LEFT)
+ ->addMargin(PHUI::MARGIN_LARGE_RIGHT)
+ ->addClass('sprintui-object-box');
if ($this->color) {
$content->addClass('phui-object-box-'.$this->color);
@@ -393,9 +394,9 @@
if ($this->tabs) {
$content->addSigil('phui-object-box');
$content->setMetadata(
- array(
- 'tabMap' => $tab_map,
- ));
+ array(
+ 'tabMap' => $tab_map,
+ ));
}
if ($this->flush) {
--
To view, visit https://gerrit.wikimedia.org/r/243914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa98d82fb9eb1c7577f95eea3361b2ef68a8100f
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
