simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/grcss

Browse source
This commit is contained in:
Simon Brooke 2020-02-14 11:44:06 +00:00
commit b7a7c4cfc8
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/templates/base.html
View file

@ -46,7 +46,9 @@
</div> </div>
</div> </div>
<h1>{% i18n site-title %}: {{title}}</h1> <h1>{% i18n site-title %}: {{title}}</h1>
<div id="header">
{{header|safe}} {{header|safe}}
</div>
{% if message %} {% if message %}
<div id="message"> <div id="message">
<p class="message">{{message}}</p> <p class="message">{{message}}</p>

14
src/smeagol/routes/wiki.clj
View file

@ -15,6 +15,7 @@
[noir.util.route :as route] [noir.util.route :as route]
[noir.session :as session] [noir.session :as session]
[smeagol.authenticate :as auth] [smeagol.authenticate :as auth]
[smeagol.configuration :refer [config]]
[smeagol.diff2html :as d2h] [smeagol.diff2html :as d2h]
[smeagol.formatting :refer [md->html]] [smeagol.formatting :refer [md->html]]
[smeagol.history :as hist] [smeagol.history :as hist]
@ -187,7 +188,6 @@
[request] [request]
(let (let
[params (keywordize-keys (:params request)) [params (keywordize-keys (:params request))
data-path (str util/content-dir "/uploads/")
cl (count (io/resource-path)) cl (count (io/resource-path))
files files
(map (map
@ -202,11 +202,19 @@
(fs/mod-time %) (fs/mod-time %)
(format-instant (fs/mod-time %))) (format-instant (fs/mod-time %)))
(fs/name %) (fs/name %)
(subs (str (fs/absolute %)) cl)]) (try
(subs (str (fs/absolute %)) cl)
(catch StringIndexOutOfBoundsException x
(log/error "Could not resolve relative path for" %
";\n resource-path is:" (io/resource-path)
";\n absolute path is:" (fs/absolute %)
";\n data-path is:" util/upload-dir
";\n content path is:" (:content-dir config))
%))])
(remove (remove
#(or (cs/starts-with? (fs/name %) ".") #(or (cs/starts-with? (fs/name %) ".")
(fs/directory? %)) (fs/directory? %))
(file-seq (clojure.java.io/file data-path))))] (file-seq (clojure.java.io/file util/upload-dir))))]
(log/info (with-out-str (pprint files))) (log/info (with-out-str (pprint files)))
(layout/render (layout/render
"list-uploads.html" "list-uploads.html"