Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13198080
D20629.id49230.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
11 KB
Referenced Files
None
Subscribers
None
D20629.id49230.diff
View Options
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -4158,6 +4158,7 @@
'PhabricatorProjectArchiveController' => 'applications/project/controller/PhabricatorProjectArchiveController.php',
'PhabricatorProjectBoardBackgroundController' => 'applications/project/controller/PhabricatorProjectBoardBackgroundController.php',
'PhabricatorProjectBoardController' => 'applications/project/controller/PhabricatorProjectBoardController.php',
+ 'PhabricatorProjectBoardDefaultController' => 'applications/project/controller/PhabricatorProjectBoardDefaultController.php',
'PhabricatorProjectBoardDisableController' => 'applications/project/controller/PhabricatorProjectBoardDisableController.php',
'PhabricatorProjectBoardImportController' => 'applications/project/controller/PhabricatorProjectBoardImportController.php',
'PhabricatorProjectBoardManageController' => 'applications/project/controller/PhabricatorProjectBoardManageController.php',
@@ -4207,7 +4208,6 @@
'PhabricatorProjectCustomFieldStringIndex' => 'applications/project/storage/PhabricatorProjectCustomFieldStringIndex.php',
'PhabricatorProjectDAO' => 'applications/project/storage/PhabricatorProjectDAO.php',
'PhabricatorProjectDatasource' => 'applications/project/typeahead/PhabricatorProjectDatasource.php',
- 'PhabricatorProjectDefaultController' => 'applications/project/controller/PhabricatorProjectDefaultController.php',
'PhabricatorProjectDescriptionField' => 'applications/project/customfield/PhabricatorProjectDescriptionField.php',
'PhabricatorProjectDetailsProfileMenuItem' => 'applications/project/menuitem/PhabricatorProjectDetailsProfileMenuItem.php',
'PhabricatorProjectDropEffect' => 'applications/project/icon/PhabricatorProjectDropEffect.php',
@@ -10422,6 +10422,7 @@
'PhabricatorProjectArchiveController' => 'PhabricatorProjectController',
'PhabricatorProjectBoardBackgroundController' => 'PhabricatorProjectBoardController',
'PhabricatorProjectBoardController' => 'PhabricatorProjectController',
+ 'PhabricatorProjectBoardDefaultController' => 'PhabricatorProjectBoardController',
'PhabricatorProjectBoardDisableController' => 'PhabricatorProjectBoardController',
'PhabricatorProjectBoardImportController' => 'PhabricatorProjectBoardController',
'PhabricatorProjectBoardManageController' => 'PhabricatorProjectBoardController',
@@ -10484,7 +10485,6 @@
'PhabricatorProjectCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
'PhabricatorProjectDAO' => 'PhabricatorLiskDAO',
'PhabricatorProjectDatasource' => 'PhabricatorTypeaheadDatasource',
- 'PhabricatorProjectDefaultController' => 'PhabricatorProjectBoardController',
'PhabricatorProjectDescriptionField' => 'PhabricatorProjectStandardCustomField',
'PhabricatorProjectDetailsProfileMenuItem' => 'PhabricatorProfileMenuItem',
'PhabricatorProjectDropEffect' => 'Phobject',
diff --git a/src/applications/project/application/PhabricatorProjectApplication.php b/src/applications/project/application/PhabricatorProjectApplication.php
--- a/src/applications/project/application/PhabricatorProjectApplication.php
+++ b/src/applications/project/application/PhabricatorProjectApplication.php
@@ -90,6 +90,8 @@
=> 'PhabricatorProjectBoardManageController',
'background/'
=> 'PhabricatorProjectBoardBackgroundController',
+ 'default/(?P<target>[^/]+)/'
+ => 'PhabricatorProjectBoardDefaultController',
),
'column/' => array(
'remove/(?P<id>\d+)/' =>
@@ -112,8 +114,6 @@
=> 'PhabricatorProjectSilenceController',
'warning/(?P<id>[1-9]\d*)/'
=> 'PhabricatorProjectSubprojectWarningController',
- 'default/(?P<projectID>[1-9]\d*)/(?P<target>[^/]+)/'
- => 'PhabricatorProjectDefaultController',
),
'/tag/' => array(
'(?P<slug>[^/]+)/' => 'PhabricatorProjectViewController',
diff --git a/src/applications/project/controller/PhabricatorProjectBoardController.php b/src/applications/project/controller/PhabricatorProjectBoardController.php
--- a/src/applications/project/controller/PhabricatorProjectBoardController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardController.php
@@ -13,7 +13,7 @@
return $this->viewState;
}
- final private function newViewState() {
+ private function newViewState() {
$project = $this->getProject();
$request = $this->getRequest();
@@ -22,4 +22,15 @@
->readFromRequest($request);
}
+ final protected function newBoardDialog() {
+ $dialog = $this->newDialog();
+
+ $state = $this->getViewState();
+ foreach ($state->getQueryParameters() as $key => $value) {
+ $dialog->addHiddenInput($key, $value);
+ }
+
+ return $dialog;
+ }
+
}
diff --git a/src/applications/project/controller/PhabricatorProjectDefaultController.php b/src/applications/project/controller/PhabricatorProjectBoardDefaultController.php
rename from src/applications/project/controller/PhabricatorProjectDefaultController.php
rename to src/applications/project/controller/PhabricatorProjectBoardDefaultController.php
--- a/src/applications/project/controller/PhabricatorProjectDefaultController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardDefaultController.php
@@ -1,25 +1,20 @@
<?php
-final class PhabricatorProjectDefaultController
+final class PhabricatorProjectBoardDefaultController
extends PhabricatorProjectBoardController {
public function handleRequest(AphrontRequest $request) {
$viewer = $request->getViewer();
- $project_id = $request->getURIData('projectID');
-
- $project = id(new PhabricatorProjectQuery())
- ->setViewer($viewer)
- ->requireCapabilities(
- array(
- PhabricatorPolicyCapability::CAN_VIEW,
- PhabricatorPolicyCapability::CAN_EDIT,
- ))
- ->withIDs(array($project_id))
- ->executeOne();
- if (!$project) {
- return new Aphront404Response();
+
+ $response = $this->loadProjectForEdit();
+ if ($response) {
+ return $response;
}
- $this->setProject($project);
+
+ $project = $this->getProject();
+ $state = $this->getViewState();
+ $board_uri = $state->newWorkboardURI();
+ $remove_param = null;
$target = $request->getURIData('target');
switch ($target) {
@@ -31,8 +26,10 @@
'the board.');
$button = pht('Save Default Filter');
- $xaction_value = $request->getStr('filter');
+ $xaction_value = $state->getQueryKey();
$xaction_type = PhabricatorProjectFilterTransaction::TRANSACTIONTYPE;
+
+ $remove_param = 'filter';
break;
case 'sort':
$title = pht('Set Board Default Order');
@@ -42,8 +39,10 @@
'the board.');
$button = pht('Save Default Order');
- $xaction_value = $request->getStr('order');
+ $xaction_value = $state->getOrder();
$xaction_type = PhabricatorProjectSortTransaction::TRANSACTIONTYPE;
+
+ $remove_param = 'order';
break;
default:
return new Aphront404Response();
@@ -51,12 +50,6 @@
$id = $project->getID();
- $view_uri = $this->getApplicationURI("board/{$id}/");
- $view_uri = new PhutilURI($view_uri);
- foreach ($request->getPassthroughRequestData() as $key => $value) {
- $view_uri->replaceQueryParam($key, $value);
- }
-
if ($request->isFormPost()) {
$xactions = array();
@@ -71,20 +64,18 @@
->setContinueOnMissingFields(true)
->applyTransactions($project, $xactions);
- return id(new AphrontRedirectResponse())->setURI($view_uri);
+ // If the parameter we just modified is present in the query string,
+ // throw it away so the user is redirected back to the default view of
+ // the board, allowing them to see the new default behavior.
+ $board_uri->removeQueryParam($remove_param);
+
+ return id(new AphrontRedirectResponse())->setURI($board_uri);
}
- $dialog = $this->newDialog()
+ return $this->newBoardDialog()
->setTitle($title)
->appendChild($body)
- ->setDisableWorkflowOnCancel(true)
- ->addCancelButton($view_uri)
+ ->addCancelButton($board_uri)
->addSubmitButton($title);
-
- foreach ($request->getPassthroughRequestData() as $key => $value) {
- $dialog->addHiddenInput($key, $value);
- }
-
- return $dialog;
}
}
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -797,9 +797,7 @@
$id = $project->getID();
- $save_uri = "default/{$id}/sort/";
- $save_uri = $this->getApplicationURI($save_uri);
- $save_uri = $this->getURIWithState($save_uri, $force = true);
+ $save_uri = $state->newWorkboardURI('default/sort/');
$can_edit = PhabricatorPolicyFilter::hasCapability(
$viewer,
@@ -842,6 +840,8 @@
PhabricatorApplicationSearchEngine $engine,
$query_key) {
+ $state = $this->getViewState();
+
$named = array(
'open' => pht('Open Tasks'),
'all' => pht('All Tasks'),
@@ -898,9 +898,7 @@
->setWorkflow(true)
->setName(pht('Advanced Filter...'));
- $save_uri = "default/{$id}/filter/";
- $save_uri = $this->getApplicationURI($save_uri);
- $save_uri = $this->getURIWithState($save_uri, $force = true);
+ $save_uri = $state->newWorkboardURI('default/filter/');
$can_edit = PhabricatorPolicyFilter::hasCapability(
$viewer,
diff --git a/src/applications/project/controller/PhabricatorProjectController.php b/src/applications/project/controller/PhabricatorProjectController.php
--- a/src/applications/project/controller/PhabricatorProjectController.php
+++ b/src/applications/project/controller/PhabricatorProjectController.php
@@ -16,6 +16,21 @@
}
protected function loadProject() {
+ return $this->loadProjectWithCapabilities(
+ array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ ));
+ }
+
+ protected function loadProjectForEdit() {
+ return $this->loadProjectWithCapabilities(
+ array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ PhabricatorPolicyCapability::CAN_EDIT,
+ ));
+ }
+
+ private function loadProjectWithCapabilities(array $capabilities) {
$viewer = $this->getViewer();
$request = $this->getRequest();
@@ -35,6 +50,7 @@
$query = id(new PhabricatorProjectQuery())
->setViewer($viewer)
+ ->requireCapabilities($capabilities)
->needMembers(true)
->needWatchers(true)
->needImages(true)
diff --git a/src/applications/project/state/PhabricatorWorkboardViewState.php b/src/applications/project/state/PhabricatorWorkboardViewState.php
--- a/src/applications/project/state/PhabricatorWorkboardViewState.php
+++ b/src/applications/project/state/PhabricatorWorkboardViewState.php
@@ -147,4 +147,8 @@
return 'open';
}
+ public function getQueryParameters() {
+ return $this->requestState;
+ }
+
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, May 14, 3:27 AM (3 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277705
Default Alt Text
D20629.id49230.diff (11 KB)
Attached To
Mode
D20629: Give the workboard "default" workflows more modern state handling
Attached
Detach File
Event Timeline
Log In to Comment