revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-27 07:50:57 +01:00
Code Issues Releases Wiki Activity

Ability to add reviewers while requesting review

Browse source 
Summary: It makes perfect sense to add more reviewers while requesting review.

Test Plan:
Request review. Verify that Add Reviewers field shows and works.
Add some reviewer. Verify that comment preview works.
Submit. Verify that reviewers are saved and displayed.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D1473
This commit is contained in:
vrana 2012-01-23 18:34:46 -08:00
parent 549146bc7c
commit 6a17de65df
5 changed files with 99 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
src/__celerity_resource_map__.php
View file

@ -27,7 +27,7 @@ celerity_register_resource_map(array(
),
'aphront-contextbar-view-css' =>
array(
'uri' => '/res/3e2f3045/rsrc/css/aphront/context-bar.css',
'uri' => '/res/9e0c2ed7/rsrc/css/aphront/context-bar.css',
'type' => 'css',
'requires' =>
array(
@ -330,17 +330,6 @@ celerity_register_resource_map(array(
),
'disk' => '/rsrc/js/javelin/lib/behavior.js',
),
0 =>
array(
'uri' => '/res/b6096fdd/rsrc/js/javelin/lib/__tests__/URI.js',
'type' => 'js',
'requires' =>
array(
0 => 'javelin-uri',
1 => 'javelin-php-serializer',
),
'disk' => '/rsrc/js/javelin/lib/__tests__/URI.js',
),
'javelin-behavior-aphront-basic-tokenizer' =>
array(
'uri' => '/res/9be30797/rsrc/js/application/core/behavior-tokenizer.js',
@ -434,7 +423,7 @@ celerity_register_resource_map(array(
),
'javelin-behavior-differential-add-reviewers-and-ccs' =>
array(
'uri' => '/res/99e1b311/rsrc/js/application/differential/behavior-add-reviewers-and-ccs.js',
'uri' => '/res/eb142486/rsrc/js/application/differential/behavior-add-reviewers-and-ccs.js',
'type' => 'js',
'requires' =>
array(
@ -1490,6 +1479,17 @@ celerity_register_resource_map(array(
),
'disk' => '/rsrc/css/application/profile/profile-header-view.css',
),
0 =>
array(
'uri' => '/res/b6096fdd/rsrc/js/javelin/lib/__tests__/URI.js',
'type' => 'js',
'requires' =>
array(
0 => 'javelin-uri',
1 => 'javelin-php-serializer',
),
'disk' => '/rsrc/js/javelin/lib/__tests__/URI.js',
),
'phabricator-remarkup-css' =>
array(
'uri' => '/res/39f358b8/rsrc/css/core/remarkup.css',
@ -1729,30 +1729,6 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/03ef179e/diffusion.pkg.css',
'type' => 'css',
),
'15c4a6dd' =>
array(
'name' => 'differential.pkg.js',
'symbols' =>
array(
0 => 'phabricator-drag-and-drop-file-upload',
1 => 'phabricator-shaped-request',
2 => 'javelin-behavior-differential-feedback-preview',
3 => 'javelin-behavior-differential-edit-inline-comments',
4 => 'javelin-behavior-differential-populate',
5 => 'javelin-behavior-differential-show-more',
6 => 'javelin-behavior-differential-diff-radios',
7 => 'javelin-behavior-differential-accept-with-errors',
8 => 'javelin-behavior-differential-comment-jump',
9 => 'javelin-behavior-differential-add-reviewers-and-ccs',
10 => 'javelin-behavior-differential-keyboard-navigation',
11 => 'javelin-behavior-aphront-drag-and-drop',
12 => 'javelin-behavior-aphront-drag-and-drop-textarea',
13 => 'javelin-behavior-phabricator-object-selector',
14 => 'differential-inline-comment-editor',
),
'uri' => '/res/pkg/15c4a6dd/differential.pkg.js',
'type' => 'js',
),
'46547a92' =>
array(
'name' => 'core.pkg.js',
@ -1851,6 +1827,30 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/b164acea/javelin.pkg.js',
'type' => 'js',
),
'e2820c7b' =>
array(
'name' => 'differential.pkg.js',
'symbols' =>
array(
0 => 'phabricator-drag-and-drop-file-upload',
1 => 'phabricator-shaped-request',
2 => 'javelin-behavior-differential-feedback-preview',
3 => 'javelin-behavior-differential-edit-inline-comments',
4 => 'javelin-behavior-differential-populate',
5 => 'javelin-behavior-differential-show-more',
6 => 'javelin-behavior-differential-diff-radios',
7 => 'javelin-behavior-differential-accept-with-errors',
8 => 'javelin-behavior-differential-comment-jump',
9 => 'javelin-behavior-differential-add-reviewers-and-ccs',
10 => 'javelin-behavior-differential-keyboard-navigation',
11 => 'javelin-behavior-aphront-drag-and-drop',
12 => 'javelin-behavior-aphront-drag-and-drop-textarea',
13 => 'javelin-behavior-phabricator-object-selector',
14 => 'differential-inline-comment-editor',
),
'uri' => '/res/pkg/e2820c7b/differential.pkg.js',
'type' => 'js',
),
),
'reverse' =>
array(
@ -1866,7 +1866,7 @@ celerity_register_resource_map(array(
'aphront-typeahead-control-css' => '775f5bae',
'differential-changeset-view-css' => '80580cea',
'differential-core-view-css' => '80580cea',
'differential-inline-comment-editor' => '15c4a6dd',
'differential-inline-comment-editor' => 'e2820c7b',
'differential-local-commits-view-css' => '80580cea',
'differential-revision-add-comment-css' => '80580cea',
'differential-revision-comment-css' => '80580cea',
@ -1877,20 +1877,20 @@ celerity_register_resource_map(array(
'diffusion-commit-view-css' => '03ef179e',
'javelin-behavior' => 'b164acea',
'javelin-behavior-aphront-basic-tokenizer' => '540effd7',
'javelin-behavior-aphront-drag-and-drop' => '15c4a6dd',
'javelin-behavior-aphront-drag-and-drop-textarea' => '15c4a6dd',
'javelin-behavior-aphront-drag-and-drop' => 'e2820c7b',
'javelin-behavior-aphront-drag-and-drop-textarea' => 'e2820c7b',
'javelin-behavior-aphront-form-disable-on-submit' => '46547a92',
'javelin-behavior-differential-accept-with-errors' => '15c4a6dd',
'javelin-behavior-differential-add-reviewers-and-ccs' => '15c4a6dd',
'javelin-behavior-differential-comment-jump' => '15c4a6dd',
'javelin-behavior-differential-diff-radios' => '15c4a6dd',
'javelin-behavior-differential-edit-inline-comments' => '15c4a6dd',
'javelin-behavior-differential-feedback-preview' => '15c4a6dd',
'javelin-behavior-differential-keyboard-navigation' => '15c4a6dd',
'javelin-behavior-differential-populate' => '15c4a6dd',
'javelin-behavior-differential-show-more' => '15c4a6dd',
'javelin-behavior-differential-accept-with-errors' => 'e2820c7b',
'javelin-behavior-differential-add-reviewers-and-ccs' => 'e2820c7b',
'javelin-behavior-differential-comment-jump' => 'e2820c7b',
'javelin-behavior-differential-diff-radios' => 'e2820c7b',
'javelin-behavior-differential-edit-inline-comments' => 'e2820c7b',
'javelin-behavior-differential-feedback-preview' => 'e2820c7b',
'javelin-behavior-differential-keyboard-navigation' => 'e2820c7b',
'javelin-behavior-differential-populate' => 'e2820c7b',
'javelin-behavior-differential-show-more' => 'e2820c7b',
'javelin-behavior-phabricator-keyboard-shortcuts' => '46547a92',
'javelin-behavior-phabricator-object-selector' => '15c4a6dd',
'javelin-behavior-phabricator-object-selector' => 'e2820c7b',
'javelin-behavior-phabricator-watch-anchor' => '46547a92',
'javelin-behavior-refresh-csrf' => '46547a92',
'javelin-behavior-workflow' => '46547a92',
@ -1915,12 +1915,12 @@ celerity_register_resource_map(array(
'phabricator-core-buttons-css' => '775f5bae',
'phabricator-core-css' => '775f5bae',
'phabricator-directory-css' => '775f5bae',
'phabricator-drag-and-drop-file-upload' => '15c4a6dd',
'phabricator-drag-and-drop-file-upload' => 'e2820c7b',
'phabricator-keyboard-shortcut' => '46547a92',
'phabricator-keyboard-shortcut-manager' => '46547a92',
'phabricator-object-selector-css' => '80580cea',
'phabricator-remarkup-css' => '775f5bae',
'phabricator-shaped-request' => '15c4a6dd',
'phabricator-shaped-request' => 'e2820c7b',
'phabricator-standard-page-view' => '775f5bae',
'syntax-highlighting-css' => '775f5bae',
),

3
src/applications/differential/controller/commentpreview/DifferentialCommentPreviewController.php
View file

@ -42,7 +42,8 @@ class DifferentialCommentPreviewController extends DifferentialController {
$handles = array($author_phid);
$reviewers = $request->getStr('reviewers');
if ($action == DifferentialAction::ACTION_ADDREVIEWERS && $reviewers) {
if (($action == DifferentialAction::ACTION_ADDREVIEWERS
|| $action == DifferentialAction::ACTION_REQUEST) && $reviewers) {
$reviewers = explode(',', $reviewers);
$comment->setMetadata(array(
DifferentialComment::METADATA_ADDED_REVIEWERS => $reviewers));

56
src/applications/differential/editor/comment/DifferentialCommentEditor.php
View file

@ -228,6 +228,12 @@ class DifferentialCommentEditor {
"Unexpected revision state '{$revision_status}'!");
}
$added_reviewers = $this->addReviewers();
if ($added_reviewers) {
$key = DifferentialComment::METADATA_ADDED_REVIEWERS;
$metadata[$key] = $added_reviewers;
}
break;
case DifferentialAction::ACTION_REJECT:
@ -319,32 +325,14 @@ class DifferentialCommentEditor {
break;
case DifferentialAction::ACTION_ADDREVIEWERS:
$added_reviewers = $this->getAddedReviewers();
$user_tried_to_add = count($added_reviewers);
foreach ($added_reviewers as $k => $user_phid) {
if ($user_phid == $revision->getAuthorPHID()) {
unset($added_reviewers[$k]);
}
if (!empty($reviewer_phids[$user_phid])) {
unset($added_reviewers[$k]);
}
}
$added_reviewers = array_unique($added_reviewers);
$added_reviewers = $this->addReviewers();
if ($added_reviewers) {
DifferentialRevisionEditor::alterReviewers(
$revision,
$reviewer_phids,
$rem = array(),
$add = $added_reviewers,
$actor_phid);
$key = DifferentialComment::METADATA_ADDED_REVIEWERS;
$metadata[$key] = $added_reviewers;
} else {
$user_tried_to_add = count($this->getAddedReviewers());
if ($user_tried_to_add == 0) {
throw new DifferentialActionHasNoEffectException(
"You can not add reviewers, because you did not specify any ".
@ -550,4 +538,32 @@ class DifferentialCommentEditor {
return $ccs;
}
private function addReviewers() {
$revision = $this->revision;
$added_reviewers = $this->getAddedReviewers();
$reviewer_phids = $revision->getReviewers();
foreach ($added_reviewers as $k => $user_phid) {
if ($user_phid == $revision->getAuthorPHID()) {
unset($added_reviewers[$k]);
}
if (!empty($reviewer_phids[$user_phid])) {
unset($added_reviewers[$k]);
}
}
$added_reviewers = array_unique($added_reviewers);
if ($added_reviewers) {
DifferentialRevisionEditor::alterReviewers(
$revision,
$reviewer_phids,
$rem = array(),
$added_reviewers,
$this->actorPHID);
}
return $added_reviewers;
}
}

8
src/applications/differential/view/addcomment/DifferentialAddCommentView.php
View file

@ -123,14 +123,14 @@ final class DifferentialAddCommentView extends AphrontView {
'differential-add-reviewers-and-ccs',
array(
'dynamic' => array(
'add_reviewers' => array(
'tokenizer' => 'add-reviewers-tokenizer',
'add-reviewers-tokenizer' => array(
'actions' => array('request_review' => 1, 'add_reviewers' => 1),
'src' => '/typeahead/common/users/',
'row' => 'add-reviewers',
'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
),
'add_ccs' => array(
'tokenizer' => 'add-ccs-tokenizer',
'add-ccs-tokenizer' => array(
'actions' => array('add_ccs' => 1),
'src' => '/typeahead/common/mailable/',
'row' => 'add-ccs',
'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),

9
webroot/rsrc/js/application/differential/behavior-add-reviewers-and-ccs.js
View file

@ -9,8 +9,8 @@
JX.behavior('differential-add-reviewers-and-ccs', function(config) {
function buildTokenizer(props) {
var root = JX.$(props.tokenizer);
function buildTokenizer(id, props) {
var root = JX.$(id);
var datasource;
if (props.ondemand) {
@ -37,7 +37,8 @@ JX.behavior('differential-add-reviewers-and-ccs', function(config) {
props = config.dynamic[k];
dynamic[k] = {
row : JX.$(props.row),
tokenizer : buildTokenizer(props)
tokenizer : buildTokenizer(k, props),
actions : props.actions
};
}
@ -48,7 +49,7 @@ JX.behavior('differential-add-reviewers-and-ccs', function(config) {
function(e) {
var v = JX.$(config.select).value;
for (var k in dynamic) {
if (v == k) {
if (dynamic[k].actions[v]) {
JX.DOM.show(dynamic[k].row);
dynamic[k].tokenizer.refresh();
} else {