revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-01-24 21:48:21 +01:00
Code Issues Releases Wiki Activity

(stable) Promote 2019 Week 43

Browse source
This commit is contained in:
epriestley 2019-10-26 08:24:39 -07:00
commit a787b37db4
28 changed files with 366 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
resources/celerity/map.php
View file

@ -9,7 +9,7 @@ return array(
'names' => array(
'conpherence.pkg.css' => '3c8a0668',
'conpherence.pkg.js' => '020aebcf',
'core.pkg.css' => '7ce5a944',
'core.pkg.css' => '686ae87c',
'core.pkg.js' => '6e5c894f',
'differential.pkg.css' => '607c84be',
'differential.pkg.js' => 'a0212a0b',
@ -36,7 +36,7 @@ return array(
'rsrc/css/aphront/typeahead-browse.css' => 'b7ed02d2',
'rsrc/css/aphront/typeahead.css' => '8779483d',
'rsrc/css/application/almanac/almanac.css' => '2e050f4f',
'rsrc/css/application/auth/auth.css' => 'add92fd8',
'rsrc/css/application/auth/auth.css' => 'c2f23d74',
'rsrc/css/application/base/main-menu-view.css' => '17b71bbc',
'rsrc/css/application/base/notification-menu.css' => '4df1ee30',
'rsrc/css/application/base/phui-theme.css' => '35883b37',
@ -169,7 +169,7 @@ return array(
'rsrc/css/phui/phui-pager.css' => 'd022c7ad',
'rsrc/css/phui/phui-pinboard-view.css' => '1f08f5d8',
'rsrc/css/phui/phui-policy-section-view.css' => '139fdc64',
'rsrc/css/phui/phui-property-list-view.css' => '807b1632',
'rsrc/css/phui/phui-property-list-view.css' => '9c477af1',
'rsrc/css/phui/phui-remarkup-preview.css' => '91767007',
'rsrc/css/phui/phui-segment-bar-view.css' => '5166b370',
'rsrc/css/phui/phui-spacing.css' => 'b05cadc3',
@ -540,7 +540,7 @@ return array(
'aphront-tooltip-css' => 'e3f2412f',
'aphront-typeahead-control-css' => '8779483d',
'application-search-view-css' => '0f7c06d8',
'auth-css' => 'add92fd8',
'auth-css' => 'c2f23d74',
'bulk-job-css' => '73af99f5',
'conduit-api-css' => 'ce2cfc41',
'config-options-css' => '16c920ae',
@ -865,7 +865,7 @@ return array(
'phui-pager-css' => 'd022c7ad',
'phui-pinboard-view-css' => '1f08f5d8',
'phui-policy-section-view-css' => '139fdc64',
'phui-property-list-view-css' => '807b1632',
'phui-property-list-view-css' => '9c477af1',
'phui-remarkup-preview-css' => '91767007',
'phui-segment-bar-view-css' => '5166b370',
'phui-spacing-css' => 'b05cadc3',

4
src/__phutil_library_map__.php
View file

@ -996,6 +996,7 @@ phutil_register_library_map(array(
'DiffusionRepositoryManagementOtherPanelGroup' => 'applications/diffusion/management/DiffusionRepositoryManagementOtherPanelGroup.php',
'DiffusionRepositoryManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryManagementPanel.php',
'DiffusionRepositoryManagementPanelGroup' => 'applications/diffusion/management/DiffusionRepositoryManagementPanelGroup.php',
'DiffusionRepositoryMetricsSearchEngineAttachment' => 'applications/diffusion/engineextension/DiffusionRepositoryMetricsSearchEngineAttachment.php',
'DiffusionRepositoryPath' => 'applications/diffusion/data/DiffusionRepositoryPath.php',
'DiffusionRepositoryPoliciesManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryPoliciesManagementPanel.php',
'DiffusionRepositoryProfilePictureController' => 'applications/diffusion/controller/DiffusionRepositoryProfilePictureController.php',
@ -5044,6 +5045,7 @@ phutil_register_library_map(array(
'PhabricatorWeekStartDaySetting' => 'applications/settings/setting/PhabricatorWeekStartDaySetting.php',
'PhabricatorWildConfigType' => 'applications/config/type/PhabricatorWildConfigType.php',
'PhabricatorWordPressAuthProvider' => 'applications/auth/provider/PhabricatorWordPressAuthProvider.php',
'PhabricatorWorkboardInterface' => 'applications/project/interface/PhabricatorWorkboardInterface.php',
'PhabricatorWorkboardViewState' => 'applications/project/state/PhabricatorWorkboardViewState.php',
'PhabricatorWorker' => 'infrastructure/daemon/workers/PhabricatorWorker.php',
'PhabricatorWorkerActiveTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerActiveTask.php',
@ -6963,6 +6965,7 @@ phutil_register_library_map(array(
'DiffusionRepositoryManagementOtherPanelGroup' => 'DiffusionRepositoryManagementPanelGroup',
'DiffusionRepositoryManagementPanel' => 'Phobject',
'DiffusionRepositoryManagementPanelGroup' => 'Phobject',
'DiffusionRepositoryMetricsSearchEngineAttachment' => 'PhabricatorSearchEngineAttachment',
'DiffusionRepositoryPath' => 'Phobject',
'DiffusionRepositoryPoliciesManagementPanel' => 'DiffusionRepositoryManagementPanel',
'DiffusionRepositoryProfilePictureController' => 'DiffusionController',
@ -10748,6 +10751,7 @@ phutil_register_library_map(array(
'PhabricatorColumnProxyInterface',
'PhabricatorSpacesInterface',
'PhabricatorEditEngineSubtypeInterface',
'PhabricatorWorkboardInterface',
),
'PhabricatorProjectActivityChartEngine' => 'PhabricatorChartEngine',
'PhabricatorProjectAddHeraldAction' => 'PhabricatorProjectHeraldAction',

22
src/applications/auth/controller/PhabricatorAuthController.php
View file

@ -286,4 +286,26 @@ abstract class PhabricatorAuthController extends PhabricatorController {
->appendChild($invite_list);
}
final protected function newCustomStartMessage() {
$viewer = $this->getViewer();
$text = PhabricatorAuthMessage::loadMessageText(
$viewer,
PhabricatorAuthLoginMessageType::MESSAGEKEY);
if (!strlen($text)) {
return null;
}
$remarkup_view = new PHUIRemarkupView($viewer, $text);
return phutil_tag(
'div',
array(
'class' => 'auth-custom-message',
),
$remarkup_view);
}
}

12
src/applications/auth/controller/PhabricatorAuthLoginController.php
View file

@ -238,18 +238,24 @@ final class PhabricatorAuthLoginController
$content) {
$crumbs = $this->buildApplicationCrumbs();
$viewer = $this->getViewer();
if ($this->getRequest()->getUser()->isLoggedIn()) {
if ($viewer->isLoggedIn()) {
$crumbs->addTextCrumb(pht('Link Account'), $provider->getSettingsURI());
} else {
$crumbs->addTextCrumb(pht('Log In'), $this->getApplicationURI('start/'));
$crumbs->addTextCrumb(pht('Login'), $this->getApplicationURI('start/'));
$content = array(
$this->newCustomStartMessage(),
$content,
);
}
$crumbs->addTextCrumb($provider->getProviderName());
$crumbs->setBorder(true);
return $this->newPage()
->setTitle(pht('Log In'))
->setTitle(pht('Login'))
->setCrumbs($crumbs)
->appendChild($content);
}

21
src/applications/auth/controller/PhabricatorAuthStartController.php
View file

@ -298,27 +298,6 @@ final class PhabricatorAuthStartController
->setURI($auto_uri);
}
private function newCustomStartMessage() {
$viewer = $this->getViewer();
$text = PhabricatorAuthMessage::loadMessageText(
$viewer,
PhabricatorAuthLoginMessageType::MESSAGEKEY);
if (!strlen($text)) {
return null;
}
$remarkup_view = new PHUIRemarkupView($viewer, $text);
return phutil_tag(
'div',
array(
'class' => 'auth-custom-message',
),
$remarkup_view);
}
private function newEmailLoginView(array $configs) {
assert_instances_of($configs, 'PhabricatorAuthProviderConfig');

2
src/applications/dashboard/application/PhabricatorDashboardApplication.php
View file

@ -69,7 +69,7 @@ final class PhabricatorDashboardApplication extends PhabricatorApplication {
'PhabricatorDashboardPortalListController',
$this->getEditRoutePattern('edit/') =>
'PhabricatorDashboardPortalEditController',
'view/(?P<portalID>\d)/' => array(
'view/(?P<portalID>\d+)/' => array(
'' => 'PhabricatorDashboardPortalViewController',
) + $menu_rules,

2
src/applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php
View file

@ -103,7 +103,7 @@ final class PhabricatorDifferentialRevisionTestDataGenerator
$newcode2[] = $altcodearr[$randomlines_new[$c++]];
}
}
return implode($newcode2, "\n");
return implode("\n", $newcode2);
}
}

104
src/applications/differential/parser/DifferentialChangesetParser.php
View file

@ -1686,47 +1686,79 @@ final class DifferentialChangesetParser extends Phobject {
break;
}
$old_ref = id(new PhabricatorDocumentRef())
->setName($changeset->getOldFile());
if ($old_file) {
$old_ref->setFile($old_file);
$type_delete = DifferentialChangeType::TYPE_DELETE;
$type_add = DifferentialChangeType::TYPE_ADD;
$change_type = $changeset->getChangeType();
$no_old = ($change_type == $type_add);
$no_new = ($change_type == $type_delete);
if ($no_old) {
$old_ref = null;
} else {
$old_data = $this->old;
$old_data = ipull($old_data, 'text');
$old_data = implode('', $old_data);
$old_ref = id(new PhabricatorDocumentRef())
->setName($changeset->getOldFile());
if ($old_file) {
$old_ref->setFile($old_file);
} else {
$old_data = $this->old;
$old_data = ipull($old_data, 'text');
$old_data = implode('', $old_data);
$old_ref->setData($old_data);
}
$new_ref = id(new PhabricatorDocumentRef())
->setName($changeset->getFilename());
if ($new_file) {
$new_ref->setFile($new_file);
} else {
$new_data = $this->new;
$new_data = ipull($new_data, 'text');
$new_data = implode('', $new_data);
$new_ref->setData($new_data);
}
$old_engines = PhabricatorDocumentEngine::getEnginesForRef(
$viewer,
$old_ref);
$new_engines = PhabricatorDocumentEngine::getEnginesForRef(
$viewer,
$new_ref);
$shared_engines = array_intersect_key($new_engines, $old_engines);
$default_engine = head_key($new_engines);
foreach ($shared_engines as $key => $shared_engine) {
if (!$shared_engine->canDiffDocuments($old_ref, $new_ref)) {
unset($shared_engines[$key]);
$old_ref->setData($old_data);
}
}
if ($no_new) {
$new_ref = null;
} else {
$new_ref = id(new PhabricatorDocumentRef())
->setName($changeset->getFilename());
if ($new_file) {
$new_ref->setFile($new_file);
} else {
$new_data = $this->new;
$new_data = ipull($new_data, 'text');
$new_data = implode('', $new_data);
$new_ref->setData($new_data);
}
}
$old_engines = null;
if ($old_ref) {
$old_engines = PhabricatorDocumentEngine::getEnginesForRef(
$viewer,
$old_ref);
}
$new_engines = null;
if ($new_ref) {
$new_engines = PhabricatorDocumentEngine::getEnginesForRef(
$viewer,
$new_ref);
}
if ($new_engines !== null && $old_engines !== null) {
$shared_engines = array_intersect_key($new_engines, $old_engines);
$default_engine = head_key($new_engines);
foreach ($shared_engines as $key => $shared_engine) {
if (!$shared_engine->canDiffDocuments($old_ref, $new_ref)) {
unset($shared_engines[$key]);
}
}
} else if ($new_engines !== null) {
$shared_engines = $new_engines;
$default_engine = head_key($shared_engines);
} else if ($old_engines !== null) {
$shared_engines = $old_engines;
$default_engine = head_key($shared_engines);
} else {
return null;
}
$engine_key = $this->getDocumentEngineKey();
if (strlen($engine_key)) {
if (isset($shared_engines[$engine_key])) {

10
src/applications/differential/render/DifferentialChangesetOneUpRenderer.php
View file

@ -371,17 +371,27 @@ final class DifferentialChangesetOneUpRenderer
$cell_classes = $block_diff->getNewClasses();
}
} else if ($row_type === 'old') {
if (!$old_ref) {
continue;
}
$cell_content = $engine->newBlockContentView(
$old_ref,
$old);
$cell_classes[] = 'old';
$cell_classes[] = 'old-full';
$new_key = null;
} else if ($row_type === 'new') {
if (!$new_ref) {
continue;
}
$cell_content = $engine->newBlockContentView(
$new_ref,
$new);
$cell_classes[] = 'new';
$cell_classes[] = 'new-full';

41
src/applications/diffusion/engineextension/DiffusionRepositoryMetricsSearchEngineAttachment.php Normal file
View file

@ -0,0 +1,41 @@
<?php
final class DiffusionRepositoryMetricsSearchEngineAttachment
extends PhabricatorSearchEngineAttachment {
public function getAttachmentName() {
return pht('Repository Metrics');
}
public function getAttachmentDescription() {
return pht(
'Get metrics (like commit count and most recent commit) for each '.
'repository.');
}
public function willLoadAttachmentData($query, $spec) {
$query
->needCommitCounts(true)
->needMostRecentCommits(true);
}
public function getAttachmentForObject($object, $data, $spec) {
$commit = $object->getMostRecentCommit();
if ($commit !== null) {
$recent_commit = $commit->getFieldValuesForConduit();
} else {
$recent_commit = null;
}
$commit_count = $object->getCommitCount();
if ($commit_count !== null) {
$commit_count = (int)$commit_count;
}
return array(
'commitCount' => $commit_count,
'recentCommit' => $recent_commit,
);
}
}

5
src/applications/files/diff/PhabricatorDocumentEngineBlocks.php
View file

@ -15,7 +15,10 @@ final class PhabricatorDocumentEngineBlocks
return $this->messages;
}
public function addBlockList(PhabricatorDocumentRef $ref, array $blocks) {
public function addBlockList(
PhabricatorDocumentRef $ref = null,
array $blocks = array()) {
assert_instances_of($blocks, 'PhabricatorDocumentEngineBlock');
$this->lists[] = array(

4
src/applications/files/document/PhabricatorDocumentEngine.php
View file

@ -32,8 +32,8 @@ abstract class PhabricatorDocumentEngine
}
public function canDiffDocuments(
PhabricatorDocumentRef $uref,
PhabricatorDocumentRef $vref) {
PhabricatorDocumentRef $uref = null,
PhabricatorDocumentRef $vref = null) {
return false;
}

33
src/applications/files/document/PhabricatorImageDocumentEngine.php
View file

@ -18,21 +18,38 @@ final class PhabricatorImageDocumentEngine
}
public function canDiffDocuments(
PhabricatorDocumentRef $uref,
PhabricatorDocumentRef $vref) {
PhabricatorDocumentRef $uref = null,
PhabricatorDocumentRef $vref = null) {
// For now, we can only render a rich image diff if both documents have
// For now, we can only render a rich image diff if the documents have
// their data stored in Files already.
return ($uref->getFile() && $vref->getFile());
if ($uref && !$uref->getFile()) {
return false;
}
if ($vref && !$vref->getFile()) {
return false;
}
return true;
}
public function newEngineBlocks(
PhabricatorDocumentRef $uref,
PhabricatorDocumentRef $vref) {
PhabricatorDocumentRef $uref = null,
PhabricatorDocumentRef $vref = null) {
$u_blocks = $this->newDiffBlocks($uref);
$v_blocks = $this->newDiffBlocks($vref);
if ($uref) {
$u_blocks = $this->newDiffBlocks($uref);
} else {
$u_blocks = array();
}
if ($vref) {
$v_blocks = $this->newDiffBlocks($vref);
} else {
$v_blocks = array();
}
return id(new PhabricatorDocumentEngineBlocks())
->addBlockList($uref, $u_blocks)

83
src/applications/files/document/PhabricatorJupyterDocumentEngine.php
View file

@ -36,20 +36,29 @@ final class PhabricatorJupyterDocumentEngine
}
public function canDiffDocuments(
PhabricatorDocumentRef $uref,
PhabricatorDocumentRef $vref) {
PhabricatorDocumentRef $uref = null,
PhabricatorDocumentRef $vref = null) {
return true;
}
public function newEngineBlocks(
PhabricatorDocumentRef $uref,
PhabricatorDocumentRef $vref) {
PhabricatorDocumentRef $uref = null,
PhabricatorDocumentRef $vref = null) {
$blocks = new PhabricatorDocumentEngineBlocks();
try {
$u_blocks = $this->newDiffBlocks($uref);
$v_blocks = $this->newDiffBlocks($vref);
if ($uref) {
$u_blocks = $this->newDiffBlocks($uref);
} else {
$u_blocks = array();
}
if ($vref) {
$v_blocks = $this->newDiffBlocks($vref);
} else {
$v_blocks = array();
}
$blocks->addBlockList($uref, $u_blocks);
$blocks->addBlockList($vref, $v_blocks);
@ -93,6 +102,54 @@ final class PhabricatorJupyterDocumentEngine
$u_content = $this->newCellContainer($u_content);
$v_content = $this->newCellContainer($v_content);
return id(new PhabricatorDocumentEngineBlockDiff())
->setOldContent($u_content)
->addOldClass('old')
->setNewContent($v_content)
->addNewClass('new');
case 'code/line':
$usource = idx($ucell, 'raw');
$vsource = idx($vcell, 'raw');
$udisplay = idx($ucell, 'display');
$vdisplay = idx($vcell, 'display');
$ulabel = idx($ucell, 'label');
$vlabel = idx($vcell, 'label');
$intraline_segments = ArcanistDiffUtils::generateIntralineDiff(
$usource,
$vsource);
$u_segments = array();
foreach ($intraline_segments[0] as $u_segment) {
$u_segments[] = $u_segment;
}
$v_segments = array();
foreach ($intraline_segments[1] as $v_segment) {
$v_segments[] = $v_segment;
}
$usource = ArcanistDiffUtils::applyIntralineDiff(
$udisplay,
$u_segments);
$vsource = ArcanistDiffUtils::applyIntralineDiff(
$vdisplay,
$v_segments);
$u_content = $this->newCodeLineCell($ucell, $usource);
$v_content = $this->newCodeLineCell($vcell, $vsource);
$classes = array(
'jupyter-cell-flush',
);
$u_content = $this->newJupyterCell($ulabel, $u_content, $classes);
$v_content = $this->newJupyterCell($vlabel, $v_content, $classes);
$u_content = $this->newCellContainer($u_content);
$v_content = $this->newCellContainer($v_content);
return id(new PhabricatorDocumentEngineBlockDiff())
->setOldContent($u_content)
->addOldClass('old')
@ -441,8 +498,10 @@ final class PhabricatorJupyterDocumentEngine
return $this->newCodeOutputCell($cell);
}
return $this->newRawCell(id(new PhutilJSON())
->encodeFormatted($cell));
$json_content = id(new PhutilJSON())
->encodeFormatted($cell);
return $this->newRawCell($json_content);
}
private function newRawCell($content) {
@ -514,7 +573,7 @@ final class PhabricatorJupyterDocumentEngine
);
}
private function newCodeLineCell(array $cell) {
private function newCodeLineCell(array $cell, $content = null) {
$classes = array();
$classes[] = 'PhabricatorMonospaced';
$classes[] = 'remarkup-code';
@ -531,6 +590,10 @@ final class PhabricatorJupyterDocumentEngine
$classes = implode(' ', $classes);
if ($content === null) {
$content = $cell['display'];
}
return array(
$cell['label'],
array(
@ -540,7 +603,7 @@ final class PhabricatorJupyterDocumentEngine
'class' => $classes,
),
array(
$cell['display'],
$content,
)),
),
);

2
src/applications/people/view/PhabricatorUserCardView.php
View file

@ -38,7 +38,7 @@ final class PhabricatorUserCardView extends AphrontTagView {
}
return array(
'class' => implode($classes, ' '),
'class' => implode(' ', $classes),
);
}

4
src/applications/project/controller/PhabricatorProjectProfileController.php
View file

@ -63,14 +63,14 @@ final class PhabricatorProjectProfileController
$member_list = id(new PhabricatorProjectMemberListView())
->setUser($viewer)
->setProject($project)
->setLimit(5)
->setLimit(10)
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setUserPHIDs($project->getMemberPHIDs());
$watcher_list = id(new PhabricatorProjectWatcherListView())
->setUser($viewer)
->setProject($project)
->setLimit(5)
->setLimit(10)
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setUserPHIDs($project->getWatcherPHIDs());

6
src/applications/project/engine/PhabricatorBoardLayoutEngine.php
View file

@ -301,6 +301,12 @@ final class PhabricatorBoardLayoutEngine extends Phobject {
->execute();
$boards = mpull($boards, null, 'getPHID');
foreach ($boards as $key => $board) {
if (!($board instanceof PhabricatorWorkboardInterface)) {
unset($boards[$key]);
}
}
if (!$this->fetchAllBoards) {
foreach ($boards as $key => $board) {
if (!$board->getHasWorkboard()) {

3
src/applications/project/interface/PhabricatorWorkboardInterface.php Normal file
View file

@ -0,0 +1,3 @@
<?php
interface PhabricatorWorkboardInterface {}

3
src/applications/project/storage/PhabricatorProject.php
View file

@ -13,7 +13,8 @@ final class PhabricatorProject extends PhabricatorProjectDAO
PhabricatorConduitResultInterface,
PhabricatorColumnProxyInterface,
PhabricatorSpacesInterface,
PhabricatorEditEngineSubtypeInterface {
PhabricatorEditEngineSubtypeInterface,
PhabricatorWorkboardInterface {
protected $name;
protected $status = PhabricatorProjectStatus::STATUS_ACTIVE;

2
src/applications/project/view/PhabricatorProjectCardView.php
View file

@ -36,7 +36,7 @@ final class PhabricatorProjectCardView extends AphrontTagView {
$classes[] = 'project-card-'.$color;
return array(
'class' => implode($classes, ' '),
'class' => implode(' ', $classes),
);
}

86
src/applications/project/view/PhabricatorProjectUserListView.php
View file

@ -1,6 +1,7 @@
<?php
abstract class PhabricatorProjectUserListView extends AphrontView {
abstract class PhabricatorProjectUserListView
extends AphrontView {
private $project;
private $userPHIDs;
@ -57,49 +58,74 @@ abstract class PhabricatorProjectUserListView extends AphrontView {
$user_phids = $this->getUserPHIDs();
$can_edit = $this->canEditList();
$supports_edit = $project->supportsEditMembers();
$no_data = $this->getNoDataString();
$list = id(new PHUIObjectItemListView())
->setNoDataString($no_data);
$limit = $this->getLimit();
// If we're showing everything, show oldest to newest. If we're showing
// only a slice, show newest to oldest.
if (!$limit) {
$user_phids = array_reverse($user_phids);
}
$is_panel = (bool)$limit;
$handles = $viewer->loadHandles($user_phids);
// Always put the viewer first if they are on the list.
$user_phids = array_fuse($user_phids);
$user_phids =
array_select_keys($user_phids, array($viewer->getPHID())) +
$user_phids;
// Reorder users in display order. We're going to put the viewer first
// if they're a member, then enabled users, then disabled/invalid users.
if ($limit) {
$render_phids = array_slice($user_phids, 0, $limit);
} else {
$render_phids = $user_phids;
}
foreach ($render_phids as $user_phid) {
$phid_map = array();
foreach ($user_phids as $user_phid) {
$handle = $handles[$user_phid];
$is_viewer = ($user_phid === $viewer->getPHID());
$is_enabled = ($handle->isComplete() && !$handle->isDisabled());
// If we're showing the main member list, show oldest to newest. If we're
// showing only a slice in a panel, show newest to oldest.
if ($limit) {
$order_scalar = 1;
} else {
$order_scalar = -1;
}
$phid_map[$user_phid] = id(new PhutilSortVector())
->addInt($is_viewer ? 0 : 1)
->addInt($is_enabled ? 0 : 1)
->addInt($order_scalar * count($phid_map));
}
$phid_map = msortv($phid_map, 'getSelf');
$handles = iterator_to_array($handles);
$handles = array_select_keys($handles, array_keys($phid_map));
if ($limit) {
$handles = array_slice($handles, 0, $limit);
}
foreach ($handles as $user_phid => $handle) {
$item = id(new PHUIObjectItemView())
->setHeader($handle->getFullName())
->setHref($handle->getURI())
->setImageURI($handle->getImageURI());
$icon = id(new PHUIIconView())
->setIcon($handle->getIcon());
if ($handle->isDisabled()) {
if ($is_panel) {
// Don't show disabled users in the panel view at all.
continue;
}
$subtitle = $handle->getSubtitle();
$item
->setDisabled(true)
->addAttribute(pht('Disabled'));
} else {
$icon = id(new PHUIIconView())
->setIcon($handle->getIcon());
$item->addAttribute(array($icon, ' ', $subtitle));
$subtitle = $handle->getSubtitle();
if ($can_edit && !$limit) {
$item->addAttribute(array($icon, ' ', $subtitle));
}
if ($supports_edit && !$is_panel) {
$remove_uri = $this->getRemoveURI($user_phid);
$item->addAction(
@ -107,6 +133,7 @@ abstract class PhabricatorProjectUserListView extends AphrontView {
->setIcon('fa-times')
->setName(pht('Remove'))
->setHref($remove_uri)
->setDisabled(!$can_edit)
->setWorkflow(true));
}
@ -128,14 +155,9 @@ abstract class PhabricatorProjectUserListView extends AphrontView {
->setHeader($header_text);
if ($limit) {
$header->addActionLink(
id(new PHUIButtonView())
->setTag('a')
->setIcon(
id(new PHUIIconView())
->setIcon('fa-list-ul'))
->setText(pht('View All'))
->setHref("/project/members/{$id}/"));
$list->newTailButton()
->setText(pht('View All'))
->setHref("/project/members/{$id}/");
}
$box = id(new PHUIObjectBoxView())

2
src/applications/repository/query/PhabricatorRepositoryQuery.php
View file

@ -215,6 +215,8 @@ final class PhabricatorRepositoryQuery
$commits = id(new DiffusionCommitQuery())
->setViewer($this->getViewer())
->withIDs($commit_ids)
->needCommitData(true)
->needIdentities(true)
->execute();
} else {
$commits = array();

19
src/applications/repository/storage/PhabricatorRepository.php
View file

@ -2757,6 +2757,14 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO
->setDescription(
pht(
'The "Fetch" and "Permanent Ref" rules for this repository.')),
id(new PhabricatorConduitSearchFieldSpecification())
->setKey('defaultBranch')
->setType('string?')
->setDescription(pht('Default branch name.')),
id(new PhabricatorConduitSearchFieldSpecification())
->setKey('description')
->setType('remarkup')
->setDescription(pht('Repository description.')),
);
}
@ -2769,6 +2777,11 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO
$track_rules = $this->getStringListForConduit($track_rules);
$permanent_rules = $this->getStringListForConduit($permanent_rules);
$default_branch = $this->getDefaultBranch();
if (!strlen($default_branch)) {
$default_branch = null;
}
return array(
'name' => $this->getName(),
'vcs' => $this->getVersionControlSystem(),
@ -2782,6 +2795,10 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO
'trackRules' => $track_rules,
'permanentRefRules' => $permanent_rules,
),
'defaultBranch' => $default_branch,
'description' => array(
'raw' => (string)$this->getDetail('description'),
),
);
}
@ -2804,6 +2821,8 @@ final class PhabricatorRepository extends PhabricatorRepositoryDAO
return array(
id(new DiffusionRepositoryURIsSearchEngineAttachment())
->setAttachmentKey('uris'),
id(new DiffusionRepositoryMetricsSearchEngineAttachment())
->setAttachmentKey('metrics'),
);
}

7
src/applications/transactions/conduit/TransactionSearchConduitAPIMethod.php
View file

@ -103,8 +103,11 @@ EOREMARKUP
if (!($object instanceof PhabricatorApplicationTransactionInterface)) {
throw new Exception(
pht(
'Object "%s" does not implement "%s", so transactions can not '.
'be loaded for it.'));
'Object "%s" (of type "%s") does not implement "%s", so '.
'transactions can not be loaded for it.',
$object_name,
get_class($object),
'PhabricatorApplicationTransactionInterface'));
}
$xaction_query = PhabricatorApplicationTransactionQuery::newQueryForObject(

4
src/view/phui/PHUIPropertyListView.php
View file

@ -284,7 +284,7 @@ final class PHUIPropertyListView extends AphrontView {
return phutil_tag(
'div',
array(
'class' => implode($classes, ' '),
'class' => implode(' ', $classes),
),
$part['content']);
}
@ -295,7 +295,7 @@ final class PHUIPropertyListView extends AphrontView {
return phutil_tag(
'div',
array(
'class' => implode($classes, ' '),
'class' => implode(' ', $classes),
),
$part['content']);
}

2
src/view/phui/PHUITwoColumnView.php
View file

@ -220,7 +220,7 @@ final class PHUITwoColumnView extends AphrontTagView {
return phutil_tag(
'div',
array(
'class' => implode($classes, ' '),
'class' => implode(' ', $classes),
),
array(
$navigation,

2
webroot/rsrc/css/application/auth/auth.css
View file

@ -57,7 +57,7 @@
}
.auth-custom-message {
margin: 32px auto 64px;
margin: 32px auto 48px;
max-width: 548px;
background: #fff;
padding: 16px;

4
webroot/rsrc/css/phui/phui-property-list-view.css
View file

@ -316,12 +316,12 @@ div.phui-property-list-stacked .phui-property-list-properties
}
td.new .jupyter-cell-code-line {
background: {$new-background};
background: rgba(255, 255, 255, 0.5);
border-color: {$new-bright};
}
td.old .jupyter-cell-code-line {
background: {$old-background};
background: rgba(255, 255, 255, 0.5);
border-color: {$old-bright};
}