Page MenuHomePhabricator
Files F14130903

D19551.diff
No OneTemporary
Actions

D19551.diff
View Options

diff --git a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
--- a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
+++ b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
@@ -106,8 +106,8 @@
->addClass('project-view-people-home')
->setMainColumn(array(
$info_view,
- $milestone_list,
$subproject_list,
+ $milestone_list,
));
return $this->newPage()
@@ -132,28 +132,11 @@
$project,
PhabricatorPolicyCapability::CAN_EDIT);
- $allows_milestones = $project->supportsMilestones();
$allows_subprojects = $project->supportsSubprojects();
+ $allows_milestones = $project->supportsMilestones();
$curtain = $this->newCurtainView();
- if ($allows_milestones && $milestones) {
- $milestone_text = pht('Create Next Milestone');
- } else {
- $milestone_text = pht('Create Milestone');
- }
-
- $can_milestone = ($can_create && $can_edit && $allows_milestones);
- $milestone_href = "/project/edit/?milestone={$id}";
-
- $curtain->addAction(
- id(new PhabricatorActionView())
- ->setName($milestone_text)
- ->setIcon('fa-plus')
- ->setHref($milestone_href)
- ->setDisabled(!$can_milestone)
- ->setWorkflow(!$can_milestone));
-
$can_subproject = ($can_create && $can_edit && $allows_subprojects);
// If we're offering to create the first subproject, we're going to warn
@@ -176,22 +159,22 @@
->setDisabled($subproject_disabled)
->setWorkflow($subproject_workflow));
-
- if (!$project->supportsMilestones()) {
- $note = pht(
- 'This project is already a milestone, and milestones may not '.
- 'have their own milestones.');
+ if ($allows_milestones && $milestones) {
+ $milestone_text = pht('Create Next Milestone');
} else {
- if (!$milestones) {
- $note = pht('Milestones can be created for this project.');
- } else {
- $note = pht('This project has milestones.');
- }
+ $milestone_text = pht('Create Milestone');
}
- $curtain->newPanel()
- ->setHeaderText(pht('Milestones'))
- ->appendChild($note);
+ $can_milestone = ($can_create && $can_edit && $allows_milestones);
+ $milestone_href = "/project/edit/?milestone={$id}";
+
+ $curtain->addAction(
+ id(new PhabricatorActionView())
+ ->setName($milestone_text)
+ ->setIcon('fa-plus')
+ ->setHref($milestone_href)
+ ->setDisabled(!$can_milestone)
+ ->setWorkflow(!$can_milestone));
if (!$project->supportsSubprojects()) {
$note = pht(
@@ -209,6 +192,22 @@
->setHeaderText(pht('Subprojects'))
->appendChild($note);
+ if (!$project->supportsSubprojects()) {
+ $note = pht(
+ 'This project is already a milestone, and milestones may not '.
+ 'have their own milestones.');
+ } else {
+ if (!$milestones) {
+ $note = pht('Milestones can be created for this project.');
+ } else {
+ $note = pht('This project has milestones.');
+ }
+ }
+
+ $curtain->newPanel()
+ ->setHeaderText(pht('Milestones'))
+ ->appendChild($note);
+
return $curtain;
}

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 2, 7:28 PM (11 h, 17 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6816280
Default Alt Text
D19551.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility