Merge pull request #101 from VSEphpbb/vote-fix

Disable vote button if user already voted

Author: DavidIQ

event/listener.php

@@ -203,6 +203,25 @@ public function show_idea($event)
 			$this->auth->acl_get('f_vote', (int) $this->config['ideas_forum_id']) &&
 			$event['topic_data']['topic_status'] != ITEM_LOCKED);
 
+		$s_voted_up = $s_voted_down = false;
+		if ($idea['idea_votes_up'] || $idea['idea_votes_down'])
+		{
+			$votes = $this->ideas->get_voters($idea['idea_id']);
+
+			foreach ($votes as $vote)
+			{
+				$this->template->assign_block_vars('votes_' . ($vote['vote_value'] ? 'up' : 'down'), array(
+					'USER' => $vote['user'],
+				));
+
+				if ($this->user->data['user_id'] == $vote['user_id'])
+				{
+					$s_voted_up = ((int) $vote['vote_value'] === 1);
+					$s_voted_down = ((int) $vote['vote_value'] === 0);
+				}
+			}
+		}
+
 		$this->template->assign_vars(array(
 			'IDEA_ID'			=> $idea['idea_id'],
 			'IDEA_TITLE'		=> $idea['idea_title'],
@@ -226,6 +245,9 @@ public function show_idea($event)
 			'S_IS_MOD'			=> $mod,
 			'S_CAN_EDIT'		=> $mod || $own,
 			'S_CAN_VOTE'		=> $can_vote,
+			'S_CAN_VOTE_UP'		=> $can_vote && !$s_voted_up,
+			'S_CAN_VOTE_DOWN'	=> $can_vote && !$s_voted_down,
+			'S_VOTED'			=> $s_voted_up || $s_voted_down,
 
 			'U_CHANGE_STATUS'	=> $this->link_helper->get_idea_link($idea['idea_id'], 'status', true),
 			'U_EDIT_DUPLICATE'	=> $this->link_helper->get_idea_link($idea['idea_id'], 'duplicate', true),
@@ -236,27 +258,6 @@ public function show_idea($event)
 			'U_IDEA_VOTE'		=> $this->link_helper->get_idea_link($idea['idea_id'], 'vote', true),
 		));
 
-		if ($idea['idea_votes_up'] || $idea['idea_votes_down'])
-		{
-			$s_voted = false;
-
-			$votes = $this->ideas->get_voters($idea['idea_id']);
-
-			foreach ($votes as $vote)
-			{
-				$this->template->assign_block_vars('votes_' . ($vote['vote_value'] ? 'up' : 'down'), array(
-					'USER' => $vote['user'],
-				));
-
-				if ($this->user->data['user_id'] == $vote['user_id'])
-				{
-					$s_voted = true;
-				}
-			}
-
-			$this->template->assign_var('S_VOTED', $s_voted);
-		}
-
 		// Use Ideas breadcrumbs
 		$this->template->destroy_block_vars('navlinks');
 		$this->template->assign_block_vars('navlinks', array(

styles/prosilver/template/idea_body.html

@@ -15,8 +15,8 @@
 			<dt class="idealabel">{{ lang('RATING') ~ lang('COLON') }}</dt>
 			<dd>
 				<div class="rating">
-					<a {% if S_CAN_VOTE %}href="{{ U_IDEA_VOTE }}"{% endif %} class="minivoteup {{ S_CAN_VOTE ? 'voteup' : 'dead' }}" title="{{ lang('VOTE_UP') }}" data-l-err="{{ lang('ERROR') }}" data-l-msg="{{ lang('VOTE_ERROR') ~ lang('COLON') }}"><span>{{ IDEA_VOTES_UP }}</span></a> &nbsp;
-					<a {% if S_CAN_VOTE %}href="{{ U_IDEA_VOTE }}"{% endif %} class="minivotedown {{ S_CAN_VOTE ? 'votedown' : 'dead' }}" title="{{ lang('VOTE_DOWN') }}" data-l-err="{{ lang('ERROR') }}" data-l-msg="{{ lang('VOTE_ERROR') ~ lang('COLON') }}"><span>{{ IDEA_VOTES_DOWN }}</span></a>
+					<a {% if S_CAN_VOTE %}href="{{ U_IDEA_VOTE }}"{% endif %} class="minivoteup {{ S_CAN_VOTE_UP ? 'voteup' : 'dead' }}" title="{{ lang('VOTE_UP') }}" data-l-err="{{ lang('ERROR') }}" data-l-msg="{{ lang('VOTE_ERROR') ~ lang('COLON') }}"><span>{{ IDEA_VOTES_UP }}</span></a> &nbsp;
+					<a {% if S_CAN_VOTE %}href="{{ U_IDEA_VOTE }}"{% endif %} class="minivotedown {{ S_CAN_VOTE_DOWN ? 'votedown' : 'dead' }}" title="{{ lang('VOTE_DOWN') }}" data-l-err="{{ lang('ERROR') }}" data-l-msg="{{ lang('VOTE_ERROR') ~ lang('COLON') }}"><span>{{ IDEA_VOTES_DOWN }}</span></a>
 					<a href="#" class="votes bg3" data-l-msg="{{ lang('CLICK_TO_VIEW') }}">{{ lang('TOTAL_POINTS', IDEA_POINTS) }} {{ IDEA_VOTES ? lang('CLICK_TO_VIEW') }}</a> <span class="successvoted bg3" data-l-err="{{ lang('VOTE_FAIL') }}"></span>
 				</div>
 				<div class="clear"></div>

styles/prosilver/template/ideas.js

@@ -28,8 +28,8 @@
 			successVoted: $('.successvoted'),
 			votes: $('.votes'),
 			votesList: $('.voteslist'),
-			voteDown: $('.votedown'),
-			voteUp: $('.voteup'),
+			voteDown: $('.minivotedown'),
+			voteUp: $('.minivoteup'),
 			voteRemove: $('#vote-remove')
 		};
 

tests/functional/ideas_test.php

@@ -44,8 +44,8 @@ public function test_new_idea()
 		$this->assertContains($this->lang('IDEAS'), $crawler->filter('#nav-breadcrumbs')->text());
 		$this->assertContains($idea['title'], $crawler->filter('h2')->text());
 		$this->assertContains($idea['message'], $crawler->filter('.content')->text());
-		$this->assertContains('1', $crawler->filter('.rating > .voteup')->text());
-		$this->assertContains('0', $crawler->filter('.rating > .votedown')->text());
+		$this->assertContains('1', $crawler->filter('.rating > .minivoteup')->text());
+		$this->assertContains('0', $crawler->filter('.rating > .minivotedown')->text());
 	}
 
 	/**