projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* refactored the system so that it keeps pictures in a seperate table
[selectricity]
/
app
/
models
/
election.rb
diff --git
a/app/models/election.rb
b/app/models/election.rb
index 59a10bfbe601387eac1b72de2c9fcec03c99560c..a77f4457bb581fba8588e1cf7ee479932851f409 100644
(file)
--- a/
app/models/election.rb
+++ b/
app/models/election.rb
@@
-15,6
+15,12
@@
class Election < ActiveRecord::Base
require 'date'
require 'date'
+ def initialize(params={})
+ super
+ self.enddate = read_attribute( :enddate ) || \
+ Time.now + 14.days - 1.second
+ end
+
def other_methods
if election_method
@other_methods = ELECTION_TYPES.reject {|i| i == election_method}
def other_methods
if election_method
@other_methods = ELECTION_TYPES.reject {|i| i == election_method}
@@
-27,11
+33,6
@@
class Election < ActiveRecord::Base
def startdate
read_attribute( :startdate ) || Time.now
end
def startdate
read_attribute( :startdate ) || Time.now
end
-
- def enddate
- date = read_attribute( :enddate ) || Time.now + 14
- date - 1.second
- end
def enddate=(date)
date += 1.day
def enddate=(date)
date += 1.day
@@
-56,7
+57,6
@@
class Election < ActiveRecord::Base
def start_blockers
reasons = []
def start_blockers
reasons = []
-
if self.candidates.length <= 1
reasons << "You must have at least two candidates."
end
if self.candidates.length <= 1
reasons << "You must have at least two candidates."
end
Benjamin Mako Hill
||
Want to submit a patch?