projects
/
selectricity-live
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Variety of small changes (mostly to properties) plus a few "in the
[selectricity-live]
/
app
/
models
/
election.rb
diff --git
a/app/models/election.rb
b/app/models/election.rb
old mode 100644
(file)
new mode 100755
(executable)
index
eaf0727
..
0907e68
--- a/
app/models/election.rb
+++ b/
app/models/election.rb
@@
-8,11
+8,18
@@
class Election < ActiveRecord::Base
require 'date'
def startdate
require 'date'
def startdate
- read_attribute( :startdate ) ||
Date
Time.now
+ read_attribute( :startdate ) || Time.now
end
def enddate
end
def enddate
- read_attribute( :enddate ) || DateTime.now + 14
+ date = read_attribute( :enddate ) || Time.now + 14
+ date - 1.second
+ end
+
+ def enddate=(date)
+ date += 1.day
+ date = Time.gm(*date)
+ super(date)
end
def destroy
end
def destroy
@@
-38,12
+45,21
@@
class Election < ActiveRecord::Base
def activate!
self.active = 1
def activate!
self.active = 1
+ self.save!
end
def quickvote?
quickvote.to_i == 1
end
end
def quickvote?
quickvote.to_i == 1
end
+ def active?
+ active == 1
+ end
+
+ def done?
+ active == 2
+ end
+
def shortdesc
shortdesc = description.split(/\n/)[0]
end
def shortdesc
shortdesc = description.split(/\n/)[0]
end
Benjamin Mako Hill
||
Want to submit a patch?