X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/cf4234876994cb4b7e09cdd116e092424d9f4951..a7c9f5ae54334ea4c0c1308b931b143cf1449f48:/app/models/quick_vote.rb?ds=inline

diff --git a/app/models/quick_vote.rb b/app/models/quick_vote.rb
index 0efb574..ad72717 100644
--- a/app/models/quick_vote.rb
+++ b/app/models/quick_vote.rb
@@ -1,6 +1,7 @@
 class QuickVote < Election
   after_validation :create_candidates
   validates_uniqueness_of :name
+  validates_presence_of :name
   attr_accessor :raw_candidates
   attr_accessor :reviewed
   attr_accessor :plurality_result
@@ -17,6 +18,9 @@ class QuickVote < Election
     if name =~ /[^A-Za-z0-9]/
       errors.add(:name, "must only include numbers and letters.")
     end
+    if name =~ /^[0-9]+$/
+      errors.add(:name, "must not be a number")
+    end
     
     if name =~ /^(create|index|confirm|change|results)$/
       errors.add(:name, " is a reserved word.")
@@ -36,7 +40,7 @@ class QuickVote < Election
   end
 
   def name
-    read_attribute( :name ).downcase()
+    read_attribute( :name ).downcase() if read_attribute( :name )
   end
 
   def reviewed?