1
0
Fork 0
forked from jriou/coller

Compare commits

..

2 commits

Author SHA1 Message Date
33628331f4 feat: set default expiration in select (#28)
No default value in select could be interpreted as ever lasting note.
Default value in the select makes that clearer.

Co-authored-by: Thibault Piron <thibault.a.piron@gmail.com>
Reviewed-on: jriou/coller#28
Reviewed-by: Julien Riou <jriou@monitoring@riou.xyz>
Co-authored-by: tapiron <tapiron@monitoring@riou.xyz>
Co-committed-by: tapiron <tapiron@monitoring@riou.xyz>
2025-09-15 06:51:16 +02:00
938d10c3a6 fix: remove double rendering and test error (#26)
Remove double template rendering and test error for non password protected note

Co-authored-by: Thibault Piron <thibault.a.piron@gmail.com>
Reviewed-on: jriou/coller#26
Reviewed-by: Julien Riou <jriou@monitoring@riou.xyz>
Co-authored-by: tapiron <tapiron@monitoring@riou.xyz>
Co-committed-by: tapiron <tapiron@monitoring@riou.xyz>
2025-09-13 19:10:50 +02:00
2 changed files with 5 additions and 6 deletions

View file

@ -189,6 +189,7 @@ type PageData struct {
Title string
Version string
Expirations []int
Expiration int
Languages []string
Err error
URL string
@ -345,9 +346,6 @@ func (h *GetWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return
}
h.PageData.Err = fmt.Errorf("jriou")
h.Templates.ExecuteTemplate(w, templateName, h.PageData)
h.PageData.Note = note
h.logger.Debug("rendering note web page")
@ -426,6 +424,7 @@ func (s *Server) Start() error {
p := PageData{
Title: s.config.Title,
Expirations: s.config.Expirations,
Expiration: s.config.Expiration,
Languages: s.config.Languages,
}

View file

@ -36,9 +36,9 @@
</div>
<div class="col">
<select class="form-select" aria-label="Expiration" id="expiration" name="expiration">
<option selected="selected" disabled>Expiration</option>
{{range .Expirations}}
<option value="{{.}}">{{HumanDuration .}}</option>
<option disabled>Expiration</option>
{{range $exp := .Expirations}}
<option {{ if eq $exp $.Expiration }}selected="selected"{{end}} value="{{$exp}}">{{HumanDuration $exp}}</option>
{{end}}
</select>
</div>