Show diff links in page history

Closes #55
mdbot · Apr 9, 2021 · 1c0ab08 · 1c0ab08
1 parent d885368
commit 1c0ab08
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/handlers_history.go b/handlers_history.go
@@ -42,7 +42,26 @@ func PageHistoryHandler(t *Templates, pp HistoryProvider) http.HandlerFunc {
 			number = len(history.Entries) + 1
 		}
 
-		t.RenderHistory(w, r, pageTitle, history.Entries[:number-1], next)
+		var entries []*HistoryEntry
+		for i := range history.Entries[:number-1] {
+			e := history.Entries[i]
+
+			var previousChange = ""
+			if i+1 < len(history.Entries) {
+				previousChange = history.Entries[i+1].ChangeId
+			}
+
+			entries = append(entries, &HistoryEntry{
+				Latest:           start == "" && i == 0,
+				ChangeId:         e.ChangeId,
+				PreviousChangeId: previousChange,
+				User:             e.User,
+				Time:             e.Time,
+				Message:          e.Message,
+			})
+		}
+
+		t.RenderHistory(w, r, pageTitle, entries, next)
 	}
 }
 

diff --git a/resources/templates/history.gohtml b/resources/templates/history.gohtml
@@ -26,7 +26,13 @@
                 </td>
                 <td>
                     <a href="/view/{{$.Common.PageTitle}}?rev={{.ChangeId}}">view</a>
-                    <a href="/revert/{{$.Common.PageTitle}}?rev={{.ChangeId}}">revert to this version</a>
+                    {{ if not .Latest }}
+                        | <a href="/revert/{{$.Common.PageTitle}}?rev={{.ChangeId}}">revert to this version</a>
+                        | <a href="/diff/{{$.Common.PageTitle}}?startrev={{.ChangeId}}&amp;endrev=HEAD">compare to latest</a>
+                    {{ end }}
+                    {{if .PreviousChangeId}}
+                        | <a href="/diff/{{$.Common.PageTitle}}?startrev={{.PreviousChangeId}}&amp;endrev={{.ChangeId}}">compare to previous</a>
+                    {{end}}
                 </td>
             </tr>
         {{end}}

diff --git a/templates.go b/templates.go
@@ -173,11 +173,20 @@ func (t *Templates) RenderUploadForm(w http.ResponseWriter, r *http.Request) {
 
 type HistoryPageArgs struct {
 	Common  CommonArgs
-	History []*LogEntry
+	History []*HistoryEntry
 	Next    string
 }
 
-func (t *Templates) RenderHistory(w http.ResponseWriter, r *http.Request, title string, entries []*LogEntry, next string) {
+type HistoryEntry struct {
+	ChangeId         string
+	PreviousChangeId string
+	Latest           bool
+	User             string
+	Time             time.Time
+	Message          string
+}
+
+func (t *Templates) RenderHistory(w http.ResponseWriter, r *http.Request, title string, entries []*HistoryEntry, next string) {
 	t.render("history.gohtml", http.StatusOK, w, &HistoryPageArgs{
 		Common: t.populateArgs(w, r, CommonArgs{
 			PageTitle:      title,
@@ -340,7 +349,7 @@ func (t *Templates) RenderSearch(w http.ResponseWriter, r *http.Request, pattern
 
 type DiffPageArgs struct {
 	Common CommonArgs
-	Diff []diffmatchpatch.Diff
+	Diff   []diffmatchpatch.Diff
 }
 
 func (t *Templates) RenderDiff(w http.ResponseWriter, r *http.Request, diff []diffmatchpatch.Diff) {