Skip to content

Commit a5dc906

Browse files
author
epriestley
committed
Provide convenience method addTextCrumb() to PhabricatorCrumbsView
Summary: We currently have a lot of calls to `addCrumb(id(new PhabricatorCrumbView())->...)` which can be expressed much more simply with a convenience method. Nearly all crumbs are only textual. Test Plan: - This was mostly automated, then I cleaned up a few unusual sites manually. - Bunch of grep / randomly clicking around. Reviewers: btrahan, chad Reviewed By: btrahan CC: hach-que, aran Differential Revision: https://secure.phabricator.com/D7787
1 parent dc43123 commit a5dc906

File tree

154 files changed

+304
-770
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+304
-770
lines changed

‎src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,8 @@ public function processRequest() {
7070
$dialog->appendChild($form);
7171

7272
$crumbs = $this->buildApplicationCrumbs();
73-
$crumbs->addCrumb(
74-
id(new PhabricatorCrumbView())
75-
->setName(pht('Confirm Link'))
76-
->setHref($panel_uri));
77-
$crumbs->addCrumb(
78-
id(new PhabricatorCrumbView())
79-
->setName($provider->getProviderName()));
73+
$crumbs->addTextCrumb(pht('Confirm Link'), $panel_uri);
74+
$crumbs->addTextCrumb($provider->getProviderName());
8075

8176
return $this->buildApplicationPage(
8277
array(

‎src/applications/auth/controller/PhabricatorAuthLinkController.php

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,8 @@ public function processRequest() {
115115
}
116116

117117
$crumbs = $this->buildApplicationCrumbs();
118-
$crumbs->addCrumb(
119-
id(new PhabricatorCrumbView())
120-
->setName(pht('Link Account'))
121-
->setHref($panel_uri));
122-
$crumbs->addCrumb(
123-
id(new PhabricatorCrumbView())
124-
->setName($provider->getProviderName($name)));
118+
$crumbs->addTextCrumb(pht('Link Account'), $panel_uri);
119+
$crumbs->addTextCrumb($provider->getProviderName($name));
125120

126121
return $this->buildApplicationPage(
127122
array(

‎src/applications/auth/controller/PhabricatorAuthLoginController.php

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -202,20 +202,12 @@ public function buildProviderPageResponse(
202202
$crumbs = $this->buildApplicationCrumbs();
203203

204204
if ($this->getRequest()->getUser()->isLoggedIn()) {
205-
$crumbs->addCrumb(
206-
id(new PhabricatorCrumbView())
207-
->setName(pht('Link Account'))
208-
->setHref($provider->getSettingsURI()));
205+
$crumbs->addTextCrumb(pht('Link Account'), $provider->getSettingsURI());
209206
} else {
210-
$crumbs->addCrumb(
211-
id(new PhabricatorCrumbView())
212-
->setName(pht('Login'))
213-
->setHref($this->getApplicationURI('start/')));
207+
$crumbs->addTextCrumb(pht('Login'), $this->getApplicationURI('start/'));
214208
}
215209

216-
$crumbs->addCrumb(
217-
id(new PhabricatorCrumbView())
218-
->setName($provider->getProviderName()));
210+
$crumbs->addTextCrumb($provider->getProviderName());
219211

220212
return $this->buildApplicationPage(
221213
array(

‎src/applications/auth/controller/PhabricatorAuthRegisterController.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -401,17 +401,11 @@ public function processRequest() {
401401
$crumbs = $this->buildApplicationCrumbs();
402402

403403
if ($is_setup) {
404-
$crumbs->addCrumb(
405-
id(new PhabricatorCrumbView())
406-
->setName(pht('Setup Admin Account')));
404+
$crumbs->addTextCrumb(pht('Setup Admin Account'));
407405
$title = pht('Welcome to Phabricator');
408406
} else {
409-
$crumbs->addCrumb(
410-
id(new PhabricatorCrumbView())
411-
->setName(pht('Register')));
412-
$crumbs->addCrumb(
413-
id(new PhabricatorCrumbView())
414-
->setName($provider->getProviderName()));
407+
$crumbs->addTextCrumb(pht('Register'));
408+
$crumbs->addTextCrumb($provider->getProviderName());
415409
$title = pht('Phabricator Registration');
416410
}
417411

‎src/applications/auth/controller/PhabricatorAuthStartController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,7 @@ public function processRequest() {
126126
$login_message = phutil_safe_html($login_message);
127127

128128
$crumbs = $this->buildApplicationCrumbs();
129-
$crumbs->addCrumb(
130-
id(new PhabricatorCrumbView())
131-
->setName(pht('Login')));
129+
$crumbs->addTextCrumb(pht('Login'));
132130

133131
return $this->buildApplicationPage(
134132
array(

‎src/applications/auth/controller/PhabricatorEmailLoginController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,7 @@ public function processRequest() {
133133
->setError($e_captcha));
134134

135135
$crumbs = $this->buildApplicationCrumbs();
136-
$crumbs->addCrumb(
137-
id(new PhabricatorCrumbView())
138-
->setName(pht('Reset Password')));
136+
$crumbs->addTextCrumb(pht('Reset Password'));
139137

140138
$dialog = new AphrontDialogView();
141139
$dialog->setUser($request->getUser());

‎src/applications/auth/controller/PhabricatorEmailVerificationController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ public function processRequest() {
8282
->appendChild($content);
8383

8484
$crumbs = $this->buildApplicationCrumbs();
85-
$crumbs->addCrumb(
86-
id(new PhabricatorCrumbView())
87-
->setName(pht('Verify Email')));
85+
$crumbs->addTextCrumb(pht('Verify Email'));
8886

8987
return $this->buildApplicationPage(
9088
array(

‎src/applications/auth/controller/config/PhabricatorAuthEditController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,7 @@ public function processRequest() {
281281
}
282282

283283
$crumbs = $this->buildApplicationCrumbs();
284-
$crumbs->addCrumb(
285-
id(new PhabricatorCrumbView())
286-
->setName($crumb));
284+
$crumbs->addTextCrumb($crumb);
287285

288286
$xaction_view = null;
289287
if (!$is_new) {

‎src/applications/auth/controller/config/PhabricatorAuthListController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ public function processRequest() {
8686
pht('Add Authentication Provider'))));
8787

8888
$crumbs = $this->buildApplicationCrumbs();
89-
$crumbs->addCrumb(
90-
id(new PhabricatorCrumbView())
91-
->setName(pht('Auth Providers')));
89+
$crumbs->addTextCrumb(pht('Auth Providers'));
9290

9391
$config_name = 'auth.email-domains';
9492
$config_href = '/config/edit/'.$config_name.'/';

‎src/applications/auth/controller/config/PhabricatorAuthNewController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ public function processRequest() {
8787
->setForm($form);
8888

8989
$crumbs = $this->buildApplicationCrumbs();
90-
$crumbs->addCrumb(
91-
id(new PhabricatorCrumbView())
92-
->setName(pht('Add Provider')));
90+
$crumbs->addTextCrumb(pht('Add Provider'));
9391

9492
return $this->buildApplicationPage(
9593
array(

‎src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ public function processRequest() {
2323

2424
$crumbs = $this
2525
->buildApplicationCrumbs()
26-
->addCrumb(
27-
id(new PhabricatorCrumbView())
28-
->setName(pht('Channel List'))
29-
->setHref($this->getApplicationURI()));
26+
->addTextCrumb(pht('Channel List'), $this->getApplicationURI());
3027

3128
return $this->buildApplicationPage(
3229
array(

‎src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,7 @@ public function processRequest() {
183183

184184
$crumbs = $this
185185
->buildApplicationCrumbs()
186-
->addCrumb(
187-
id(new PhabricatorCrumbView())
188-
->setName($channel->getChannelName())
189-
->setHref($uri));
186+
->addTextCrumb($channel->getChannelName(), $uri);
190187

191188
$form = id(new AphrontFormView())
192189
->setUser($user)

‎src/applications/conduit/controller/PhabricatorConduitAPIController.php

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -380,15 +380,9 @@ private function buildHumanReadableResponse(
380380

381381
$method_uri = $this->getApplicationURI('method/'.$method.'/');
382382

383-
$crumbs = $this->buildApplicationCrumbs();
384-
$crumbs
385-
->addCrumb(
386-
id(new PhabricatorCrumbView())
387-
->setName($method)
388-
->setHref($method_uri))
389-
->addCrumb(
390-
id(new PhabricatorCrumbView())
391-
->setName(pht('Call')));
383+
$crumbs = $this->buildApplicationCrumbs()
384+
->addTextCrumb($method, $method_uri)
385+
->addTextCrumb(pht('Call'));
392386

393387
return $this->buildApplicationPage(
394388
array(

‎src/applications/conduit/controller/PhabricatorConduitConsoleController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ public function processRequest() {
116116
->setForm($form);
117117

118118
$crumbs = $this->buildApplicationCrumbs();
119-
$crumbs->addCrumb(
120-
id(new PhabricatorCrumbView())
121-
->setName($method->getAPIMethodName()));
119+
$crumbs->addTextCrumb($method->getAPIMethodName());
122120

123121
return $this->buildApplicationPage(
124122
array(

‎src/applications/conduit/controller/PhabricatorConduitLogController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ public function processRequest() {
4040
$table = $this->renderCallTable($calls, $conns);
4141

4242
$crumbs = $this->buildApplicationCrumbs();
43-
$crumbs->addCrumb(
44-
id(new PhabricatorCrumbView())
45-
->setName(pht('Call Logs')));
43+
$crumbs->addTextCrumb(pht('Call Logs'));
4644

4745
return $this->buildApplicationPage(
4846
array(

‎src/applications/conduit/controller/PhabricatorConduitTokenController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ public function processRequest() {
4949
->appendRemarkupInstructions($post_instructions);
5050

5151
$crumbs = $this->buildApplicationCrumbs();
52-
$crumbs->addCrumb(
53-
id(new PhabricatorCrumbView())
54-
->setName(pht('Install Certificate')));
52+
$crumbs->addTextCrumb(pht('Install Certificate'));
5553

5654
$object_box = id(new PHUIObjectBoxView())
5755
->setHeaderText(pht('Certificate Token'))

‎src/applications/config/controller/PhabricatorConfigAllController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@ public function processRequest() {
5656

5757
$crumbs = $this
5858
->buildApplicationCrumbs()
59-
->addCrumb(
60-
id(new PhabricatorCrumbView())
61-
->setName($title));
59+
->addTextCrumb($title);
6260

6361
$panel = new AphrontPanelView();
6462
$panel->appendChild($table);

‎src/applications/config/controller/PhabricatorConfigEditController.php

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -199,22 +199,13 @@ public function processRequest() {
199199
->setForm($form);
200200

201201
$crumbs = $this->buildApplicationCrumbs();
202-
$crumbs->addCrumb(
203-
id(new PhabricatorCrumbView())
204-
->setName(pht('Config'))
205-
->setHref($this->getApplicationURI()));
202+
$crumbs->addTextCrumb(pht('Config'), $this->getApplicationURI());
206203

207204
if ($group) {
208-
$crumbs->addCrumb(
209-
id(new PhabricatorCrumbView())
210-
->setName($group->getName())
211-
->setHref($group_uri));
205+
$crumbs->addTextCrumb($group->getName(), $group_uri);
212206
}
213207

214-
$crumbs->addCrumb(
215-
id(new PhabricatorCrumbView())
216-
->setName($this->key)
217-
->setHref('/config/edit/'.$this->key));
208+
$crumbs->addTextCrumb($this->key, '/config/edit/'.$this->key);
218209

219210
$xactions = id(new PhabricatorConfigTransactionQuery())
220211
->withObjectPHIDs(array($config_entry->getPHID()))

‎src/applications/config/controller/PhabricatorConfigGroupController.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,8 @@ public function processRequest() {
2828

2929
$crumbs = $this
3030
->buildApplicationCrumbs()
31-
->addCrumb(
32-
id(new PhabricatorCrumbView())
33-
->setName(pht('Config'))
34-
->setHref($this->getApplicationURI()))
35-
->addCrumb(
36-
id(new PhabricatorCrumbView())
37-
->setName($options->getName())
38-
->setHref($this->getApplicationURI()));
31+
->addTextCrumb(pht('Config'), $this->getApplicationURI())
32+
->addTextCrumb($options->getName(), $this->getApplicationURI());
3933

4034
return $this->buildApplicationPage(
4135
array(

‎src/applications/config/controller/PhabricatorConfigIssueListController.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ public function processRequest() {
3030

3131
$crumbs = $this
3232
->buildApplicationCrumbs($nav)
33-
->addCrumb(
34-
id(new PhabricatorCrumbView())
35-
->setName(pht('Setup'))
36-
->setHref($this->getApplicationURI('issue/')));
33+
->addTextCrumb(pht('Setup'), $this->getApplicationURI('issue/'));
3734

3835
$nav->setCrumbs($crumbs);
3936

‎src/applications/config/controller/PhabricatorConfigIssueViewController.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,8 @@ public function processRequest() {
3838

3939
$crumbs = $this
4040
->buildApplicationCrumbs()
41-
->addCrumb(
42-
id(new PhabricatorCrumbView())
43-
->setName(pht('Setup Issues'))
44-
->setHref($this->getApplicationURI('issue/')))
45-
->addCrumb(
46-
id(new PhabricatorCrumbView())
47-
->setName($title)
48-
->setHref($request->getRequestURI()));
41+
->addTextCrumb(pht('Setup Issues'), $this->getApplicationURI('issue/'))
42+
->addTextCrumb($title, $request->getRequestURI());
4943

5044
return $this->buildApplicationPage(
5145
array(

‎src/applications/config/controller/PhabricatorConfigListController.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,7 @@ public function processRequest() {
2626

2727
$crumbs = $this
2828
->buildApplicationCrumbs()
29-
->addCrumb(
30-
id(new PhabricatorCrumbView())
31-
->setName(pht('Config'))
32-
->setHref($this->getApplicationURI()));
29+
->addTextCrumb(pht('Config'), $this->getApplicationURI());
3330

3431
$nav->setCrumbs($crumbs);
3532

‎src/applications/countdown/controller/PhabricatorCountdownEditController.php

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,11 @@ public function processRequest() {
9090
$cancel_uri = '/countdown/';
9191
if ($countdown->getID()) {
9292
$cancel_uri = '/countdown/'.$countdown->getID().'/';
93-
$crumbs->addCrumb(
94-
id(new PhabricatorCrumbView())
95-
->setName('C'.$countdown->getID())
96-
->setHref($cancel_uri));
97-
$crumbs->addCrumb(
98-
id(new PhabricatorCrumbView())
99-
->setName(pht('Edit')));
93+
$crumbs->addTextCrumb('C'.$countdown->getID(), $cancel_uri);
94+
$crumbs->addTextCrumb(pht('Edit'));
10095
$submit_label = pht('Save Changes');
10196
} else {
102-
$crumbs->addCrumb(
103-
id(new PhabricatorCrumbView())
104-
->setName(pht('Create Countdown')));
97+
$crumbs->addTextCrumb(pht('Create Countdown'));
10598
$submit_label = pht('Create Countdown');
10699
}
107100

‎src/applications/countdown/controller/PhabricatorCountdownViewController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ public function processRequest() {
3636

3737
$crumbs = $this
3838
->buildApplicationCrumbs()
39-
->addCrumb(
40-
id(new PhabricatorCrumbView())
41-
->setName("C{$id}"));
39+
->addTextCrumb("C{$id}");
4240

4341
$header = id(new PHUIHeaderView())
4442
->setHeader($title)

‎src/applications/daemon/controller/PhabricatorDaemonConsoleController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -211,9 +211,7 @@ public function processRequest() {
211211
$queued_panel->setNoBackground();
212212

213213
$crumbs = $this->buildApplicationCrumbs();
214-
$crumbs->addCrumb(
215-
id(new PhabricatorCrumbView())
216-
->setName(pht('Console')));
214+
$crumbs->addTextCrumb(pht('Console'));
217215

218216
$nav = $this->buildSideNavView();
219217
$nav->selectFilter('/');

‎src/applications/daemon/controller/PhabricatorDaemonLogEventViewController.php

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,11 @@ public function processRequest() {
2929

3030
$daemon_id = $event->getLogID();
3131

32-
$crumbs = $this->buildApplicationCrumbs();
33-
$crumbs->addCrumb(
34-
id(new PhabricatorCrumbView())
35-
->setName(pht('Daemon %s', $daemon_id))
36-
->setHref($this->getApplicationURI("log/{$daemon_id}/")));
37-
$crumbs->addCrumb(
38-
id(new PhabricatorCrumbView())
39-
->setName(pht('Event %s', $event->getID())));
32+
$crumbs = $this->buildApplicationCrumbs()
33+
->addTextCrumb(
34+
pht('Daemon %s', $daemon_id),
35+
$this->getApplicationURI("log/{$daemon_id}/"))
36+
->addTextCrumb(pht('Event %s', $event->getID()));
4037

4138

4239
return $this->buildApplicationPage(

‎src/applications/daemon/controller/PhabricatorDaemonLogListController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@ public function processRequest() {
1919
$daemon_table->setDaemonLogs($logs);
2020

2121
$crumbs = $this->buildApplicationCrumbs();
22-
$crumbs->addCrumb(
23-
id(new PhabricatorCrumbView())
24-
->setName(pht('All Daemons')));
22+
$crumbs->addTextCrumb(pht('All Daemons'));
2523

2624
$nav = $this->buildSideNavView();
2725
$nav->selectFilter('log');

‎src/applications/daemon/controller/PhabricatorDaemonLogViewController.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ public function processRequest() {
2626
$log->getID());
2727

2828
$crumbs = $this->buildApplicationCrumbs();
29-
$crumbs->addCrumb(
30-
id(new PhabricatorCrumbView())
31-
->setName(pht('Daemon %s', $log->getID())));
29+
$crumbs->addTextCrumb(pht('Daemon %s', $log->getID()));
3230

3331
$header = id(new PHUIHeaderView())
3432
->setHeader($log->getDaemon());

0 commit comments

Comments
 (0)