urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

poll: Fix behavior of poll buttons when inlined.

master
Joey Hess 2013-11-13 22:06:02 -04:00
parent 5ec2d2d40d
commit 2f8bafb709
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/poll.pm
View File

@ -30,7 +30,7 @@ sub preprocess (@) {
my $showtotal=IkiWiki::yesno($params{total}); my $showtotal=IkiWiki::yesno($params{total});
my $showpercent=IkiWiki::yesno($params{percent}); my $showpercent=IkiWiki::yesno($params{percent});
my $expandable=IkiWiki::yesno($params{expandable}); my $expandable=IkiWiki::yesno($params{expandable});
$pagenum{$params{page}}++; my $num=++$pagenum{$params{page}}{$params{destpage}};
my %choices; my %choices;
my @choices; my @choices;
@ -66,7 +66,7 @@ sub preprocess (@) {
} }
if ($open && exists $config{cgiurl}) { if ($open && exists $config{cgiurl}) {
$ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n"; $ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n";
$ret.="<input type=\"hidden\" name=\"num\" value=\"$pagenum{$params{page}}\" />\n"; $ret.="<input type=\"hidden\" name=\"num\" value=\"$num\" />\n";
$ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n"; $ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n";
$ret.="<input type=\"hidden\" name=\"choice\" value=\"$choice\" />\n"; $ret.="<input type=\"hidden\" name=\"choice\" value=\"$choice\" />\n";
$ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n"; $ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n";
@ -81,7 +81,7 @@ sub preprocess (@) {
$ret.="<p>\n"; $ret.="<p>\n";
$ret.="<form method=\"POST\" action=\"".IkiWiki::cgiurl()."\">\n"; $ret.="<form method=\"POST\" action=\"".IkiWiki::cgiurl()."\">\n";
$ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n"; $ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n";
$ret.="<input type=\"hidden\" name=\"num\" value=\"$pagenum{$params{page}}\" />\n"; $ret.="<input type=\"hidden\" name=\"num\" value=\"$num\" />\n";
$ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n"; $ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n";
$ret.=gettext("Write in").": <input name=\"choice\" size=50 />\n"; $ret.=gettext("Write in").": <input name=\"choice\" size=50 />\n";
$ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n"; $ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n";

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
ikiwiki (3.20130904.2) UNRELEASED; urgency=low ikiwiki (3.20130904.2) UNRELEASED; urgency=low
* aggregate: Improve display of post author. * aggregate: Improve display of post author.
* poll: Fix behavior of poll buttons when inlined.
-- Joey Hess <joeyh@debian.org> Thu, 05 Sep 2013 10:01:10 -0400 -- Joey Hess <joeyh@debian.org> Thu, 05 Sep 2013 10:01:10 -0400

2
doc/bugs/poll_in_inline.mdwn
View File

@ -2,3 +2,5 @@ When the poll directive appears in an inline, clicking on the button is
supposed to vote and go to the page for that poll. Instead, I see it always supposed to vote and go to the page for that poll. Instead, I see it always
apparantly skip counting my vote, and redirect to the page for that poll. apparantly skip counting my vote, and redirect to the page for that poll.
--[[Joey]] --[[Joey]]
> [[fixed|done]] --[[Joey]]