2011-01-16 22:51:39 +01:00
|
|
|
<?php
|
|
|
|
|
2012-03-14 00:21:04 +01:00
|
|
|
final class AphrontDialogView extends AphrontView {
|
2011-01-16 22:51:39 +01:00
|
|
|
|
|
|
|
private $title;
|
2014-03-21 22:40:05 +01:00
|
|
|
private $shortTitle;
|
2011-01-16 22:51:39 +01:00
|
|
|
private $submitButton;
|
|
|
|
private $cancelURI;
|
2011-05-28 20:36:00 +02:00
|
|
|
private $cancelText = 'Cancel';
|
2011-01-16 22:51:39 +01:00
|
|
|
private $submitURI;
|
2011-02-02 01:42:36 +01:00
|
|
|
private $hidden = array();
|
2011-02-17 07:14:09 +01:00
|
|
|
private $class;
|
2011-02-17 23:32:01 +01:00
|
|
|
private $renderAsForm = true;
|
|
|
|
private $formID;
|
2013-08-26 20:53:11 +02:00
|
|
|
private $headerColor = PhabricatorActionHeaderView::HEADER_LIGHTBLUE;
|
2013-06-17 01:31:14 +02:00
|
|
|
private $footers = array();
|
|
|
|
private $isStandalone;
|
2013-06-20 23:13:53 +02:00
|
|
|
private $method = 'POST';
|
2014-03-13 02:17:11 +01:00
|
|
|
private $disableWorkflowOnSubmit;
|
|
|
|
private $disableWorkflowOnCancel;
|
|
|
|
private $width = 'default';
|
2014-04-03 20:23:03 +02:00
|
|
|
private $errors;
|
2013-06-20 23:13:53 +02:00
|
|
|
|
2014-03-13 02:17:11 +01:00
|
|
|
const WIDTH_DEFAULT = 'default';
|
|
|
|
const WIDTH_FORM = 'form';
|
|
|
|
const WIDTH_FULL = 'full';
|
2013-06-20 23:13:53 +02:00
|
|
|
|
|
|
|
public function setMethod($method) {
|
|
|
|
$this->method = $method;
|
|
|
|
return $this;
|
|
|
|
}
|
2013-06-17 01:31:14 +02:00
|
|
|
|
|
|
|
public function setIsStandalone($is_standalone) {
|
|
|
|
$this->isStandalone = $is_standalone;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2014-04-03 20:23:03 +02:00
|
|
|
public function setErrors(array $errors) {
|
|
|
|
$this->errors = $errors;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2013-06-17 01:31:14 +02:00
|
|
|
public function getIsStandalone() {
|
|
|
|
return $this->isStandalone;
|
|
|
|
}
|
2011-02-02 01:42:36 +01:00
|
|
|
|
2011-01-16 22:51:39 +01:00
|
|
|
public function setSubmitURI($uri) {
|
|
|
|
$this->submitURI = $uri;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function setTitle($title) {
|
|
|
|
$this->title = $title;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getTitle() {
|
|
|
|
return $this->title;
|
|
|
|
}
|
|
|
|
|
2014-03-21 22:40:05 +01:00
|
|
|
public function setShortTitle($short_title) {
|
|
|
|
$this->shortTitle = $short_title;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getShortTitle() {
|
|
|
|
return $this->shortTitle;
|
|
|
|
}
|
|
|
|
|
2013-03-02 00:37:32 +01:00
|
|
|
public function addSubmitButton($text = null) {
|
|
|
|
if (!$text) {
|
|
|
|
$text = pht('Okay');
|
|
|
|
}
|
|
|
|
|
2011-01-16 22:51:39 +01:00
|
|
|
$this->submitButton = $text;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2013-03-02 00:37:32 +01:00
|
|
|
public function addCancelButton($uri, $text = null) {
|
|
|
|
if (!$text) {
|
|
|
|
$text = pht('Cancel');
|
|
|
|
}
|
|
|
|
|
2011-01-16 22:51:39 +01:00
|
|
|
$this->cancelURI = $uri;
|
2011-05-28 20:36:00 +02:00
|
|
|
$this->cancelText = $text;
|
2011-01-16 22:51:39 +01:00
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2013-06-17 01:31:14 +02:00
|
|
|
public function addFooter($footer) {
|
|
|
|
$this->footers[] = $footer;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-02-02 01:42:36 +01:00
|
|
|
public function addHiddenInput($key, $value) {
|
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
|
|
|
if (is_array($value)) {
|
|
|
|
foreach ($value as $hidden_key => $hidden_value) {
|
|
|
|
$this->hidden[] = array($key.'['.$hidden_key.']', $hidden_value);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
$this->hidden[] = array($key, $value);
|
|
|
|
}
|
2011-02-02 01:42:36 +01:00
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-02-17 07:14:09 +01:00
|
|
|
public function setClass($class) {
|
|
|
|
$this->class = $class;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-02-17 23:32:01 +01:00
|
|
|
public function setRenderDialogAsDiv() {
|
|
|
|
// TODO: This API is awkward.
|
|
|
|
$this->renderAsForm = false;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function setFormID($id) {
|
|
|
|
$this->formID = $id;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2011-06-10 00:28:29 +02:00
|
|
|
public function setWidth($width) {
|
|
|
|
$this->width = $width;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
2013-04-10 00:50:48 +02:00
|
|
|
public function setHeaderColor($color) {
|
|
|
|
$this->headerColor = $color;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
Improve handling of email verification and "activated" accounts
Summary:
Small step forward which improves existing stuff or lays groudwork for future stuff:
- Currently, to check for email verification, we have to single-query the email address on every page. Instead, denoramlize it into the user object.
- Migrate all the existing users.
- When the user verifies an email, mark them as `isEmailVerified` if the email is their primary email.
- Just make the checks look at the `isEmailVerified` field.
- Add a new check, `isUserActivated()`, to cover email-verified plus disabled. Currently, a non-verified-but-not-disabled user could theoretically use Conduit over SSH, if anyone deployed it. Tighten that up.
- Add an `isApproved` flag, which is always true for now. In a future diff, I want to add a default-on admin approval queue for new accounts, to prevent configuration mistakes. The way it will work is:
- When the queue is enabled, registering users are created with `isApproved = false`.
- Admins are sent an email, "[Phabricator] New User Approval (alincoln)", telling them that a new user is waiting for approval.
- They go to the web UI and approve the user.
- Manually-created accounts are auto-approved.
- The email will have instructions for disabling the queue.
I think this queue will be helpful for new installs and give them peace of mind, and when you go to disable it we have a better opportunity to warn you about exactly what that means.
Generally, I want to improve the default safety of registration, since if you just blindly coast through the path of least resistance right now your install ends up pretty open, and realistically few installs are on VPNs.
Test Plan:
- Ran migration, verified `isEmailVerified` populated correctly.
- Created a new user, checked DB for verified (not verified).
- Verified, checked DB (now verified).
- Used Conduit, People, Diffusion.
Reviewers: btrahan
Reviewed By: btrahan
CC: chad, aran
Differential Revision: https://secure.phabricator.com/D7572
2013-11-12 23:37:04 +01:00
|
|
|
public function appendParagraph($paragraph) {
|
|
|
|
return $this->appendChild(
|
|
|
|
phutil_tag(
|
|
|
|
'p',
|
|
|
|
array(
|
|
|
|
'class' => 'aphront-dialog-view-paragraph',
|
|
|
|
),
|
|
|
|
$paragraph));
|
|
|
|
}
|
|
|
|
|
2014-03-13 02:17:11 +01:00
|
|
|
public function setDisableWorkflowOnSubmit($disable_workflow_on_submit) {
|
|
|
|
$this->disableWorkflowOnSubmit = $disable_workflow_on_submit;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getDisableWorkflowOnSubmit() {
|
|
|
|
return $this->disableWorkflowOnSubmit;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function setDisableWorkflowOnCancel($disable_workflow_on_cancel) {
|
|
|
|
$this->disableWorkflowOnCancel = $disable_workflow_on_cancel;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getDisableWorkflowOnCancel() {
|
|
|
|
return $this->disableWorkflowOnCancel;
|
|
|
|
}
|
|
|
|
|
2011-01-16 22:51:39 +01:00
|
|
|
final public function render() {
|
2011-01-25 20:31:40 +01:00
|
|
|
require_celerity_resource('aphront-dialog-view-css');
|
2011-01-16 22:51:39 +01:00
|
|
|
|
|
|
|
$buttons = array();
|
|
|
|
if ($this->submitButton) {
|
2014-03-13 02:17:11 +01:00
|
|
|
$meta = array();
|
|
|
|
if ($this->disableWorkflowOnSubmit) {
|
|
|
|
$meta['disableWorkflow'] = true;
|
|
|
|
}
|
|
|
|
|
2013-01-25 21:57:17 +01:00
|
|
|
$buttons[] = javelin_tag(
|
2011-02-05 02:53:14 +01:00
|
|
|
'button',
|
|
|
|
array(
|
|
|
|
'name' => '__submit__',
|
|
|
|
'sigil' => '__default__',
|
2014-03-12 19:26:43 +01:00
|
|
|
'type' => 'submit',
|
2014-03-13 02:17:11 +01:00
|
|
|
'meta' => $meta,
|
2011-02-05 02:53:14 +01:00
|
|
|
),
|
2013-01-25 21:57:17 +01:00
|
|
|
$this->submitButton);
|
2011-01-16 22:51:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if ($this->cancelURI) {
|
2014-03-13 02:17:11 +01:00
|
|
|
$meta = array();
|
|
|
|
if ($this->disableWorkflowOnCancel) {
|
|
|
|
$meta['disableWorkflow'] = true;
|
|
|
|
}
|
|
|
|
|
2013-01-25 21:57:17 +01:00
|
|
|
$buttons[] = javelin_tag(
|
2011-01-16 22:51:39 +01:00
|
|
|
'a',
|
|
|
|
array(
|
|
|
|
'href' => $this->cancelURI,
|
|
|
|
'class' => 'button grey',
|
2011-02-02 01:42:36 +01:00
|
|
|
'name' => '__cancel__',
|
|
|
|
'sigil' => 'jx-workflow-button',
|
2014-03-13 02:17:11 +01:00
|
|
|
'meta' => $meta,
|
2011-01-16 22:51:39 +01:00
|
|
|
),
|
2013-01-25 21:57:17 +01:00
|
|
|
$this->cancelText);
|
2011-01-16 22:51:39 +01:00
|
|
|
}
|
|
|
|
|
2011-02-02 01:42:36 +01:00
|
|
|
if (!$this->user) {
|
|
|
|
throw new Exception(
|
2013-03-02 00:37:32 +01:00
|
|
|
pht("You must call setUser() when rendering an AphrontDialogView."));
|
2011-02-02 01:42:36 +01:00
|
|
|
}
|
2011-02-17 23:32:01 +01:00
|
|
|
|
|
|
|
$more = $this->class;
|
|
|
|
|
2011-06-10 00:28:29 +02:00
|
|
|
switch ($this->width) {
|
|
|
|
case self::WIDTH_FORM:
|
2012-12-11 23:01:51 +01:00
|
|
|
case self::WIDTH_FULL:
|
2011-06-10 00:28:29 +02:00
|
|
|
$more .= ' aphront-dialog-view-width-'.$this->width;
|
|
|
|
break;
|
|
|
|
case self::WIDTH_DEFAULT:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
throw new Exception("Unknown dialog width '{$this->width}'!");
|
|
|
|
}
|
|
|
|
|
2013-06-17 01:31:14 +02:00
|
|
|
if ($this->isStandalone) {
|
|
|
|
$more .= ' aphront-dialog-view-standalone';
|
|
|
|
}
|
|
|
|
|
2011-02-17 23:32:01 +01:00
|
|
|
$attributes = array(
|
|
|
|
'class' => 'aphront-dialog-view '.$more,
|
|
|
|
'sigil' => 'jx-dialog',
|
|
|
|
);
|
|
|
|
|
|
|
|
$form_attributes = array(
|
|
|
|
'action' => $this->submitURI,
|
2013-06-20 23:13:53 +02:00
|
|
|
'method' => $this->method,
|
2011-02-17 23:32:01 +01:00
|
|
|
'id' => $this->formID,
|
|
|
|
);
|
2011-02-02 01:42:36 +01:00
|
|
|
|
|
|
|
$hidden_inputs = array();
|
2013-02-13 23:50:15 +01:00
|
|
|
$hidden_inputs[] = phutil_tag(
|
|
|
|
'input',
|
|
|
|
array(
|
|
|
|
'type' => 'hidden',
|
|
|
|
'name' => '__dialog__',
|
|
|
|
'value' => '1',
|
|
|
|
));
|
|
|
|
|
2011-02-17 23:32:01 +01:00
|
|
|
foreach ($this->hidden as $desc) {
|
|
|
|
list($key, $value) = $desc;
|
2013-01-25 21:57:17 +01:00
|
|
|
$hidden_inputs[] = javelin_tag(
|
2011-02-02 01:42:36 +01:00
|
|
|
'input',
|
|
|
|
array(
|
|
|
|
'type' => 'hidden',
|
|
|
|
'name' => $key,
|
|
|
|
'value' => $value,
|
2011-02-17 23:32:01 +01:00
|
|
|
'sigil' => 'aphront-dialog-application-input'
|
2011-02-02 01:42:36 +01:00
|
|
|
));
|
|
|
|
}
|
2011-02-17 07:14:09 +01:00
|
|
|
|
2011-02-17 23:32:01 +01:00
|
|
|
if (!$this->renderAsForm) {
|
2013-02-13 23:50:15 +01:00
|
|
|
$buttons = array(phabricator_form(
|
2011-02-17 23:32:01 +01:00
|
|
|
$this->user,
|
|
|
|
$form_attributes,
|
2013-02-13 23:50:15 +01:00
|
|
|
array_merge($hidden_inputs, $buttons)));
|
2011-02-17 23:32:01 +01:00
|
|
|
}
|
|
|
|
|
2013-02-13 23:50:15 +01:00
|
|
|
$children = $this->renderChildren();
|
|
|
|
|
2014-04-03 20:23:03 +02:00
|
|
|
if ($this->errors) {
|
|
|
|
$children = array(
|
|
|
|
id(new AphrontErrorView())->setErrors($this->errors),
|
|
|
|
$children);
|
|
|
|
}
|
|
|
|
|
2013-04-10 00:50:48 +02:00
|
|
|
$header = new PhabricatorActionHeaderView();
|
|
|
|
$header->setHeaderTitle($this->title);
|
|
|
|
$header->setHeaderColor($this->headerColor);
|
|
|
|
|
2013-06-17 01:31:14 +02:00
|
|
|
$footer = null;
|
|
|
|
if ($this->footers) {
|
|
|
|
$footer = phutil_tag(
|
|
|
|
'div',
|
|
|
|
array(
|
|
|
|
'class' => 'aphront-dialog-foot',
|
|
|
|
),
|
|
|
|
$this->footers);
|
|
|
|
}
|
|
|
|
|
|
|
|
$content = array(
|
|
|
|
phutil_tag(
|
|
|
|
'div',
|
|
|
|
array(
|
|
|
|
'class' => 'aphront-dialog-head',
|
|
|
|
),
|
|
|
|
$header),
|
2013-05-30 17:30:56 +02:00
|
|
|
phutil_tag('div',
|
2013-06-17 01:31:14 +02:00
|
|
|
array(
|
|
|
|
'class' => 'aphront-dialog-body grouped',
|
|
|
|
),
|
|
|
|
$children),
|
|
|
|
phutil_tag(
|
|
|
|
'div',
|
|
|
|
array(
|
|
|
|
'class' => 'aphront-dialog-tail grouped',
|
|
|
|
),
|
|
|
|
array(
|
|
|
|
$buttons,
|
|
|
|
$footer,
|
|
|
|
)),
|
|
|
|
);
|
2011-02-17 23:32:01 +01:00
|
|
|
|
|
|
|
if ($this->renderAsForm) {
|
2013-02-13 23:50:15 +01:00
|
|
|
return phabricator_form(
|
2011-02-17 23:32:01 +01:00
|
|
|
$this->user,
|
|
|
|
$form_attributes + $attributes,
|
2013-02-13 23:50:15 +01:00
|
|
|
array($hidden_inputs, $content));
|
2011-02-17 23:32:01 +01:00
|
|
|
} else {
|
2013-02-13 23:50:15 +01:00
|
|
|
return javelin_tag(
|
2011-02-17 23:32:01 +01:00
|
|
|
'div',
|
|
|
|
$attributes,
|
|
|
|
$content);
|
|
|
|
}
|
2011-01-16 22:51:39 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|