fixed voting problem #2

dextra · Jan 27, 2012 · bf0cc97 · bf0cc97
1 parent 1447146
commit bf0cc97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/models/bet.rb b/app/models/bet.rb
@@ -28,7 +28,7 @@ class Bet < ActiveRecord::Base
   acts_as_activity_provider :timestamp => "#{table_name}.created_at", 
     :find_options => {:include => [{:issue => :project}, :author]},
     :author_key => :user_id,
-    :permission => :permission_bet
+    :permission => :issues_poll_bet
 
 
   validates_presence_of :votes, :author, :issue

diff --git a/lib/issues_poll_user_patch.rb b/lib/issues_poll_user_patch.rb
@@ -32,13 +32,13 @@ module ClassMethods
   module InstanceMethods
     def polls_votes_project(project_id)
       votes = poll_votes.find(:first, :conditions => ["project_id = ?", project_id])
-      votes.nil? ? nil : votes.votes
+      votes.nil? ? nil : votes.votes.to_i
     end
 
     def can_bet?(project_id, bet_votes)
       project = Project.find(project_id)
       available_votes = self.polls_votes_project(project_id)
-      project.enabled_module_names.include?('issues_poll') and available_votes and available_votes > bet_votes
+      project.enabled_module_names.include?('issues_poll') and available_votes and available_votes >= bet_votes
     end
 
     def votes_bet_by_issue(issue_id)