archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into redesign-2015

Browse Source
This commit is contained in:
epriestley
2015-06-15 08:06:23 -07:00
parent b3523adff4 f87ffc41ce
commit 53ef057b1b
353 changed files with 3289 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/applications/maniphest/controller/ManiphestBatchEditController.php
View File

@@ -88,6 +88,8 @@ final class ManiphestBatchEditController extends ManiphestController {
$mailable_source->setViewer($viewer);
$owner_source = new ManiphestAssigneeDatasource();
$owner_source->setViewer($viewer);
$spaces_source = id(new PhabricatorSpacesNamespaceDatasource())
->setViewer($viewer);
require_celerity_resource('maniphest-batch-editor');
Javelin::initBehavior(
@@ -112,6 +114,12 @@ final class ManiphestBatchEditController extends ManiphestController {
'placeholder' => $mailable_source->getPlaceholderText(),
'browseURI' => $mailable_source->getBrowseURI(),
),
'spaces' => array(
'src' => $spaces_source->getDatasourceURI(),
'placeholder' => $spaces_source->getPlaceholderText(),
'browseURI' => $spaces_source->getBrowseURI(),
'limit' => 1,
),
),
'input' => 'batch-form-actions',
'priorityMap' => ManiphestTaskPriority::getTaskPriorityMap(),
@@ -201,6 +209,7 @@ final class ManiphestBatchEditController extends ManiphestController {
'remove_project' => PhabricatorTransactions::TYPE_EDGE,
'add_ccs' => PhabricatorTransactions::TYPE_SUBSCRIBERS,
'remove_ccs' => PhabricatorTransactions::TYPE_SUBSCRIBERS,
'space' => PhabricatorTransactions::TYPE_SPACE,
);
$edge_edit_types = array(
@@ -246,6 +255,10 @@ final class ManiphestBatchEditController extends ManiphestController {
case PhabricatorTransactions::TYPE_SUBSCRIBERS:
$current = $task->getSubscriberPHIDs();
break;
case PhabricatorTransactions::TYPE_SPACE:
$current = PhabricatorSpacesNamespaceQuery::getObjectSpacePHID(
$task);
break;
}
}
@@ -260,6 +273,12 @@ final class ManiphestBatchEditController extends ManiphestController {
continue 2;
}
break;
case PhabricatorTransactions::TYPE_SPACE:
if (empty($value)) {
continue 2;
}
$value = head($value);
break;
case ManiphestTransaction::TYPE_OWNER:
if (empty($value)) {
continue 2;

7
src/applications/maniphest/controller/ManiphestTaskEditController.php
View File

@@ -155,12 +155,15 @@ final class ManiphestTaskEditController extends ManiphestController {
$aux_fields = $field_list->getFields();
$v_space = $task->getSpacePHID();
if ($request->isFormPost()) {
$changes = array();
$new_title = $request->getStr('title');
$new_desc = $request->getStr('description');
$new_status = $request->getStr('status');
$v_space = $request->getStr('spacePHID');
if (!$task->getID()) {
$workflow = 'create';
@@ -268,6 +271,7 @@ final class ManiphestTaskEditController extends ManiphestController {
}
if ($can_edit_policies) {
$changes[PhabricatorTransactions::TYPE_SPACE] = $v_space;
$changes[PhabricatorTransactions::TYPE_VIEW_POLICY] =
$request->getStr('viewPolicy');
$changes[PhabricatorTransactions::TYPE_EDIT_POLICY] =
@@ -477,6 +481,8 @@ final class ManiphestTaskEditController extends ManiphestController {
$task->setViewPolicy($template_task->getViewPolicy());
$task->setEditPolicy($template_task->getEditPolicy());
$v_space = $template_task->getSpacePHID();
$template_fields = PhabricatorCustomField::getObjectFields(
$template_task,
PhabricatorCustomField::ROLE_EDIT);
@@ -643,6 +649,7 @@ final class ManiphestTaskEditController extends ManiphestController {
->setCapability(PhabricatorPolicyCapability::CAN_VIEW)
->setPolicyObject($task)
->setPolicies($policies)
->setSpacePHID($v_space)
->setName('viewPolicy'))
->appendChild(
id(new AphrontFormPolicyControl())