Changeset 876929

Timestamp:

03/18/2014 02:55:44 AM (12 years ago)

Author:

scotthack

Message:

Fixed Final Four Mismatch Bug

Location:

bracketpress

Files:

• tags/1.6.1 (added)
• tags/1.6.1/assets (added)
• tags/1.6.1/bracketpress-config.php (added)
• tags/1.6.1/bracketpress.php (added)
• tags/1.6.1/includes (added)
• tags/1.6.1/includes/admin (added)
• tags/1.6.1/includes/admin/admin.php (added)
• tags/1.6.1/includes/admin/settings.php (added)
• tags/1.6.1/includes/classes (added)
• tags/1.6.1/includes/classes/bracketpresshooks.php (added)
• tags/1.6.1/includes/core (added)
• tags/1.6.1/includes/core/actions.php (added)
• tags/1.6.1/includes/core/options.php (added)
• tags/1.6.1/includes/core/subactions.php (added)
• tags/1.6.1/includes/models (added)
• tags/1.6.1/includes/models/match.php (added)
• tags/1.6.1/includes/models/queries.php (added)
• tags/1.6.1/install (added)
• tags/1.6.1/install/install.php (added)
• tags/1.6.1/install/install.sql.php (added)
• tags/1.6.1/lib (added)
• tags/1.6.1/lib/ajax.php (added)
• tags/1.6.1/lib/bracketpress-shortcodes.php (added)
• tags/1.6.1/lib/bracketpress-widgets.php (added)
• tags/1.6.1/lib/functions.php (added)
• tags/1.6.1/media (added)
• tags/1.6.1/media/css (added)
• tags/1.6.1/media/css/bracket.css (added)
• tags/1.6.1/media/css/bracket_readonly.css (added)
• tags/1.6.1/media/css/jquery-ui-theme.css (added)
• tags/1.6.1/media/images (added)
• tags/1.6.1/media/images/Button-Add-icon.png (added)
• tags/1.6.1/media/images/ajax-loader.gif (added)
• tags/1.6.1/media/images/region_key.png (added)
• tags/1.6.1/readme.txt (added)
• tags/1.6.1/templates (added)
• tags/1.6.1/templates/addons.php (added)
• tags/1.6.1/templates/bracket_display.php (added)
• tags/1.6.1/templates/bracket_edit.js (added)
• tags/1.6.1/templates/bracket_edit.php (added)
• tags/1.6.1/templates/changepositions.php (added)
• tags/1.6.1/templates/locations.php (added)
• tags/1.6.1/templates/teams.php (added)
• trunk/bracketpress.php (modified) (1 diff)
• trunk/templates/bracket_edit.js (modified) (3 diffs)

bracketpress/trunk/bracketpress.php

@@ -1 +1 @@
 <?php
 /*
-Plugin Name: BracketPress (Scott Hack Special Edition)
+Plugin Name: BracketPress
 Description: Run and score a tournament bracket pool.
 Author: Scott Hack and Nick Temple
 Author URI: http://www.bracketpress.com
-Version: 1.6.0
+Version: 1.6.1
 */
 

bracketpress/trunk/templates/bracket_edit.js

@@ -110 +110 @@
 
     sel_match = get_sel_match(15);
-    if (sel_match['winner_id']) set_team(62, 1, sel_match.winner_id);
+    if (sel_match['winner_id']) set_team(61, 1, sel_match.winner_id);
 
     sel_match = get_sel_match(30);
@@ -116 +116 @@
 
     sel_match = get_sel_match(45);
+    if (sel_match['winner_id']) set_team(62, 1, sel_match.winner_id);
+
+    sel_match = get_sel_match(60);
     if (sel_match['winner_id']) set_team(62, 2, sel_match.winner_id);
 
-    sel_match = get_sel_match(60);
-    if (sel_match['winner_id']) set_team(61, 1, sel_match.winner_id);
+
 
     sel_match = get_sel_match(61);
@@ -449 +451 @@
         // Save the current winner if we have one
         winner = $('#get_team_selector_match61').val();
-        $('#get_team_selector_match61').html('<option value="0">~Select~</option>');       // clear the select box
+        //$('#get_team_selector_match61').html('<option value="0">~Select~</option>');       // clear the select box
 
         // Add the items
-        set_team(61, 1, $('#get_team_selector_midwest_match60').val(), winner );
-        set_team(61, 2, $('#get_team_selector_west_match30').val(), winner );
+        //set_team(61, 1, $('#get_team_selector_midwest_match60').val(), winner );
+        //set_team(61, 2, $('#get_team_selector_west_match30').val(), winner );
 
         // Save the current winner if we have one
         winner = $('#get_team_selector_match62').val();
-        $('#get_team_selector_match62').html('<option value="0">~Select~</option>');       // clear the select box
+        //$('#get_team_selector_match62').html('<option value="0">~Select~</option>');       // clear the select box
 
         // Add the items
-        set_team(62, 1, $('#get_team_selector_south_match15').val(), winner );
-        set_team(62, 2, $('#get_team_selector_east_match45').val(), winner );
+       // set_team(62, 1, $('#get_team_selector_south_match15').val(), winner );
+       // set_team(62, 2, $('#get_team_selector_east_match45').val(), winner );
 
         // Clear and create the final round