]> projects.mako.cc - selectricity-live/commitdiff
Scrollbar if someone creates too many electons to fit within defualt given room for...
author<jlsharps@mit.edu> <>
Thu, 17 Jul 2008 21:46:20 +0000 (17:46 -0400)
committer<jlsharps@mit.edu> <>
Thu, 17 Jul 2008 21:46:20 +0000 (17:46 -0400)
1  2 
app/controllers/election_controller.rb

index 68d59cc520fd1905474a12dea3991894682151af,7f87b2efa4a7f979b9cb912816c76015f768e9bf..be2fb3d2c9efd26c5deb6e8ee150249b5e509ac2
@@@ -46,6 -46,7 +46,6 @@@ class ElectionController < ApplicationC
      @election.anonymous = 1
      @election.startdate = Time.now
      
 -    
      holder = create_theme_hash
      unless holder.values.all? {|v| v.has_value?("")}
        token_generator = UniqueTokenGenerator.new( 16 )
@@@ -79,7 -80,6 +79,6 @@@
    def update_general_information
      @election = Election.find(params[:id])
      
-     
      holder = create_theme_hash
      unless holder.values.all? {|v| v.has_value?("")}
        unless @election.embed_custom_string
      end
    end
    
--  #Takes care of uploading custom images -- unnecessarily long, how can I compress?
++  #Takes care of uploading custom images 
++  #unnecessarily long, how can I compress?
    def add_theme(prefix)
++    holder = create_theme_hash
      unless params[:top_bar][:uploaded_data].to_s.empty?
        previous = SkinPicture.find(:first,
        :conditions => ["filename = ?", @election.embed_custom_string + "top_bar.png"])

Benjamin Mako Hill || Want to submit a patch?