diff --git a/comp/widgets/wrappers/sideNav.mc b/comp/widgets/wrappers/sideNav.mc index 852b09794..507556b07 100644 --- a/comp/widgets/wrappers/sideNav.mc +++ b/comp/widgets/wrappers/sideNav.mc @@ -70,6 +70,13 @@ my $get_cookie = sub { my %cookies = map { split /:/ } split /[|]/, $cookie; return exists($cookies{$name}) ? $cookies{$name} : ''; }; + +my $desk_caption = sub { + my ($desk_id, $desk_name) = @_; + return $desk_name unless get_pref('Show Desk Asset Counts'); + my $desk = Bric::Biz::Workflow::Parts::Desk->lookup({ id => $desk_id }); + return sprintf("$desk_name (%d)", scalar(@{$desk->assets})); +}; \ <%perl>; my $site_id = $c->get_user_cx(get_user_id); @@ -192,7 +199,7 @@ foreach my $wf (@$workflows) { $printLink->( "/workflow/profile/desk/$wfid/$d->[0]/", $uri, - $d->[1], + $desk_caption->($d->[0], $d->[1]), 1 ), '' diff --git a/lib/Bric/Changes.pod b/lib/Bric/Changes.pod index d1c14291f..921defaab 100644 --- a/lib/Bric/Changes.pod +++ b/lib/Bric/Changes.pod @@ -99,6 +99,11 @@ Fixed bug in bric_ftpd where the ftp PWD command returns an incorrect path (missing the site name). Some ftp clients (eg. FileZilla) call PWD and use this path after changing directories. [Adrian Yee] +=item * + +Fixed a bug where desk asset counts would never be displayed regardless of the +preference setting (Bug #198). [Greg Heo] + =back =head1 Version 2.0.0 (2010-04-12)