Page MenuHomePhabricator
Files F14911236

D9221.diff
No OneTemporary
Actions

D9221.diff
View Options

diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -205,20 +205,6 @@
$draft_text = null;
}
- $submit_control = id(new PHUIFormMultiSubmitControl());
- if (!$task->isClosed()) {
- $close_image = id(new PHUIIconView())
- ->setIconFont('fa-check-square-o');
- $submit_control->addButtonView(
- id(new PHUIButtonView())
- ->setColor(PHUIButtonView::GREY)
- ->setIcon($close_image)
- ->setText(pht('Close Task'))
- ->setName('scuttle')
- ->addSigil('alternate-submit-button'));
- }
- $submit_control->addSubmitButton(pht('Submit'));
-
$comment_form = new AphrontFormView();
$comment_form
->setUser($user)
@@ -284,7 +270,9 @@
->setValue($draft_text)
->setID('transaction-comments')
->setUser($user))
- ->appendChild($submit_control);
+ ->appendChild(
+ id(new AphrontFormSubmitControl())
+ ->setValue(pht('Submit')));
$control_map = array(
ManiphestTransaction::TYPE_STATUS => 'resolution',
diff --git a/src/applications/maniphest/controller/ManiphestTransactionSaveController.php b/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
--- a/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
+++ b/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
@@ -78,17 +78,6 @@
$transactions[] = $transaction;
}
- $resolution = $request->getStr('resolution');
- $did_scuttle = false;
- if ($action !== ManiphestTransaction::TYPE_STATUS) {
- if ($request->getStr('scuttle')) {
- $transactions[] = id(new ManiphestTransaction())
- ->setTransactionType(ManiphestTransaction::TYPE_STATUS)
- ->setNewValue(ManiphestTaskStatus::getDefaultClosedStatus());
- $did_scuttle = true;
- $resolution = ManiphestTaskStatus::getDefaultClosedStatus();
- }
- }
// When you interact with a task, we add you to the CC list so you get
// further updates, and possibly assign the task to you if you took an
@@ -106,7 +95,8 @@
}
}
- if ($did_scuttle || ($action == ManiphestTransaction::TYPE_STATUS)) {
+ if ($action == ManiphestTransaction::TYPE_STATUS) {
+ $resolution = $request->getStr('resolution');
if (!$task->getOwnerPHID() &&
ManiphestTaskStatus::isClosedStatus($resolution)) {
// Closing an unassigned task. Assign the user as the owner of

File Metadata

Mime Type
text/plain
Expires
Wed, Feb 12, 6:26 PM (16 h, 13 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7124730
Default Alt Text
D9221.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility