projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged in from code from the other master
[selectricity-live]
/
app
/
models
/
quick_vote.rb
diff --git
a/app/models/quick_vote.rb
b/app/models/quick_vote.rb
index e0bab76fccf4a8654dffabb461eb105aadd6a1fd..f9e1b83d8a02b81cf81c4c28fdc6323df7b48126 100644
(file)
--- a/
app/models/quick_vote.rb
+++ b/
app/models/quick_vote.rb
@@
-1,6
+1,5
@@
class QuickVote < Election
before_validation :build_candidate_names
class QuickVote < Election
before_validation :build_candidate_names
- after_validation :create_candidates
validates_uniqueness_of :name
attr_accessor :candidate_names
validates_uniqueness_of :name
attr_accessor :candidate_names
@@
-11,8
+10,6
@@
class QuickVote < Election
self.startdate = Time.now
self.active = 1
self.anonymous = 1 unless self.anonymous
self.startdate = Time.now
self.active = 1
self.anonymous = 1 unless self.anonymous
- self.enddate = read_attribute( :enddate ) || \
- Time.now + 30.days - 1.second
end
def validate
end
def validate
@@
-62,8
+59,8
@@
class QuickVote < Election
def build_candidate_names
@candidate_names ||= []
def build_candidate_names
@candidate_names ||= []
- if @candidate_names.empty? and not candidates.empty?
- @candidate_names = candidates.collect {|c| c.name}
+ if @candidate_names.empty? and not
self.
candidates.empty?
+ @candidate_names =
self.
candidates.collect {|c| c.name}
end
end
end
end
Benjamin Mako Hill
||
Want to submit a patch?