Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15400232
D20625.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
4 KB
Referenced Files
None
Subscribers
None
D20625.diff
View Options
diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php
--- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php
+++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php
@@ -15,12 +15,11 @@
}
$header = $this->buildHeaderView($client);
- $actions = $this->buildActionView($client);
$properties = $this->buildPropertyListView($client);
- $properties->setActionList($actions);
- $crumbs = $this->buildApplicationCrumbs();
- $crumbs->addTextCrumb($client->getName());
+ $crumbs = $this->buildApplicationCrumbs()
+ ->addTextCrumb($client->getName())
+ ->setBorder(true);
$timeline = $this->buildTransactionTimeline(
$client,
@@ -28,19 +27,27 @@
$timeline->setShouldTerminate(true);
$box = id(new PHUIObjectBoxView())
- ->setHeader($header)
+ ->setHeaderText(pht('Details'))
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->addPropertyList($properties);
$title = pht('OAuth Application: %s', $client->getName());
- return $this->newPage()
- ->setCrumbs($crumbs)
- ->setTitle($title)
- ->appendChild(
+ $curtain = $this->buildCurtain($client);
+
+ $columns = id(new PHUITwoColumnView())
+ ->setHeader($header)
+ ->setCurtain($curtain)
+ ->setMainColumn(
array(
$box,
$timeline,
));
+
+ return $this->newPage()
+ ->setCrumbs($crumbs)
+ ->setTitle($title)
+ ->appendChild($columns);
}
private function buildHeaderView(PhabricatorOAuthServerClient $client) {
@@ -60,8 +67,9 @@
return $header;
}
- private function buildActionView(PhabricatorOAuthServerClient $client) {
+ private function buildCurtain(PhabricatorOAuthServerClient $client) {
$viewer = $this->getViewer();
+ $actions = array();
$can_edit = PhabricatorPolicyFilter::hasCapability(
$viewer,
@@ -70,24 +78,19 @@
$id = $client->getID();
- $view = id(new PhabricatorActionListView())
- ->setUser($viewer);
+ $actions[] = id(new PhabricatorActionView())
+ ->setName(pht('Edit Application'))
+ ->setIcon('fa-pencil')
+ ->setWorkflow(!$can_edit)
+ ->setDisabled(!$can_edit)
+ ->setHref($client->getEditURI());
- $view->addAction(
- id(new PhabricatorActionView())
- ->setName(pht('Edit Application'))
- ->setIcon('fa-pencil')
- ->setWorkflow(!$can_edit)
- ->setDisabled(!$can_edit)
- ->setHref($client->getEditURI()));
-
- $view->addAction(
- id(new PhabricatorActionView())
- ->setName(pht('Show Application Secret'))
- ->setIcon('fa-eye')
- ->setHref($this->getApplicationURI("client/secret/{$id}/"))
- ->setDisabled(!$can_edit)
- ->setWorkflow(true));
+ $actions[] = id(new PhabricatorActionView())
+ ->setName(pht('Show Application Secret'))
+ ->setIcon('fa-eye')
+ ->setHref($this->getApplicationURI("client/secret/{$id}/"))
+ ->setDisabled(!$can_edit)
+ ->setWorkflow(true);
$is_disabled = $client->getIsDisabled();
if ($is_disabled) {
@@ -100,22 +103,26 @@
$disable_uri = $this->getApplicationURI("client/disable/{$id}/");
- $view->addAction(
- id(new PhabricatorActionView())
- ->setName($disable_text)
- ->setIcon($disable_icon)
- ->setWorkflow(true)
- ->setDisabled(!$can_edit)
- ->setHref($disable_uri));
-
- $view->addAction(
- id(new PhabricatorActionView())
- ->setName(pht('Generate Test Token'))
- ->setIcon('fa-plus')
- ->setWorkflow(true)
- ->setHref($this->getApplicationURI("client/test/{$id}/")));
+ $actions[] = id(new PhabricatorActionView())
+ ->setName($disable_text)
+ ->setIcon($disable_icon)
+ ->setWorkflow(true)
+ ->setDisabled(!$can_edit)
+ ->setHref($disable_uri);
- return $view;
+ $actions[] = id(new PhabricatorActionView())
+ ->setName(pht('Generate Test Token'))
+ ->setIcon('fa-plus')
+ ->setWorkflow(true)
+ ->setHref($this->getApplicationURI("client/test/{$id}/"));
+
+ $curtain = $this->newCurtainView($client);
+
+ foreach ($actions as $action) {
+ $curtain->addAction($action);
+ }
+
+ return $curtain;
}
private function buildPropertyListView(PhabricatorOAuthServerClient $client) {
@@ -132,10 +139,6 @@
pht('Redirect URI'),
$client->getRedirectURI());
- $view->addProperty(
- pht('Created'),
- phabricator_datetime($client->getDateCreated(), $viewer));
-
return $view;
}
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Mar 18, 10:27 AM (19 h, 5 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223166
Default Alt Text
D20625.diff (4 KB)
Attached To
Mode
D20625: Lightly modernize OAuth server application view pages
Attached
Detach File
Event Timeline
Log In to Comment