Page MenuHomePhabricator
Files F15284250

D10679.id25642.diff
No OneTemporary
Actions

D10679.id25642.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
@@ -2029,7 +2029,6 @@
'PhabricatorProjectConfiguredCustomField' => 'applications/project/customfield/PhabricatorProjectConfiguredCustomField.php',
'PhabricatorProjectConstants' => 'applications/project/constants/PhabricatorProjectConstants.php',
'PhabricatorProjectController' => 'applications/project/controller/PhabricatorProjectController.php',
- 'PhabricatorProjectCreateController' => 'applications/project/controller/PhabricatorProjectCreateController.php',
'PhabricatorProjectCustomField' => 'applications/project/customfield/PhabricatorProjectCustomField.php',
'PhabricatorProjectCustomFieldNumericIndex' => 'applications/project/storage/PhabricatorProjectCustomFieldNumericIndex.php',
'PhabricatorProjectCustomFieldStorage' => 'applications/project/storage/PhabricatorProjectCustomFieldStorage.php',
@@ -5028,7 +5027,6 @@
'PhabricatorStandardCustomFieldInterface',
),
'PhabricatorProjectController' => 'PhabricatorController',
- 'PhabricatorProjectCreateController' => 'PhabricatorProjectController',
'PhabricatorProjectCustomField' => 'PhabricatorCustomField',
'PhabricatorProjectCustomFieldNumericIndex' => 'PhabricatorCustomFieldNumericIndexStorage',
'PhabricatorProjectCustomFieldStorage' => 'PhabricatorCustomFieldStorage',
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
@@ -58,7 +58,9 @@
=> 'PhabricatorProjectEditPictureController',
'icon/(?P<id>[1-9]\d*)/'
=> 'PhabricatorProjectEditIconController',
- 'create/' => 'PhabricatorProjectCreateController',
+ 'icon/'
+ => 'PhabricatorProjectEditIconController',
+ 'create/' => 'PhabricatorProjectEditDetailsController',
'board/(?P<id>[1-9]\d*)/'.
'(?P<filter>filter/)?'.
'(?:query/(?P<queryKey>[^/]+)/)?'
diff --git a/src/applications/project/controller/PhabricatorProjectCreateController.php b/src/applications/project/controller/PhabricatorProjectCreateController.php
deleted file mode 100644
--- a/src/applications/project/controller/PhabricatorProjectCreateController.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-final class PhabricatorProjectCreateController
- extends PhabricatorProjectController {
-
- public function processRequest() {
- $request = $this->getRequest();
- $user = $request->getUser();
-
- $this->requireApplicationCapability(
- ProjectCreateProjectsCapability::CAPABILITY);
-
- $project = PhabricatorProject::initializeNewProject($user);
-
- $e_name = true;
- $type_name = PhabricatorProjectTransaction::TYPE_NAME;
- $v_name = $project->getName();
- $validation_exception = null;
- if ($request->isFormPost()) {
- $xactions = array();
- $v_name = $request->getStr('name');
-
- $xactions[] = id(new PhabricatorProjectTransaction())
- ->setTransactionType($type_name)
- ->setNewValue($v_name);
-
- $xactions[] = id(new PhabricatorProjectTransaction())
- ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
- ->setMetadataValue('edge:type', PhabricatorEdgeConfig::TYPE_PROJ_MEMBER)
- ->setNewValue(
- array(
- '+' => array($user->getPHID() => $user->getPHID()),
- ));
-
- $editor = id(new PhabricatorProjectTransactionEditor())
- ->setActor($user)
- ->setContinueOnNoEffect(true)
- ->setContentSourceFromRequest($request);
- try {
- $editor->applyTransactions($project, $xactions);
- if ($request->isAjax()) {
- return id(new AphrontAjaxResponse())
- ->setContent(array(
- 'phid' => $project->getPHID(),
- 'name' => $project->getName(),
- ));
- } else {
- return id(new AphrontRedirectResponse())
- ->setURI('/project/view/'.$project->getID().'/');
- }
- } catch (PhabricatorApplicationTransactionValidationException $ex) {
- $validation_exception = $ex;
- $e_name = $ex->getShortMessage($type_name);
- }
- }
-
- if ($request->isAjax()) {
- $form = new PHUIFormLayoutView();
- } else {
- $form = new AphrontFormView();
- $form->setUser($user);
- }
-
- $form
- ->appendChild(
- id(new AphrontFormTextControl())
- ->setLabel(pht('Name'))
- ->setName('name')
- ->setValue($v_name)
- ->setError($e_name));
-
- if ($request->isAjax()) {
- $errors = array();
- if ($validation_exception) {
- $errors = mpull($ex->getErrors(), 'getMessage');
- }
- $dialog = id(new AphrontDialogView())
- ->setUser($user)
- ->setWidth(AphrontDialogView::WIDTH_FORM)
- ->setTitle(pht('Create a New Project'))
- ->setErrors($errors)
- ->appendChild($form)
- ->addSubmitButton(pht('Create Project'))
- ->addCancelButton('/project/');
-
- return id(new AphrontDialogResponse())->setDialog($dialog);
- } else {
- $form
- ->appendChild(
- id(new AphrontFormSubmitControl())
- ->setValue(pht('Create'))
- ->addCancelButton('/project/'));
-
- $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
- $crumbs->addTextCrumb(
- pht('Create Project'),
- $this->getApplicationURI().'create/');
-
- $form_box = id(new PHUIObjectBoxView())
- ->setHeaderText(pht('Create New Project'))
- ->setValidationException($validation_exception)
- ->setForm($form);
-
- return $this->buildApplicationPage(
- array(
- $crumbs,
- $form_box,
- ),
- array(
- 'title' => pht('Create New Project'),
- ));
- }
- }
-
-}
diff --git a/src/applications/project/controller/PhabricatorProjectEditDetailsController.php b/src/applications/project/controller/PhabricatorProjectEditDetailsController.php
--- a/src/applications/project/controller/PhabricatorProjectEditDetailsController.php
+++ b/src/applications/project/controller/PhabricatorProjectEditDetailsController.php
@@ -6,25 +6,37 @@
private $id;
public function willProcessRequest(array $data) {
- $this->id = $data['id'];
+ $this->id = idx($data, 'id');
}
public function processRequest() {
$request = $this->getRequest();
$viewer = $request->getUser();
- $project = id(new PhabricatorProjectQuery())
- ->setViewer($viewer)
- ->withIDs(array($this->id))
- ->needSlugs(true)
- ->requireCapabilities(
- array(
- PhabricatorPolicyCapability::CAN_VIEW,
- PhabricatorPolicyCapability::CAN_EDIT,
- ))
- ->executeOne();
- if (!$project) {
- return new Aphront404Response();
+ if ($this->id) {
+ $is_new = false;
+
+ $project = id(new PhabricatorProjectQuery())
+ ->setViewer($viewer)
+ ->withIDs(array($this->id))
+ ->needSlugs(true)
+ ->requireCapabilities(
+ array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ PhabricatorPolicyCapability::CAN_EDIT,
+ ))
+ ->executeOne();
+ if (!$project) {
+ return new Aphront404Response();
+ }
+
+ } else {
+ $is_new = true;
+
+ $this->requireApplicationCapability(
+ ProjectCreateProjectsCapability::CAPABILITY);
+
+ $project = PhabricatorProject::initializeNewProject($viewer);
}
$field_list = PhabricatorCustomField::getObjectFields(
@@ -114,10 +126,37 @@
->setContentSourceFromRequest($request)
->setContinueOnNoEffect(true);
+ if ($is_new) {
+ $xactions[] = id(new PhabricatorProjectTransaction())
+ ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
+ ->setMetadataValue(
+ 'edge:type',
+ PhabricatorEdgeConfig::TYPE_PROJ_MEMBER)
+ ->setNewValue(
+ array(
+ '+' => array($viewer->getPHID() => $viewer->getPHID()),
+ ));
+ }
+
try {
+
$editor->applyTransactions($project, $xactions);
- return id(new AphrontRedirectResponse())->setURI($edit_uri);
+ if ($request->isAjax()) {
+ return id(new AphrontAjaxResponse())
+ ->setContent(array(
+ 'phid' => $project->getPHID(),
+ 'name' => $project->getName(),
+ ));
+ }
+
+ if ($is_new) {
+ $redirect_uri = $view_uri;
+ } else {
+ $redirect_uri = $edit_uri;
+ }
+
+ return id(new AphrontRedirectResponse())->setURI($redirect_uri);
} catch (PhabricatorApplicationTransactionValidationException $ex) {
$validation_exception = $ex;
@@ -131,8 +170,13 @@
}
}
- $header_name = pht('Edit Project');
- $title = pht('Edit Project');
+ if ($is_new) {
+ $header_name = pht('Create a New Project');
+ $title = pht('Create Project');
+ } else {
+ $header_name = pht('Edit Project');
+ $title = pht('Edit Project');
+ }
$policies = id(new PhabricatorPolicyQuery())
->setViewer($viewer)
@@ -140,20 +184,32 @@
->execute();
$v_slugs = implode(', ', $v_slugs);
- $form = new AphrontFormView();
+ if ($request->isAjax()) {
+ $form = new PHUIFormLayoutView();
+ } else {
+ $form = id(new AphrontFormView())
+ ->setUser($viewer);
+ }
$form
- ->setUser($viewer)
->appendChild(
id(new AphrontFormTextControl())
->setLabel(pht('Name'))
->setName('name')
->setValue($v_name)
->setError($e_name));
- $field_list->appendFieldsToForm($form);
+ if ($request->isAjax()) {
+ $field_list->appendFieldsToFormView($form);
+ } else {
+ $field_list->appendFieldsToForm($form);
+ }
$shades = PhabricatorProjectIcon::getColorMap();
- $icon_uri = $this->getApplicationURI('icon/'.$project->getID().'/');
+ if ($is_new) {
+ $icon_uri = $this->getApplicationURI('icon/');
+ } else {
+ $icon_uri = $this->getApplicationURI('icon/'.$project->getID().'/');
+ }
$icon_display = PhabricatorProjectIcon::renderIconForChooser($v_icon);
list($can_lock, $lock_message) = $this->explainApplicationCapability(
ProjectCanLockProjectsCapability::CAPABILITY,
@@ -221,21 +277,43 @@
1,
pht('Prevent members from leaving this project.'),
$v_locked)
- ->setCaption($lock_message))
- ->appendChild(
- id(new AphrontFormSubmitControl())
- ->addCancelButton($edit_uri)
- ->setValue(pht('Save')));
+ ->setCaption($lock_message));
+
+ if ($request->isAjax()) {
+ $errors = array();
+ if ($validation_exception) {
+ $errors = mpull($ex->getErrors(), 'getMessage');
+ }
+ $dialog = id(new AphrontDialogView())
+ ->setUser($viewer)
+ ->setWidth(AphrontDialogView::WIDTH_FULL)
+ ->setTitle($header_name)
+ ->setErrors($errors)
+ ->appendChild($form)
+ ->addSubmitButton($title)
+ ->addCancelButton('/project/');
+ return id(new AphrontDialogResponse())->setDialog($dialog);
+ }
+
+ $form->appendChild(
+ id(new AphrontFormSubmitControl())
+ ->addCancelButton($edit_uri)
+ ->setValue(pht('Save')));
$form_box = id(new PHUIObjectBoxView())
->setHeaderText($title)
->setValidationException($validation_exception)
->setForm($form);
- $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView())
- ->addTextCrumb($project->getName(), $view_uri)
- ->addTextCrumb(pht('Edit'), $edit_uri)
- ->addTextCrumb(pht('Details'));
+ $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
+ if ($is_new) {
+ $crumbs->addTextCrumb($title);
+ } else {
+ $crumbs
+ ->addTextCrumb($project->getName(), $view_uri)
+ ->addTextCrumb(pht('Edit'), $edit_uri)
+ ->addTextCrumb(pht('Details'));
+ }
return $this->buildApplicationPage(
array(
diff --git a/src/applications/project/controller/PhabricatorProjectEditIconController.php b/src/applications/project/controller/PhabricatorProjectEditIconController.php
--- a/src/applications/project/controller/PhabricatorProjectEditIconController.php
+++ b/src/applications/project/controller/PhabricatorProjectEditIconController.php
@@ -6,27 +6,36 @@
private $id;
public function willProcessRequest(array $data) {
- $this->id = $data['id'];
+ $this->id = idx($data, 'id');
}
public function processRequest() {
$request = $this->getRequest();
$viewer = $request->getUser();
- $project = id(new PhabricatorProjectQuery())
- ->setViewer($viewer)
- ->withIDs(array($this->id))
- ->requireCapabilities(
- array(
- PhabricatorPolicyCapability::CAN_VIEW,
- PhabricatorPolicyCapability::CAN_EDIT,
- ))
- ->executeOne();
- if (!$project) {
- return new Aphront404Response();
+ if ($this->id) {
+ $project = id(new PhabricatorProjectQuery())
+ ->setViewer($viewer)
+ ->withIDs(array($this->id))
+ ->requireCapabilities(
+ array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ PhabricatorPolicyCapability::CAN_EDIT,
+ ))
+ ->executeOne();
+ if (!$project) {
+ return new Aphront404Response();
+ }
+ $cancel_uri = $this->getApplicationURI('edit/'.$project->getID().'/');
+ $project_icon = $project->getIcon();
+ } else {
+ $this->requireApplicationCapability(
+ ProjectCreateProjectsCapability::CAPABILITY);
+
+ $cancel_uri = '/project/';
+ $project_icon = $request->getStr('value');
}
- $edit_uri = $this->getApplicationURI('edit/'.$project->getID().'/');
require_celerity_resource('project-icon-css');
Javelin::initBehavior('phabricator-tooltips');
@@ -55,7 +64,7 @@
),
pht('Choose "%s" Icon', $label));
- if ($icon == $project->getIcon()) {
+ if ($icon == $project_icon) {
$class_extra = ' selected';
} else {
$class_extra = null;
@@ -92,6 +101,6 @@
return $this->newDialog()
->setTitle(pht('Choose Project Icon'))
->appendChild($buttons)
- ->addCancelButton($edit_uri);
+ ->addCancelButton($cancel_uri);
}
}
diff --git a/src/applications/project/storage/PhabricatorProject.php b/src/applications/project/storage/PhabricatorProject.php
--- a/src/applications/project/storage/PhabricatorProject.php
+++ b/src/applications/project/storage/PhabricatorProject.php
@@ -45,7 +45,8 @@
->setEditPolicy(PhabricatorPolicies::POLICY_USER)
->setJoinPolicy(PhabricatorPolicies::POLICY_USER)
->setIsMembershipLocked(0)
- ->attachMemberPHIDs(array());
+ ->attachMemberPHIDs(array())
+ ->attachSlugs(array());
}
public function getCapabilities() {
diff --git a/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php b/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php
--- a/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php
+++ b/src/infrastructure/customfield/field/PhabricatorCustomFieldList.php
@@ -84,6 +84,13 @@
}
public function appendFieldsToForm(AphrontFormView $form) {
+ return $this->appendFieldsToFormOrFormView($form);
+ }
+ public function appendFieldsToFormView(PHUIFormLayoutView $form) {
+ return $this->appendFieldsToFormOrFormView($form);
+ }
+
+ private function appendFieldsToFormOrFormView($form) {
$enabled = array();
foreach ($this->fields as $field) {
if ($field->shouldEnableForRole(PhabricatorCustomField::ROLE_EDIT)) {

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 5, 9:28 AM (6 d, 20 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7224643
Default Alt Text
D10679.id25642.diff (15 KB)

Event Timeline

Phabricator · Built by Phacility