tournament 3.3.2 → 3.3.3

data/History.txt

@@ -1,3 +1,6 @@
+== 3.3.3 / 2010-03-21
+* Show link to possibility report if stats file exists.
+
 == 3.3.2 / 2010-03-17
 * More regressions: Fix Tourny Bracket link when logged in as pool owner.
   Fix create entry to set the user_id so the new permissions checking actually

data/lib/tournament.rb

@@ -7,7 +7,7 @@ unless defined? Tournament
 module Tournament
 
   # :stopdoc:
-  VERSION = '3.3.2'
+  VERSION = '3.3.3'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/webgui/app/controllers/admin_controller.rb

@@ -3,19 +3,27 @@ class AdminController < ApplicationController
   include SavesPicks
 
   def edit
-    @entry = Entry.find_by_user_id(current_user.id)
+    @entry = Entry.find(params[:id])
     if @entry
       @pool = @entry.pool
-      save_picks(@entry)
-      if @entry.save(false)
+      if params[:reset] == 'Reset Picks'
+        @entry.reset
+        flash[:info] = "Tournament bracket reset."
+      else
+        save_picks(@entry)
+        flash[:info] = "Tournament bracket updated."
+      end
+      if @entry.save_with_validation(false)
         @pool.pool.tournament_entry = @entry.tournament_entry
         @pool.save
-        flash[:info] = "Tournament bracket updated."
         redirect_to :action => 'bracket', :id => @pool.id
+        return
       else
         @pool = @pool.pool
+        flash[:info] = nil
         flash[:error] = "Could not save entry."
         render :action => 'bracket', :layout => 'bracket'
+        return
       end
     else
       flash[:error] = "Tournament bracket has not yet been initialized."

data/webgui/app/controllers/reports_controller.rb

@@ -3,6 +3,7 @@ class ReportsController < ApplicationController
   layout 'report'
   def show
     @pool = Pool.find(params[:id])
+    @has_poss_stats = File.exist?(self.stats_data_file(@pool.id))
     if params[:report] == 'possibility'
       possibility
     end

data/webgui/app/views/reports/show.html.erb

@@ -5,7 +5,7 @@
 <% if @pool.started? -%>
 <li><%= link_to 'Score', :report => 'score'%></li>
 <li><%= link_to 'Leader', :report => 'leader'%></li>
-<% if @pool.pool.tournament_entry.picks.teams_left <= 16 %>
+<% if @has_poss_stats %>
 <li><%= link_to 'Possibility', :report => 'possibility'%></li>
 <% end %>
 <% if @pool.pool.tournament_entry.picks.teams_left <= 4 %>

data/webgui/app/views/shared/_admins.html.erb

@@ -2,7 +2,7 @@
 <i>Need help?</i>  Contact an admin ...
 <ul>
 <% Role[:admin].users.each do |admin| -%>
-<li><%= admin.name %> <%= link_to admin.email, "mailto:#{admin.email}" %>
+<li><%= admin.name %> <%= link_to admin.email, "mailto:#{admin.email}" %></li>
 <% end -%>
 </ul>
 </p>

data/webgui/app/views/shared/_bracket.html.erb

