archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix Diffusion blame columns when disabling blame

Browse Source 
Summary:
Fixes T10385. Two issues:

  - `$show_blame` and `$show_color` were improperly swapped.
  - Code to hide these columns got dropped somewhere, probably in my recent-ish rewrite.

Test Plan:
  - Showed/hid blame.
  - Showed/hid colors.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10385

Differential Revision: https://secure.phabricator.com/D15528
This commit is contained in:
epriestley
2016-03-26 11:51:47 -07:00
parent 601aaa5a86
commit 060f96079d
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/applications/diffusion/controller/DiffusionBrowseController.php
View File

@@ -995,8 +995,8 @@ final class DiffusionBrowseController extends DiffusionController {
array $lines, array $lines,
array $blame_list, array $blame_list,
array $blame_commits, array $blame_commits,
$show_color, $show_blame,
$show_blame) { $show_color) {
$request = $this->getRequest(); $request = $this->getRequest();
$viewer = $this->getViewer(); $viewer = $this->getViewer();
@@ -1233,6 +1233,7 @@ final class DiffusionBrowseController extends DiffusionController {
"\xC2\xAB"); "\xC2\xAB");
} }
if ($show_blame) {
$row[] = phutil_tag( $row[] = phutil_tag(
'th', 'th',
array( array(
@@ -1253,6 +1254,7 @@ final class DiffusionBrowseController extends DiffusionController {
'class' => 'diffusion-rev-link', 'class' => 'diffusion-rev-link',
), ),
$object_links); $object_links);
}
$line_link = phutil_tag( $line_link = phutil_tag(
'a', 'a',