[MediaWiki-commits] [Gerrit] fixes several upstream breaking changes current with 10ed330... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/261185
Change subject: fixes several upstream breaking changes current with
10ed33052361be82cbc09884118d65ec0601bd55 27.12.2015 Bug: T122486
..
fixes several upstream breaking changes
current with 10ed33052361be82cbc09884118d65ec0601bd55 27.12.2015
Bug: T122486
Change-Id: I418d643a0949599ad507071fb14ffb3ff89bf102
---
M src/__phutil_library_map__.php
M src/application/SprintApplication.php
M src/controller/SprintController.php
A src/controller/SprintProjectController.php
M src/controller/SprintProjectProfileController.php
M src/controller/board/SprintBoardTaskEditController.php
A src/controller/board/SprintManiphestEditEngine.php
7 files changed, 654 insertions(+), 813 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/85/261185/1
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 84de703..3fa5040 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -61,7 +61,9 @@
'SprintListController' => 'controller/SprintListController.php',
'SprintListDataProvider' => 'storage/SprintListDataProvider.php',
'SprintListTableView' => 'view/SprintListTableView.php',
+'SprintManiphestEditEngine' =>
'controller/board/SprintManiphestEditEngine.php',
'SprintPoints' => 'util/SprintPoints.php',
+'SprintProjectController' => 'controller/SprintProjectController.php',
'SprintProjectCustomField' => 'customfield/SprintProjectCustomField.php',
'SprintProjectProfileController' =>
'controller/SprintProjectProfileController.php',
'SprintProjectViewController' =>
'controller/SprintProjectViewController.php',
@@ -131,12 +133,14 @@
'SprintIsSprintField' => 'SprintProjectCustomField',
'SprintListController' => 'SprintController',
'SprintListTableView' => 'Phobject',
+'SprintManiphestEditEngine' => 'PhabricatorEditEngine',
'SprintPoints' => 'Phobject',
+'SprintProjectController' => 'SprintController',
'SprintProjectCustomField' => array(
'PhabricatorProjectCustomField',
'PhabricatorStandardCustomFieldInterface',
),
-'SprintProjectProfileController' => 'SprintController',
+'SprintProjectProfileController' => 'SprintProjectController',
'SprintProjectViewController' => 'SprintController',
'SprintQuery' => 'SprintDAO',
'SprintQueryTest' => 'SprintTestCase',
diff --git a/src/application/SprintApplication.php
b/src/application/SprintApplication.php
index 336bb86..6d7a58b 100644
--- a/src/application/SprintApplication.php
+++ b/src/application/SprintApplication.php
@@ -72,8 +72,8 @@
// all routes following point to default controllers
'archive/(?P[1-9]\d*)/'
=> 'PhabricatorProjectArchiveController',
- 'details/(?P[1-9]\d*)/'
- => 'PhabricatorProjectEditDetailsController',
+ $this->getEditRoutePattern('edit/')
+ => 'PhabricatorProjectEditController',
'feed/(?P[1-9]\d*)/'
=> 'PhabricatorProjectFeedController',
'icon/(?P[1-9]\d*)/'
diff --git a/src/controller/SprintController.php
b/src/controller/SprintController.php
index 143fc2f..e202a3f 100644
--- a/src/controller/SprintController.php
+++ b/src/controller/SprintController.php
@@ -24,7 +24,7 @@
}
public function buildApplicationMenu() {
- return $this->buildSideNavView($this->getUser(),
+ return $this->buildSprintNavView($this->getUser(),
$this->setApplicationURI(), true)->getMenu();
}
@@ -45,7 +45,7 @@
/**
* @param PhutilURI $uri
*/
- public function buildSideNavView($viewer, $uri, $for_app = false) {
+ public function buildSprintNavView($viewer, $uri, $for_app = false) {
$request = $this->getRequest();
$id = $request->getURIData('id');
$slug = $request->getURIData('slug');
diff --git a/src/controller/SprintProjectController.php
b/src/controller/SprintProjectController.php
new file mode 100644
index 000..a3f628f
--- /dev/null
+++ b/src/controller/SprintProjectController.php
@@ -0,0 +1,181 @@
+project = $project;
+return $this;
+ }
+
+ protected function getProject() {
+return $this->project;
+ }
+
+ protected function loadProject() {
+$viewer = $this->getViewer();
+$request = $this->getRequest();
+
+$id = $request->getURIData('id');
+$slug = $request->getURIData('slug');
+
+if ($slug) {
+ $normal_slug = PhabricatorSlug::normalizeProjectSlug($slug);
+ $is_abnormal = ($slug !== $normal_slug);
+ $normal_uri = "/tag/{$normal_slug}/";
+} else {
+ $is_abnormal = false;
+}
+
+$query = id(new PhabricatorProjectQuery())
+->setViewer($viewer)
+->needMembers(true)
+->needWatchers(true)
+->needImages(true)
+
[MediaWiki-commits] [Gerrit] fixes several upstream breaking changes current with 10ed330... - change (phabricator...Sprint)
Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: fixes several upstream breaking changes current with
10ed33052361be82cbc09884118d65ec0601bd55 27.12.2015 See upstream task_T9905
..
fixes several upstream breaking changes
current with 10ed33052361be82cbc09884118d65ec0601bd55 27.12.2015
See upstream task_T9905
Bug: T122486
Change-Id: I418d643a0949599ad507071fb14ffb3ff89bf102
---
M src/__phutil_library_map__.php
M src/application/SprintApplication.php
M src/conduit/SprintConduitAPIMethod.php
M src/controller/SprintController.php
A src/controller/SprintProjectController.php
M src/controller/SprintProjectProfileController.php
M src/controller/board/SprintBoardTaskEditController.php
A src/controller/board/SprintManiphestEditEngine.php
8 files changed, 594 insertions(+), 819 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 84de703..3fa5040 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -61,7 +61,9 @@
'SprintListController' => 'controller/SprintListController.php',
'SprintListDataProvider' => 'storage/SprintListDataProvider.php',
'SprintListTableView' => 'view/SprintListTableView.php',
+'SprintManiphestEditEngine' =>
'controller/board/SprintManiphestEditEngine.php',
'SprintPoints' => 'util/SprintPoints.php',
+'SprintProjectController' => 'controller/SprintProjectController.php',
'SprintProjectCustomField' => 'customfield/SprintProjectCustomField.php',
'SprintProjectProfileController' =>
'controller/SprintProjectProfileController.php',
'SprintProjectViewController' =>
'controller/SprintProjectViewController.php',
@@ -131,12 +133,14 @@
'SprintIsSprintField' => 'SprintProjectCustomField',
'SprintListController' => 'SprintController',
'SprintListTableView' => 'Phobject',
+'SprintManiphestEditEngine' => 'PhabricatorEditEngine',
'SprintPoints' => 'Phobject',
+'SprintProjectController' => 'SprintController',
'SprintProjectCustomField' => array(
'PhabricatorProjectCustomField',
'PhabricatorStandardCustomFieldInterface',
),
-'SprintProjectProfileController' => 'SprintController',
+'SprintProjectProfileController' => 'SprintProjectController',
'SprintProjectViewController' => 'SprintController',
'SprintQuery' => 'SprintDAO',
'SprintQueryTest' => 'SprintTestCase',
diff --git a/src/application/SprintApplication.php
b/src/application/SprintApplication.php
index 336bb86..6d7a58b 100644
--- a/src/application/SprintApplication.php
+++ b/src/application/SprintApplication.php
@@ -72,8 +72,8 @@
// all routes following point to default controllers
'archive/(?P[1-9]\d*)/'
=> 'PhabricatorProjectArchiveController',
- 'details/(?P[1-9]\d*)/'
- => 'PhabricatorProjectEditDetailsController',
+ $this->getEditRoutePattern('edit/')
+ => 'PhabricatorProjectEditController',
'feed/(?P[1-9]\d*)/'
=> 'PhabricatorProjectFeedController',
'icon/(?P[1-9]\d*)/'
diff --git a/src/conduit/SprintConduitAPIMethod.php
b/src/conduit/SprintConduitAPIMethod.php
index 3b0cc56..5572997 100644
--- a/src/conduit/SprintConduitAPIMethod.php
+++ b/src/conduit/SprintConduitAPIMethod.php
@@ -21,7 +21,7 @@
$project_slugs = $project->getSlugs();
$project_slugs = array_values(mpull($project_slugs, 'getSlug'));
$issprint = $this->isSprint($project->getPHID());
-$project_icon = PhabricatorProjectIcon::getAPIName($project->getIcon());
+$project_icon = substr($project->getIcon(), 3);
$result[$project->getPHID()] = array(
'id' => $project->getID(),
@@ -55,7 +55,7 @@
$project_slugs = $project->getSlugs();
$project_slugs = array_values(mpull($project_slugs, 'getSlug'));
$issprint = $this->isSprint($project->getPHID());
- $project_icon = PhabricatorProjectIcon::getAPIName($project->getIcon());
+ $project_icon = substr($project->getIcon(), 3);
$result[$project->getPHID()] = array(
'id' => $project->getID(),
diff --git a/src/controller/SprintController.php
b/src/controller/SprintController.php
index 143fc2f..02947e6 100644
--- a/src/controller/SprintController.php
+++ b/src/controller/SprintController.php
@@ -24,7 +24,7 @@
}
public function buildApplicationMenu() {
- return $this->buildSideNavView($this->getUser(),
+ return $this->buildSprintNavView($this->getUser(),
$this->setApplicationURI(), true)->getMenu();
}
@@ -45,7 +45,7 @@
/**
* @param PhutilURI $uri
*/
- public function buildSideNavView($viewer, $uri, $for_app = false) {
+ public function