@@ -95,10 +95,11 @@ Current Score: <%= @entry.bracket.score_against(@pool.tournament_entry.picks, @p
 <TR>
 <TD class="space" colspan="17">&nbsp;</TD>
 <!-- SEED 1 TOP  1/33 -->
+</TR>
 <TR>
 <TD class="space">&nbsp;</TD>
 <TD class="odd">
-<span class="<%=classes[1]%>" id="<%=ids[1]%>" team="<%=teams[1]%>" onclick="<%=onclicks[1]%>" onmouseover="<%=onmouseovers[1]%>" onmouseout="<%=onmouseouts[1]%>"><%=contents[1]%></span>
+<span class="<%=classes[1].strip%>" id="<%=ids[1]%>" team="<%=teams[1]%>" onclick="<%=onclicks[1]%>" onmouseover="<%=onmouseovers[1]%>" onmouseout="<%=onmouseouts[1]%>"><%=contents[1]%></span>
 </TD>
 <TD class="space">&nbsp;</TD>
 <TD class="space">&nbsp;</TD>

data/webgui/lib/prince.rb

@@ -25,6 +25,7 @@ class Prince
   def initialize()
     # Finds where the application lives, so we can call it.
     @exe_path = defined?(PRINCE_PATH) ? PRINCE_PATH : `which prince`.chomp
+    @exe_path = 'no prince' if @exe_path.blank?
   	@style_sheets = ''
   	@log_file = "#{RAILS_ROOT}/log/prince.log"
   end

data/webgui/test/fixtures/entries.yml

@@ -8,3 +8,12 @@ user1_entry1:
   user_id: 1
   pool_id: 2
   completed: false
+pool2_tournament_entry:
+  id: 2
+  name: Tournament Bracket
+  created_at: 2009-01-01 05:00
+  updated_at: 2009-01-01 05:00
+  tie_break:
+  user_id: 4
+  pool_id: 2
+  completed: false

data/webgui/test/fixtures/pools.yml

@@ -9,6 +9,7 @@ one:
 two:
   id: 2
   name: Test Pool 2
+  user_id: 4
   data:
   started: false
   starts_at: <%= Time.now + 5.days %>

data/webgui/test/functional/entry_controller_test.rb

@@ -9,7 +9,7 @@ class EntryControllerTest < ActionController::TestCase
     assert pool.accepting_entries?, "Pool with id = 4 should be taking entries."
     post(:edit, {:picks => "111000000000000000000000000000000000000000000000000000000000000",
       :id => 1, :entry => {:name => 'Test', :tie_break => 42}, :pool_id => 2})
-    assert_redirected_to :action => 'show'
+    assert_redirected_to :controller => 'entry', :action => 'show', :id => 1
     assert_nil flash[:error]
     assert_equal "Changes were saved.", flash[:info]
     assert_equal "You still have remaining games in this entry to pick.", flash[:notice]
@@ -25,6 +25,35 @@ class EntryControllerTest < ActionController::TestCase
     assert_equal "You can't make changes to your entry, the pool has already started.", flash[:error]
   end
 
+  test "can edit new entry" do
+    login_as :quentin
+    pool = Pool.find(2)
+    get :new, :id => pool.id
+    entry = assigns['entry']
+    assert_not_nil entry, "Entry should be set"
+    assert entry.new_record?, "Entry should be new, not saved"
+    assert_select "span[class~='teamname']" do |elems|
+      elems.each do |elem|
+        assert elem.attributes["onclick"].length() > 0, "There should be onclick handlers on the teamname spans."
+      end
+    end
+  end
+
+  test "can not edit tournament entry" do
+    login_as :quentin
+    pool = Pool.find(2)
+    get :show, :id => pool.tournament_entry.id
+    entry = assigns['entry']
+    assert_not_nil entry, "Entry should be set"
+    assert !entry.new_record?, "Entry should not be new"
+    assert_select "span[class~='teamname']" do |elems|
+      elems.each do |elem|
+        assert elem.attributes["onclick"].length() == 0, "There should not be onclick handlers on the teamname spans."
+      end
+    end
+  end
+
+
   test "entry can change name" do
     login_as :quentin
     pool = Pool.find(2)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 3
-  - 2
-  version: 3.3.2
+  - 3
+  version: 3.3.3
 platform: ruby
 authors: 
 - Douglas A. Seifert
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 -07:00
+date: 2010-03-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ files:
 - lib/tournament/scoring_strategy.rb
 - lib/tournament/team.rb
 - lib/tournament/webgui_installer.rb
+- pool.dat
 - spec/spec_helper.rb
 - spec/tournament_spec.rb
 - static/shoes-icon.png