From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 6 Jun 2017 12:17:14 +0000 (+0200)
Subject: Poll were missing the button to show participants after vote
X-Git-Tag: 2.1.16~11
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=888a7d57ceab0020bca407143914fb87b90f3d28;p=GitHub%2FWoltLab%2FWCF.git

Poll were missing the button to show participants after vote
---

diff --git a/com.woltlab.wcf/templates/poll.tpl b/com.woltlab.wcf/templates/poll.tpl
index 2bb2301247..21f68055e0 100644
--- a/com.woltlab.wcf/templates/poll.tpl
+++ b/com.woltlab.wcf/templates/poll.tpl
@@ -9,7 +9,7 @@
 	</script>
 {/if}
 
-<div class="container containerPadding pollContainer" data-poll-id="{@$poll->pollID}" data-can-vote="{if $poll->canVote()}1{else}0{/if}" data-can-view-result="{if $poll->canSeeResult()}1{else}0{/if}" data-can-view-participants="{if $poll->canViewParticipants()}true{else}false{/if}" data-in-vote="{if $poll->canVote() && !$poll->isParticipant()}1{else}0{/if}" data-question="{$poll->question}" data-max-votes="{@$poll->maxVotes}">
+<div class="container containerPadding pollContainer" data-poll-id="{@$poll->pollID}" data-can-vote="{if $poll->canVote()}1{else}0{/if}" data-can-view-result="{if $poll->canSeeResult()}1{else}0{/if}" data-can-view-participants="{if $poll->canViewParticipants()}true{else}false{/if}" data-in-vote="{if $poll->canVote() && !$poll->isParticipant()}1{else}0{/if}" data-question="{$poll->question}" data-max-votes="{@$poll->maxVotes}" data-is-public="{if $poll->isPublic}true{else}false{/if}">
 	<fieldset>
 		<legend>{$poll->question} <span class="badge jsTooltip" title="{lang}wcf.poll.totalVotes{/lang}">{#$poll->votes}</span></legend>
 		
@@ -40,7 +40,7 @@
 					<button class="small jsButtonPollShowVote">{lang}wcf.poll.button.showVote{/lang}</button>
 					<button class="small jsButtonPollShowResult">{lang}wcf.poll.button.showResult{/lang}</button>
 				{/if}
-				{if $poll->canViewParticipants()}
+				{if $poll->canViewParticipants() || ($poll->canVote() && $poll->isPublic)}
 					<button class="small jsButtonPollShowParticipants">{lang}wcf.poll.button.showParticipants{/lang}</button>
 				{/if}
 				
diff --git a/wcfsetup/install/files/js/WCF.Poll.js b/wcfsetup/install/files/js/WCF.Poll.js
index 0a4b6847e5..0fa60e317b 100644
--- a/wcfsetup/install/files/js/WCF.Poll.js
+++ b/wcfsetup/install/files/js/WCF.Poll.js
@@ -483,6 +483,11 @@ WCF.Poll.Manager = Class.extend({
 				// display results
 				this._canViewResult[$pollID] = true;
 				this._canVote[$pollID] = (data.canVote) ? true : false;
+				
+				if (this._polls[$pollID].data('isPublic')) {
+					this._canViewParticipants[$pollID] = true;
+				}
+				
 				this._showResult(null, $pollID);
 			break;
 		}