Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/185626
Change subject: changes Sprint application URI
......................................................................
changes Sprint application URI
Sprint is actually a sub-application of Project, so it is
logical to change its URI from /sprint/ to /project/sprint/
All navigation routes have been updated to new URI
This organizes the routes to Project controllers and
should prevent any accidental collisions with Project default routes
Change-Id: I02a864acbf4065805db3db70c1e50a91a134bea7
---
M src/application/SprintApplication.php
M src/controller/SprintController.php
M src/controller/SprintDataViewController.php
M src/controller/SprintListController.php
M src/events/BurndownActionMenuEventListener.php
M src/events/SprintUIEventListener.php
M src/util/SprintPoints.php
M src/view/ProjectsTableView.php
M src/view/SprintBoardTaskCard.php
9 files changed, 49 insertions(+), 55 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/26/185626/1
diff --git a/src/application/SprintApplication.php
b/src/application/SprintApplication.php
index 0ba9b5e..47c0711 100644
--- a/src/application/SprintApplication.php
+++ b/src/application/SprintApplication.php
@@ -12,7 +12,7 @@
public function getBaseURI()
{
- return '/sprint/';
+ return '/project/sprint/';
}
public function getIconName() {
@@ -38,36 +38,9 @@
public function getRoutes() {
return array(
- '/sprint/' => array(
- 'edit/(?P<id>[1-9]\d*)/' =>
'PhabricatorProjectEditMainController',
- '' => 'SprintListController',
- 'report/' => 'SprintListController',
- 'report/list/' => 'SprintListController',
- 'report/(?:(?P<view>\w+)/)?' => 'SprintReportController',
- 'view/(?P<id>\d+)/' => 'SprintDataViewController',
- 'details/(?P<id>[1-9]\d*)/'
- => 'PhabricatorProjectEditDetailsController',
+ '/project/sprint/' => array(
'archive/(?P<id>[1-9]\d*)/'
=> 'PhabricatorProjectArchiveController',
- 'members/(?P<id>[1-9]\d*)/'
- => 'PhabricatorProjectMembersEditController',
- 'members/(?P<id>[1-9]\d*)/remove/'
- => 'PhabricatorProjectMembersRemoveController',
- 'move/(?P<id>[1-9]\d*)/' => 'SprintBoardMoveController',
- 'picture/(?P<id>[1-9]\d*)/'
- => 'PhabricatorProjectEditPictureController',
- 'profile/(?P<id>[1-9]\d*)/'
- => 'SprintProjectProfileController',
- 'icon/(?P<id>[1-9]\d*)/'
- => 'PhabricatorProjectEditIconController',
- 'board/task/edit/(?P<id>[1-9]\d*)/'
- => 'SprintBoardTaskEditController',
- 'board/task/create/'
- => 'SprintBoardTaskEditController',
- 'board/(?P<id>[1-9]\d*)/' .
- '(?P<filter>filter/)?' .
- '(?:query/(?P<queryKey>[^/]+)/)?'
- => 'SprintBoardViewController',
'board/(?P<projectID>[1-9]\d*)/' => array(
'edit/(?:(?P<id>\d+)/)?'
=> 'SprintBoardColumnEditController',
@@ -80,18 +53,44 @@
'reorder/'
=> 'SprintBoardReorderController',
),
- ),
- '/tag/' => array(
- '(?P<slug>[^/]+)/sboard/' => 'SprintBoardViewController',
- ),
-
- '/project/' => array(
- 'sboard/(?P<id>[1-9]\d*)/'.
+ 'board/task/edit/(?P<id>[1-9]\d*)/'
+ => 'SprintBoardTaskEditController',
+ 'board/task/create/'
+ => 'SprintBoardTaskEditController',
+ 'board/(?P<id>[1-9]\d*)/'.
'(?P<filter>filter/)?'.
'(?:query/(?P<queryKey>[^/]+)/)?'
=> 'SprintBoardViewController',
'burn/(?P<id>\d+)/' => 'SprintDataViewController',
- ),
+ 'details/(?P<id>[1-9]\d*)/'
+ => 'PhabricatorProjectEditDetailsController',
+ 'edit/(?P<id>[1-9]\d*)/' =>
'PhabricatorProjectEditMainController',
+ '' => 'SprintListController',
+ 'feed/(?P<id>[1-9]\d*)/'
+ => 'PhabricatorProjectFeedController',
+ 'icon/(?P<id>[1-9]\d*)/'
+ => 'PhabricatorProjectEditIconController',
+ 'members/(?P<id>[1-9]\d*)/'
+ => 'PhabricatorProjectMembersEditController',
+ 'members/(?P<id>[1-9]\d*)/remove/'
+ => 'PhabricatorProjectMembersRemoveController',
+ 'move/(?P<id>[1-9]\d*)/' => 'SprintBoardMoveController',
+ 'picture/(?P<id>[1-9]\d*)/'
+ => 'PhabricatorProjectEditPictureController',
+ 'profile/(?P<id>[1-9]\d*)/'
+ => 'SprintProjectProfileController',
+ 'report/' => 'SprintListController',
+ 'report/list/' => 'SprintListController',
+ 'report/(?:(?P<view>\w+)/)?' => 'SprintReportController',
+ 'sboard/(?P<id>[1-9]\d*)/'.
+ '(?P<filter>filter/)?'.
+ '(?:query/(?P<queryKey>[^/]+)/)?'
+ => 'SprintBoardViewController',
+ 'view/(?P<id>\d+)/' => 'SprintDataViewController',
+ ),
+ '/tag/' => array(
+ '(?P<slug>[^/]+)/sboard/' => 'SprintBoardViewController',
+ ),
);
}
diff --git a/src/controller/SprintController.php
b/src/controller/SprintController.php
index f1d20cf..7c79deb 100644
--- a/src/controller/SprintController.php
+++ b/src/controller/SprintController.php
@@ -28,7 +28,7 @@
public function buildNavMenu() {
$nav = id(new AphrontSideNavFilterView())
- ->setBaseURI(new PhutilURI('/sprint/report/'))
+ ->setBaseURI(new PhutilURI($this->getApplicationURI().'report/'))
->addLabel(pht('Sprint Projects'))
->addFilter('list', pht('List'))
->addLabel(pht('Open Tasks'))
@@ -83,7 +83,7 @@
return $crumbs;
}
protected function buildSprintApplicationCrumbs($can_create) {
- $crumbs = $this->buildCrumbs('slowvote', '/sprint/');
+ $crumbs = $this->buildCrumbs('slowvote', $this->getApplicationURI());
$crumbs->addAction(
id(new PHUIListItemView())
@@ -137,7 +137,7 @@
$nav = new AphrontSideNavFilterView();
$nav->setIconNav(true);
- $nav->setBaseURI(new PhutilURI($this->getProjectApplicationURI()));
+ $nav->setBaseURI(new PhutilURI($this->getApplicationURI()));
$nav->addIcon("profile/{$id}/", $name, null, $picture);
$nav->addIcon("burn/{$id}/", pht('Burndown'), 'fa-fire');
$nav->addIcon("sboard/{$id}/", pht('Sprint Board'), $board_icon);
@@ -147,9 +147,4 @@
return $nav;
}
-
- public function getProjectApplicationURI() {
- return '/project/';
- }
-
}
diff --git a/src/controller/SprintDataViewController.php
b/src/controller/SprintDataViewController.php
index c47560d..a3e0829 100644
--- a/src/controller/SprintDataViewController.php
+++ b/src/controller/SprintDataViewController.php
@@ -61,12 +61,12 @@
$crumbs = $this->buildSprintApplicationCrumbs($can_create);
$crumbs->addTextCrumb(
$project->getName(),
- '/sprint/profile/'.$pid);
+ $this->getApplicationURI().'profile/'.$pid);
$crumbs->addTextCrumb(pht('Burndown'));
$crumbs->addAction(
id(new PHUIListItemView())
->setName(pht('Sprint Board'))
- ->setHref('/sprint/board/'.$pid)
+ ->setHref($this->getApplicationURI().'board/'.$pid)
->setIcon('fa-columns'));
return $crumbs;
}
diff --git a/src/controller/SprintListController.php
b/src/controller/SprintListController.php
index b5b386f..56671ee 100644
--- a/src/controller/SprintListController.php
+++ b/src/controller/SprintListController.php
@@ -28,7 +28,7 @@
$can_create = $this->hasApplicationCapability(
ProjectCreateProjectsCapability::CAPABILITY);
$crumbs = $this->buildSprintApplicationCrumbs($can_create);
- $crumbs->addTextCrumb(pht('Burndown List'));
+ $crumbs->addTextCrumb(pht('Sprint Burndown List'));
$help = id(new PHUIBoxView())
diff --git a/src/events/BurndownActionMenuEventListener.php
b/src/events/BurndownActionMenuEventListener.php
index 42dcbda..9dafd37 100644
--- a/src/events/BurndownActionMenuEventListener.php
+++ b/src/events/BurndownActionMenuEventListener.php
@@ -38,8 +38,8 @@
$project = $event->getValue('object');
$projectid = $project->getId();
- $view_uri = '/sprint/view/'.$projectid;
- $board_uri = '/sprint/board/'.$projectid;
+ $view_uri = '/project/sprint/view/'.$projectid;
+ $board_uri = '/project/sprint/board/'.$projectid;
$burndown = id(new PhabricatorActionView())
->setIcon('fa-bar-chart-o')
diff --git a/src/events/SprintUIEventListener.php
b/src/events/SprintUIEventListener.php
index 11c421b..e796b0a 100644
--- a/src/events/SprintUIEventListener.php
+++ b/src/events/SprintUIEventListener.php
@@ -78,7 +78,7 @@
foreach ($handles as $handle) {
$project_phid = $handle->getPHID();
- $uri = $handle->getURI() . 'sboard/';
+ $uri = $handle->getURI().'sboard/';
$handle->setURI($uri);
$position = idx($positions, $project_phid);
if ($position) {
diff --git a/src/util/SprintPoints.php b/src/util/SprintPoints.php
index 2bb457a..2f9e5c4 100644
--- a/src/util/SprintPoints.php
+++ b/src/util/SprintPoints.php
@@ -83,4 +83,3 @@
return $this->task_closed_status_sum;
}
}
-
diff --git a/src/view/ProjectsTableView.php b/src/view/ProjectsTableView.php
index 69d532a..f8a9084 100644
--- a/src/view/ProjectsTableView.php
+++ b/src/view/ProjectsTableView.php
@@ -59,7 +59,7 @@
$row[] = phutil_tag(
'a',
array(
- 'href' => '/sprint/view/'.$project->getId(),
+ 'href' => '/project/sprint/view/'.$project->getId(),
'style' => 'font-weight:bold',
),
$project->getName());
@@ -120,4 +120,5 @@
return $projects_table;
}
-}
\ No newline at end of file
+}
+
diff --git a/src/view/SprintBoardTaskCard.php b/src/view/SprintBoardTaskCard.php
index af6e1b8..f62ee78 100644
--- a/src/view/SprintBoardTaskCard.php
+++ b/src/view/SprintBoardTaskCard.php
@@ -134,7 +134,7 @@
->setName(pht('Edit'))
->setIcon('fa-pencil')
->addSigil('edit-project-card')
- ->setHref('/sprint/board/task/edit/'.$task->getID().'/'))
+
->setHref('/project/sprint/board/task/edit/'.$task->getID().'/'))
->setBarColor($bar_color);
$card->addAttribute($this->getPointList());
--
To view, visit https://gerrit.wikimedia.org/r/185626
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02a864acbf4065805db3db70c1e50a91a134bea7
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
