@@ -86,12 +86,12 @@ helpers do "%s's Calendar" % @user.login end - def get_user_and_progressions(extra = 0) + def get_user_and_progressions(extra = 0, name = params[:name]) [:year, :month].each do |key| value = params[key].to_i params[key] = value.zero? ? Date.today.send(key) : value end - if @user = Seinfeld::User.first(:login => params[:name]) + if @user = Seinfeld::User.first(:login => name) Time.zone = @user.time_zone || "UTC" progressions = @user.progress_for(params[:year], params[:month], extra) end @@ -113,8 +113,7 @@ helpers do @progressions = Set.new @users = params[:names].split(',') @users.each do |name| - params[:name] = name # hack - @progressions.merge get_user_and_progressions(6) + @progressions.merge get_user_and_progressions(6, name) end haml :group end seinfeld_calendar.rb 47d39958153d2de96b09b74e8dab42c64c100cdd Jeffrey Chupp jchupp@politics4all.com http://github.com/entp/seinfeld/commit/485339c8fa9001dd2fa00b4085dbedac73bb9a82 485339c8fa9001dd2fa00b4085dbedac73bb9a82 2009-04-20T17:15:13-07:00 2009-04-20T15:56:24-07:00 removing name "hack" from show_group_calendar Signed-off-by: rick <technoweenie@gmail.com> b999930218c19002b110956bb392b52248adf061 rick technoweenie@gmail.com