Fix 'Edit Results' button.

Team254 · May 16, 2024 · a092655 · a092655
1 parent 689a3bf
commit a092655
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/templates/edit_match_result.html b/templates/edit_match_result.html
@@ -15,7 +15,8 @@
         <div id="blueScore"></div>
         <div class="row">
           <div class="text-center col-lg-12">
-            <a href="/match_review"><button type="button" class="btn btn-secondary">Cancel</button></a>
+            <a href="{{if .IsCurrentMatch}}/match_play{{else}}/match_review{{end}}"><button type="button"
+              class="btn btn-secondary">Cancel</button></a>
             <button type="submit" class="btn btn-primary">Save</button>
           </div>
         </div>

diff --git a/templates/match_play.html b/templates/match_play.html
@@ -72,10 +72,10 @@
           onclick="$('#confirmDiscardResults').modal('show');" disabled>
         Discard Results
       </button>
-      <a href="/match_review/current/edit" role="button" class="btn btn-secondary btn-match-play ms-1 disabled"
-        disabled>
+      <button type="button" id="editResults" class="btn btn-secondary btn-match-play ms-1"
+          onclick="window.location = '/match_review/current/edit';" disabled>
         Edit Results
-      </a>
+      </button>
     </div>
     <div class="card card-body bg-body-tertiary mt-3">
       <div class="row">

diff --git a/web/match_review.go b/web/match_review.go
@@ -76,7 +76,7 @@ func (web *Web) matchReviewEditGetHandler(w http.ResponseWriter, r *http.Request
 		return
 	}
 
-	match, matchResult, _, err := web.getMatchResultFromRequest(r)
+	match, matchResult, isCurrent, err := web.getMatchResultFromRequest(r)
 	if err != nil {
 		handleWebErr(w, err)
 		return
@@ -96,8 +96,9 @@ func (web *Web) matchReviewEditGetHandler(w http.ResponseWriter, r *http.Request
 		*model.EventSettings
 		Match           *model.Match
 		MatchResultJson string
+		IsCurrentMatch  bool
 		Rules           map[int]*game.Rule
-	}{web.arena.EventSettings, match, string(matchResultJson), game.GetAllRules()}
+	}{web.arena.EventSettings, match, string(matchResultJson), isCurrent, game.GetAllRules()}
 	err = template.ExecuteTemplate(w, "base", data)
 	if err != nil {
 		handleWebErr(w, err)