Page MenuHomestyx hydra
Files F1456714

No OneTemporary
Actions

View Options

diff --git a/src/applications/people/controller/PhabricatorPeopleListController.php b/src/applications/people/controller/PhabricatorPeopleListController.php
index b34e048b12..ee7dd160b7 100644
--- a/src/applications/people/controller/PhabricatorPeopleListController.php
+++ b/src/applications/people/controller/PhabricatorPeopleListController.php
@@ -1,139 +1,90 @@
<?php
final class PhabricatorPeopleListController
extends PhabricatorPeopleController {
public function processRequest() {
$request = $this->getRequest();
$viewer = $request->getUser();
$is_admin = $viewer->getIsAdmin();
$user = new PhabricatorUser();
$count = queryfx_one(
$user->establishConnection('r'),
'SELECT COUNT(*) N FROM %T',
$user->getTableName());
$count = idx($count, 'N', 0);
$pager = new AphrontPagerView();
$pager->setOffset($request->getInt('page', 0));
$pager->setCount($count);
$pager->setURI($request->getRequestURI(), 'page');
$users = id(new PhabricatorPeopleQuery())
->needPrimaryEmail(true)
->executeWithOffsetPager($pager);
- $rows = array();
+ $list = new PhabricatorObjectItemListView();
+
foreach ($users as $user) {
$primary_email = $user->loadPrimaryEmail();
if ($primary_email && $primary_email->getIsVerified()) {
$email = pht('Verified');
} else {
$email = pht('Unverified');
}
- $status = array();
- if ($user->getIsDisabled()) {
- $status[] = pht('Disabled');
- }
- if ($user->getIsAdmin()) {
- $status[] = pht('Admin');
- }
- if ($user->getIsSystemAgent()) {
- $status[] = pht('System Agent');
- }
- $status = implode(', ', $status);
-
- $rows[] = array(
- phabricator_date($user->getDateCreated(), $viewer),
- phabricator_time($user->getDateCreated(), $viewer),
- phutil_tag(
- 'a',
- array(
- 'href' => '/p/'.$user->getUsername().'/',
- ),
- $user->getUserName()),
- $user->getRealName(),
- $status,
- $email,
- phutil_tag(
- 'a',
- array(
- 'class' => 'button grey small',
- 'href' => '/people/edit/'.$user->getID().'/',
- ),
- pht('Administrate User')),
- );
- }
+ $user_handle = new PhabricatorObjectHandle();
+ $user_handle->setImageURI($user->loadProfileImageURI());
- $table = new AphrontTableView($rows);
- $table->setHeaders(
- array(
- pht('Join Date'),
- pht('Time'),
- pht('Username'),
- pht('Real Name'),
- pht('Roles'),
- pht('Email'),
- '',
- ));
- $table->setColumnClasses(
- array(
- null,
- 'right',
- 'pri',
- 'wide',
- null,
- null,
- 'action',
- ));
- $table->setColumnVisibility(
- array(
- true,
- true,
- true,
- true,
- $is_admin,
- $is_admin,
- $is_admin,
- ));
+ $item = new PhabricatorObjectItemView();
+ $item->setHeader($user->getFullName())
+ ->setHref('/people/edit/'.$user->getID().'/')
+ ->addAttribute(hsprintf('%s %s',
+ phabricator_date($user->getDateCreated(), $viewer),
+ phabricator_time($user->getDateCreated(), $viewer)))
+ ->addAttribute($email);
+
+ if ($is_admin) {
+ if ($user->getIsDisabled()) {
+ $item->addIcon('disable', pht('Disabled'));
+ }
- $panel = new AphrontPanelView();
- $panel->setHeader(pht('People (%d)', number_format($count)));
- $panel->setNoBackground();
- $panel->appendChild($table);
- $panel->appendChild($pager);
-
- if ($is_admin) {
- if (PhabricatorEnv::getEnvConfig('ldap.auth-enabled')) {
- $panel->addButton(
- phutil_tag(
- 'a',
- array(
- 'href' => '/people/ldap/',
- 'class' => 'button green'
- ),
- pht('Import from LDAP')));
+ if ($user->getIsAdmin()) {
+ $item->addIcon('highlight', pht('Admin'));
+ }
+
+ if ($user->getIsSystemAgent()) {
+ $item->addIcon('computer', pht('System Agent'));
+ }
}
+
+ $list->addItem($item);
}
- $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
+
+ $header = new PhabricatorHeaderView();
+ $header->setHeader(pht('People (%d)', number_format($count)));
+
+ $crumbs = $this->buildApplicationCrumbs();
$crumbs->addCrumb(
id(new PhabricatorCrumbView())
->setName(pht('User Directory'))
->setHref('/people/'));
$nav = $this->buildSideNavView();
$nav->selectFilter('people');
- $nav->appendChild($panel);
+ $nav->appendChild($header);
+ $nav->appendChild($list);
+ $nav->appendChild($pager);
$nav->setCrumbs($crumbs);
return $this->buildApplicationPage(
$nav,
array(
- 'title' => pht('People'),
+ 'title' => pht('People'),
'device' => true,
+ 'dust' => true,
));
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Nov 15, 10:52 AM (20 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
337791
Default Alt Text
(5 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)