From dbafd9b4eb5e069a3f3a882cb4f55e70b56471ef Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 25 Mar 2015 14:00:39 +0100 Subject: [PATCH] Bug 6178: Display tags from other users in all cases. At the OPAC, if you click on the "your tags" link, only you tags are displayed in the tag cloud. There is no sense to do that, the user's tags are displayed in the table below. Test plan: Confirm that you see all tags in the tag cloud, even if you click on the "your tags" link. --- koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc | 2 +- opac/opac-tags.pl | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc index 182543b..4c2c913 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc @@ -29,7 +29,7 @@ [% ELSE %]
  • [% END %] - your tags
  • + your tags [% END %] [% IF ( OpacPasswordChange ) %] diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl index 6388a01..157bfd3 100755 --- a/opac/opac-tags.pl +++ b/opac/opac-tags.pl @@ -253,14 +253,12 @@ if ($add_op) { deleted_count => $dels, ); } else { - my ($arg,$limit,$mine); + my ($arg,$limit); my $hardmax = 100; # you might disagree what this value should be, but there definitely should be a max $limit = $query->param('limit') || $hardmax; - $mine = $query->param('mine') || 0; # set if the patron want to see only his own tags. ($limit =~ /^\d+$/ and $limit <= $hardmax) or $limit = $hardmax; $template->param(limit => $limit); my $arghash = {approved=>1, limit=>$limit, 'sort'=>'-weight_total'}; - $arghash->{'borrowernumber'} = $loggedinuser if $mine; # ($openadds) or $arghash->{approved} = 1; if ($arg = $query->param('tag')) { $arghash->{term} = $arg; @@ -270,7 +268,7 @@ if ($add_op) { $results = get_approval_rows($arghash); stratify_tags(10, $results); # work out the differents sizes for things my $count = scalar @$results; - $template->param(TAGLOOP_COUNT => $count, mine => $mine); + $template->param(TAGLOOP_COUNT => $count); } (scalar @errors ) and $template->param(ERRORS => \@errors); my @orderedresult = sort { uc($a->{'term'}) cmp uc($b->{'term'}) } @$results; -- 2.1.0