From 552a3f46ffb6118373592fc846d56fe571461e54 Mon Sep 17 00:00:00 2001 From: Bel LaPointe Date: Wed, 16 Feb 2022 07:57:25 -0700 Subject: [PATCH] whatdahey --- spike/review/reinvent/ezmded/server/server.go | 8 ++++---- spike/review/reinvent/ezmded/ui/templates/_filetree.ctmpl | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/spike/review/reinvent/ezmded/server/server.go b/spike/review/reinvent/ezmded/server/server.go index 516e028..96a21e8 100644 --- a/spike/review/reinvent/ezmded/server/server.go +++ b/spike/review/reinvent/ezmded/server/server.go @@ -216,10 +216,10 @@ func (server *Server) uiSearchHandler(w http.ResponseWriter, r *http.Request) er } data := make([]struct { Title string - ID string + ID ID }, len(idsTitles)) for i := range idsTitles { - data[i].ID = idsTitles[i][0] + data[i].ID = NewID(idsTitles[i][0]) data[i].Title = idsTitles[i][1] } tree := server.tree() @@ -278,8 +278,8 @@ func (server *Server) uiFilesHandler(w http.ResponseWriter, r *http.Request) err "This": map[string]string{ "Title": leaf.Title, "Content": leaf.Content, - "ID": r.URL.Path, - "PID": strings.TrimPrefix(path.Dir(r.URL.Path), "/"), + "ID": ID, + "PID": ID.Pop(), "PTitle": parent.Title, }, "Tree": string(branchesJSON), diff --git a/spike/review/reinvent/ezmded/ui/templates/_filetree.ctmpl b/spike/review/reinvent/ezmded/ui/templates/_filetree.ctmpl index 3ee47f9..23f3e26 100644 --- a/spike/review/reinvent/ezmded/ui/templates/_filetree.ctmpl +++ b/spike/review/reinvent/ezmded/ui/templates/_filetree.ctmpl @@ -42,6 +42,7 @@ const name=`filetree-leaf-${nameSafeId}` const parentname=`filetree-leaf-${parentNameSafeId}` const title=id ? branch.Leaf.Title : "ROOT" + const isLive = `{{ .This.ID }}` return `