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

Fix to redirects to play nice with Tomcat.

Browse source
This commit is contained in:
Simon Brooke 2014-11-11 17:51:01 +00:00
parent 8bb2f6d249
commit d99ee25806
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,7 @@
(let [params (keywordize-keys (:params request)) (let [params (keywordize-keys (:params request))
content (or (:content params) "Introduction")] content (or (:content params) "Introduction")]
(spit file-path source-text) (spit file-path source-text)
(response/redirect (str "wiki?" content)) (response/redirect (str "/wiki?" content))
)) ))
(defn edit-page (defn edit-page
@ -76,7 +76,7 @@
:header (util/md->html "/content/_header.md") :header (util/md->html "/content/_header.md")
:content (local-links (util/md->html file-name)) :content (local-links (util/md->html file-name))
:user (session/get :user)}) :user (session/get :user)})
true (response/redirect (str "edit?content=" content))))) true (response/redirect (str "/edit?content=" content)))))
(defn auth-page (defn auth-page
"Render the auth page" "Render the auth page"
@ -91,11 +91,11 @@
(= action "Logout!") (= action "Logout!")
(do (do
(session/remove! :user) (session/remove! :user)
(response/redirect "wiki")) (response/redirect "/wiki"))
(and username password (auth/authenticate username password)) (and username password (auth/authenticate username password))
(do (do
(session/put! :user username) (session/put! :user username)
(response/redirect "wiki")) (response/redirect "/wiki"))
true true
(layout/render "auth.html" (layout/render "auth.html"
{:title (if user (str "Logout " user) "Log in") {:title (if user (str "Logout " user) "Log in")