2011-01-30 20:02:22 +01:00
|
|
|
<?php
|
|
|
|
|
|
|
|
final class DifferentialAddCommentView extends AphrontView {
|
|
|
|
|
|
|
|
private $revision;
|
|
|
|
private $actions;
|
|
|
|
private $actionURI;
|
2011-02-06 01:57:21 +01:00
|
|
|
private $draft;
|
2012-03-27 07:16:46 +02:00
|
|
|
private $auxFields;
|
2012-09-20 23:11:11 +02:00
|
|
|
private $reviewers = array();
|
|
|
|
private $ccs = array();
|
2011-01-30 20:02:22 +01:00
|
|
|
|
|
|
|
public function setRevision($revision) {
|
|
|
|
$this->revision = $revision;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2012-03-27 07:16:46 +02:00
|
|
|
public function setAuxFields(array $aux_fields) {
|
|
|
|
assert_instances_of($aux_fields, 'DifferentialFieldSpecification');
|
|
|
|
$this->auxFields = $aux_fields;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-01-30 20:02:22 +01:00
|
|
|
public function setActions(array $actions) {
|
|
|
|
$this->actions = $actions;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function setActionURI($uri) {
|
|
|
|
$this->actionURI = $uri;
|
2012-04-03 03:35:09 +02:00
|
|
|
return $this;
|
2011-01-30 20:02:22 +01:00
|
|
|
}
|
|
|
|
|
2012-09-20 23:11:11 +02:00
|
|
|
public function setDraft(PhabricatorDraft $draft = null) {
|
2011-02-06 01:57:21 +01:00
|
|
|
$this->draft = $draft;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2012-09-20 23:11:11 +02:00
|
|
|
public function setReviewers(array $names) {
|
|
|
|
$this->reviewers = $names;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function setCCs(array $names) {
|
|
|
|
$this->ccs = $names;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-06-10 03:56:47 +02:00
|
|
|
private function generateWarningView(
|
|
|
|
$status,
|
|
|
|
array $titles,
|
|
|
|
$id,
|
|
|
|
$content) {
|
|
|
|
|
|
|
|
$warning = new AphrontErrorView();
|
|
|
|
$warning->setSeverity(AphrontErrorView::SEVERITY_ERROR);
|
|
|
|
$warning->setID($id);
|
|
|
|
$warning->appendChild($content);
|
|
|
|
$warning->setTitle(idx($titles, $status, 'Warning'));
|
|
|
|
|
|
|
|
return $warning;
|
|
|
|
}
|
|
|
|
|
2011-01-31 03:52:29 +01:00
|
|
|
public function render() {
|
2011-02-01 03:05:20 +01:00
|
|
|
|
|
|
|
require_celerity_resource('differential-revision-add-comment-css');
|
|
|
|
|
Provide a configuration flag to disable silliness in the UI
Summary: See comments. A few installs have remarked that their organizations
would prefer buttons labled "Submit" to buttons labeled "Clowncopterize".
Test Plan:
- In "serious" mode, verified Differential and Maniphest have serious strings,
tasks can not be closed out of spite, and reset/welcome emails are extremely
serious.
- In unserious mode, verified Differential and Maniphest have normal strings,
tasks can be closed out of spite, and reset/welcome emails are silly.
- This does not disable the "fax these changes" message in Arcanist (no
reasonable way for it to read the config value) or the rainbow syntax
highlighter (already removable though configuration).
Reviewers: moskov, jungejason, nh, tuomaspelkonen, aran
Reviewed By: moskov
CC: aran, moskov
Differential Revision: 1081
2011-11-04 23:16:34 +01:00
|
|
|
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
|
|
|
|
|
2011-01-30 21:08:40 +01:00
|
|
|
$revision = $this->revision;
|
|
|
|
|
2012-09-20 23:11:11 +02:00
|
|
|
$action = null;
|
|
|
|
if ($this->draft) {
|
|
|
|
$action = idx($this->draft->getMetadata(), 'action');
|
|
|
|
}
|
|
|
|
|
|
|
|
$enable_reviewers = DifferentialAction::allowReviewers($action);
|
|
|
|
$enable_ccs = ($action == DifferentialAction::ACTION_ADDCCS);
|
|
|
|
|
2011-01-30 20:02:22 +01:00
|
|
|
$form = new AphrontFormView();
|
|
|
|
$form
|
Improve behavior when user submits a no-op action in Differential
Summary:
See T730 and the slightly-less-pretty version of this in D1398.
When a user takes an action in Differential that has no effect (for instance,
accepting an already-accepted revision), prompt them:
Action Has No Effect
You can not accept this revision because it has already been accepted.
Do you want to post the feedback anyway, as a normal comment?
[Cancel] [Post as Comment]
If they have no comment text, the dialog only says "Cancel".
I think this is probably the best way to balance all the concerns here -- it
might occasionally be a little annoying, but that should be rare, and it should
never be confusing (the current workflow is extremely confusing).
This also fixes the issue where you can add all sorts of CCs who are already
part of the revision, either explicitly or via mentions.
Test Plan:
Posted some has-effect and has-no-effect comments, made different
choices in the dialog, everything seems to work OK?
Reviewers: vrana, btrahan, jungejason
Reviewed By: vrana
CC: aran, vrana
Maniphest Tasks: T730
Differential Revision: https://secure.phabricator.com/D1403
2012-01-14 20:39:22 +01:00
|
|
|
->setWorkflow(true)
|
2012-11-01 21:30:37 +01:00
|
|
|
->setFlexible(true)
|
2011-01-31 03:52:29 +01:00
|
|
|
->setUser($this->user)
|
2011-01-30 20:02:22 +01:00
|
|
|
->setAction($this->actionURI)
|
2011-01-30 21:08:40 +01:00
|
|
|
->addHiddenInput('revision_id', $revision->getID())
|
2011-01-30 20:02:22 +01:00
|
|
|
->appendChild(
|
|
|
|
id(new AphrontFormSelectControl())
|
|
|
|
->setLabel('Action')
|
2011-01-30 21:08:40 +01:00
|
|
|
->setName('action')
|
2012-09-20 23:11:11 +02:00
|
|
|
->setValue($action)
|
2011-02-01 03:05:20 +01:00
|
|
|
->setID('comment-action')
|
2011-10-27 21:32:02 +02:00
|
|
|
->setOptions($this->actions))
|
2011-02-05 07:45:42 +01:00
|
|
|
->appendChild(
|
|
|
|
id(new AphrontFormTokenizerControl())
|
|
|
|
->setLabel('Add Reviewers')
|
|
|
|
->setName('reviewers')
|
|
|
|
->setControlID('add-reviewers')
|
2012-09-20 23:11:11 +02:00
|
|
|
->setControlStyle($enable_reviewers ? null : 'display: none')
|
2011-02-05 07:45:42 +01:00
|
|
|
->setID('add-reviewers-tokenizer')
|
|
|
|
->setDisableBehavior(true))
|
2011-06-24 21:21:48 +02:00
|
|
|
->appendChild(
|
|
|
|
id(new AphrontFormTokenizerControl())
|
|
|
|
->setLabel('Add CCs')
|
|
|
|
->setName('ccs')
|
|
|
|
->setControlID('add-ccs')
|
2012-09-20 23:11:11 +02:00
|
|
|
->setControlStyle($enable_ccs ? null : 'display: none')
|
2011-06-24 21:21:48 +02:00
|
|
|
->setID('add-ccs-tokenizer')
|
|
|
|
->setDisableBehavior(true))
|
2011-01-30 20:02:22 +01:00
|
|
|
->appendChild(
|
2012-09-19 21:27:28 +02:00
|
|
|
id(new PhabricatorRemarkupControl())
|
2011-01-30 21:08:40 +01:00
|
|
|
->setName('comment')
|
2011-02-01 03:05:20 +01:00
|
|
|
->setID('comment-content')
|
2011-02-06 01:57:21 +01:00
|
|
|
->setLabel('Comment')
|
2012-11-27 23:06:31 +01:00
|
|
|
->setValue($this->draft ? $this->draft->getDraft() : null)
|
|
|
|
->setUser($this->user))
|
2011-01-30 20:02:22 +01:00
|
|
|
->appendChild(
|
|
|
|
id(new AphrontFormSubmitControl())
|
Provide a configuration flag to disable silliness in the UI
Summary: See comments. A few installs have remarked that their organizations
would prefer buttons labled "Submit" to buttons labeled "Clowncopterize".
Test Plan:
- In "serious" mode, verified Differential and Maniphest have serious strings,
tasks can not be closed out of spite, and reset/welcome emails are extremely
serious.
- In unserious mode, verified Differential and Maniphest have normal strings,
tasks can be closed out of spite, and reset/welcome emails are silly.
- This does not disable the "fax these changes" message in Arcanist (no
reasonable way for it to read the config value) or the rainbow syntax
highlighter (already removable though configuration).
Reviewers: moskov, jungejason, nh, tuomaspelkonen, aran
Reviewed By: moskov
CC: aran, moskov
Differential Revision: 1081
2011-11-04 23:16:34 +01:00
|
|
|
->setValue($is_serious ? 'Submit' : 'Clowncopterize'));
|
2011-01-30 20:02:22 +01:00
|
|
|
|
2011-02-05 07:45:42 +01:00
|
|
|
Javelin::initBehavior(
|
2011-06-24 21:21:48 +02:00
|
|
|
'differential-add-reviewers-and-ccs',
|
2011-02-05 07:45:42 +01:00
|
|
|
array(
|
2011-06-24 21:21:48 +02:00
|
|
|
'dynamic' => array(
|
2012-01-24 03:34:46 +01:00
|
|
|
'add-reviewers-tokenizer' => array(
|
|
|
|
'actions' => array('request_review' => 1, 'add_reviewers' => 1),
|
2011-06-24 21:21:48 +02:00
|
|
|
'src' => '/typeahead/common/users/',
|
2012-09-20 23:11:11 +02:00
|
|
|
'value' => $this->reviewers,
|
2011-06-24 21:21:48 +02:00
|
|
|
'row' => 'add-reviewers',
|
2011-10-08 03:25:54 +02:00
|
|
|
'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
|
Use Javelin placeholders and new sorting rules broadly; consolidate tokenizer construction code
Summary:
- We have three nearly-identical blocks of Tokenizer construction code; consolidate them into Prefab.
- Add placeholder support.
- Augment server-side stuff to specify placeholder text.
Test Plan: Verified behavior of Differential edit tokenizers, Differential comment tokenizers, Maniphest edit tokenizers, Maniphest comment tokenizers, Maniphest filter tokenizers, Differential filter tokenizers, Owners filter tokenizers, Owners edit tokenizers, Herald edit tokenizers, Audit filter tokenizers.
Reviewers: btrahan
Reviewed By: btrahan
CC: aran, epriestley
Maniphest Tasks: T772, T946
Differential Revision: https://secure.phabricator.com/D1844
2012-03-10 00:46:39 +01:00
|
|
|
'placeholder' => 'Type a user name...',
|
2011-06-24 21:21:48 +02:00
|
|
|
),
|
2012-01-24 03:34:46 +01:00
|
|
|
'add-ccs-tokenizer' => array(
|
|
|
|
'actions' => array('add_ccs' => 1),
|
2011-06-24 21:21:48 +02:00
|
|
|
'src' => '/typeahead/common/mailable/',
|
2012-09-20 23:11:11 +02:00
|
|
|
'value' => $this->ccs,
|
2011-06-24 21:21:48 +02:00
|
|
|
'row' => 'add-ccs',
|
2011-10-08 03:25:54 +02:00
|
|
|
'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
|
Use Javelin placeholders and new sorting rules broadly; consolidate tokenizer construction code
Summary:
- We have three nearly-identical blocks of Tokenizer construction code; consolidate them into Prefab.
- Add placeholder support.
- Augment server-side stuff to specify placeholder text.
Test Plan: Verified behavior of Differential edit tokenizers, Differential comment tokenizers, Maniphest edit tokenizers, Maniphest comment tokenizers, Maniphest filter tokenizers, Differential filter tokenizers, Owners filter tokenizers, Owners edit tokenizers, Herald edit tokenizers, Audit filter tokenizers.
Reviewers: btrahan
Reviewed By: btrahan
CC: aran, epriestley
Maniphest Tasks: T772, T946
Differential Revision: https://secure.phabricator.com/D1844
2012-03-10 00:46:39 +01:00
|
|
|
'placeholder' => 'Type a user or mailing list...',
|
2011-06-24 21:21:48 +02:00
|
|
|
),
|
|
|
|
),
|
2011-02-05 07:45:42 +01:00
|
|
|
'select' => 'comment-action',
|
|
|
|
));
|
|
|
|
|
2011-06-10 03:56:47 +02:00
|
|
|
$diff = $revision->loadActiveDiff();
|
2012-03-27 07:16:46 +02:00
|
|
|
$warnings = mpull($this->auxFields, 'renderWarningBoxForRevisionAccept');
|
2011-06-10 03:56:47 +02:00
|
|
|
|
|
|
|
Javelin::initBehavior(
|
|
|
|
'differential-accept-with-errors',
|
|
|
|
array(
|
|
|
|
'select' => 'comment-action',
|
2012-03-27 07:16:46 +02:00
|
|
|
'warnings' => 'warnings',
|
2011-06-10 03:56:47 +02:00
|
|
|
));
|
|
|
|
|
2011-02-03 04:38:43 +01:00
|
|
|
$rev_id = $revision->getID();
|
|
|
|
|
2011-02-01 03:05:20 +01:00
|
|
|
Javelin::initBehavior(
|
|
|
|
'differential-feedback-preview',
|
|
|
|
array(
|
2011-02-03 04:38:43 +01:00
|
|
|
'uri' => '/differential/comment/preview/'.$rev_id.'/',
|
|
|
|
'preview' => 'comment-preview',
|
|
|
|
'action' => 'comment-action',
|
|
|
|
'content' => 'comment-content',
|
2011-12-23 02:59:00 +01:00
|
|
|
'previewTokenizers' => array(
|
|
|
|
'reviewers' => 'add-reviewers-tokenizer',
|
|
|
|
'ccs' => 'add-ccs-tokenizer',
|
|
|
|
),
|
2011-02-03 04:38:43 +01:00
|
|
|
|
|
|
|
'inlineuri' => '/differential/comment/inline/preview/'.$rev_id.'/',
|
|
|
|
'inline' => 'inline-comment-preview',
|
2011-02-01 03:05:20 +01:00
|
|
|
));
|
|
|
|
|
2012-03-27 07:16:46 +02:00
|
|
|
$warning_container = '<div id="warnings">';
|
|
|
|
foreach ($warnings as $warning) {
|
|
|
|
if ($warning) {
|
|
|
|
$warning_container .= $warning->render();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$warning_container .= '</div>';
|
Provide a configuration flag to disable silliness in the UI
Summary: See comments. A few installs have remarked that their organizations
would prefer buttons labled "Submit" to buttons labeled "Clowncopterize".
Test Plan:
- In "serious" mode, verified Differential and Maniphest have serious strings,
tasks can not be closed out of spite, and reset/welcome emails are extremely
serious.
- In unserious mode, verified Differential and Maniphest have normal strings,
tasks can be closed out of spite, and reset/welcome emails are silly.
- This does not disable the "fax these changes" message in Arcanist (no
reasonable way for it to read the config value) or the rainbow syntax
highlighter (already removable though configuration).
Reviewers: moskov, jungejason, nh, tuomaspelkonen, aran
Reviewed By: moskov
CC: aran, moskov
Differential Revision: 1081
2011-11-04 23:16:34 +01:00
|
|
|
|
2012-11-01 21:30:37 +01:00
|
|
|
$header = id(new PhabricatorHeaderView())
|
|
|
|
->setHeader($is_serious ? 'Add Comment' : 'Leap Into Action');
|
Tweak Maniphest CSS, fix remarkup in description change views
Summary:
Various CSS tweaks and fixes:
- Add remarkup styling to description change views, missed this before.
- Fix CSS so that transactions with only one item (e.g., changed priority)
don't have weird floater underneath them.
- Add more space between transaction items.
- Make default background color lighter and less heavy.
- Use beigey color for comment form in Maniphest.
- Share more CSS between Maniphest and Differential (previews, feedback).
- Move "Leap Into Action" call to Differential, replace Maniphest with
thematically-consistent "Weigh In" (obviously, Maniphest has a nautical theme).
Test Plan:
Browsed Maniphest and Differential in a couple browsers, styling all seems
correct.
Reviewed By: tomo
Reviewers: tomo, aran, jungejason, tuomaspelkonen
CC: anjali, aran, tomo
Differential Revision: 328
2011-05-22 17:49:07 +02:00
|
|
|
|
2011-01-30 20:02:22 +01:00
|
|
|
return
|
2012-08-22 00:01:20 +02:00
|
|
|
id(new PhabricatorAnchorView())
|
|
|
|
->setAnchorName('comment')
|
|
|
|
->setNavigationMarker(true)
|
|
|
|
->render().
|
2011-06-08 21:39:03 +02:00
|
|
|
'<div class="differential-add-comment-panel">'.
|
2012-11-01 21:30:37 +01:00
|
|
|
$header->render().
|
|
|
|
$form->render().
|
|
|
|
$warning_container.
|
2011-06-08 21:39:03 +02:00
|
|
|
'<div class="aphront-panel-preview aphront-panel-flush">'.
|
|
|
|
'<div id="comment-preview">'.
|
|
|
|
'<span class="aphront-panel-preview-loading-text">'.
|
|
|
|
'Loading comment preview...'.
|
|
|
|
'</span>'.
|
|
|
|
'</div>'.
|
|
|
|
'<div id="inline-comment-preview">'.
|
|
|
|
'</div>'.
|
2011-02-01 03:05:20 +01:00
|
|
|
'</div>'.
|
2011-01-30 20:02:22 +01:00
|
|
|
'</div>';
|
|
|
|
}
|
|
|
|
}
|