projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for voting in QuickVotes.
[selectricity]
/
app
/
models
/
vote.rb
diff --git
a/app/models/vote.rb
b/app/models/vote.rb
index 429e212377781d27aa4a5580d9dcb65abd5b19eb..7678f5463900034de67c6ff2dff60c2d281a059c 100644
(file)
--- a/
app/models/vote.rb
+++ b/
app/models/vote.rb
@@
-49,18
+49,16
@@
class Vote < ActiveRecord::Base
def confirm!
self.confirmed = 1
self.save
def confirm!
self.confirmed = 1
self.save
-
- token.destroy and token.reload if token
- self.token = Token.new
- self.save
+
+ unless self.voter.election.quickvote?
+ token.destroy and token.reload if token
+ self.token = Token.new
+ self.save
+ end
end
def confirm?
end
def confirm?
- if confirm == 1
- return true
- else
- return false
- end
+ confirmed == 1
end
def votestring=(string="")
end
def votestring=(string="")
Benjamin Mako Hill
||
Want to submit a patch?