summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--template/en/default/bug/votes/list-for-user.html.tmpl9
-rwxr-xr-xvotes.cgi7
2 files changed, 10 insertions, 6 deletions
diff --git a/template/en/default/bug/votes/list-for-user.html.tmpl b/template/en/default/bug/votes/list-for-user.html.tmpl
index 9bb3a1dd6..968c66862 100644
--- a/template/en/default/bug/votes/list-for-user.html.tmpl
+++ b/template/en/default/bug/votes/list-for-user.html.tmpl
@@ -23,13 +23,16 @@
[% IF !header_done %]
[% h2 = voting_user.login FILTER html %]
- [% PROCESS global/header.html.tmpl title = "Show Votes" %]
+ [% IF canedit %]
+ [% title = "Change Votes" %]
+ [% ELSE %]
+ [% title = "Show Votes" %]
+ [% END %]
+ [% PROCESS global/header.html.tmpl %]
[% ELSE %]
<hr>
[% END %]
-[% canedit = 1 IF voting_user.login == user.login %]
-
[% IF votes_recorded %]
<p>
<font color="red">
diff --git a/votes.cgi b/votes.cgi
index a8815756e..49ac0cb2a 100755
--- a/votes.cgi
+++ b/votes.cgi
@@ -76,7 +76,7 @@ elsif ($action eq "show_user") {
show_user();
}
elsif ($action eq "vote") {
- record_votes();
+ record_votes() if Param('usevotes');
show_user();
}
else {
@@ -128,7 +128,7 @@ sub show_user {
my $who = DBNameToIdAndCheck($name);
my $userid = Bugzilla->user->id;
- my $canedit = 1 if ($userid && $name eq Bugzilla->user->login);
+ my $canedit = (Param('usevotes') && $userid == $who) ? 1 : 0;
SendSQL("LOCK TABLES bugs READ, products READ, votes WRITE,
cc READ, bug_group_map READ, user_group_map READ,
@@ -213,7 +213,8 @@ sub show_user {
SendSQL("DELETE FROM votes WHERE vote_count <= 0");
SendSQL("UNLOCK TABLES");
-
+
+ $vars->{'canedit'} = $canedit;
$vars->{'voting_user'} = { "login" => $name };
$vars->{'products'} = \@products;