We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 89aa60e1 authored by David L. L. Thomas's avatar David L. L. Thomas

Merge commit 'refs/merge-requests/21' of gitorious.org:snowdrift/snowdrift into wolftune

parents 482e76ba 34f930cf
......@@ -7,7 +7,7 @@ import Import
import Handler.Comment
import Handler.Discussion
import Handler.Utils
import Handler.Wiki.Comment (makeWikiPageCommentForestWidget)
import Handler.Wiki.Comment (makeWikiPageCommentForestWidget, wikiDiscussionPage)
import Model.Comment
import Model.Comment.ActionPermissions
import Model.Comment.Sql
......@@ -257,7 +257,7 @@ postNewWikiDiscussionR project_handle target = do
wikiPageDiscussion
(makeProjectCommentActionPermissionsMap (Just user) project_handle def) >>= \case
Left comment_id -> redirect (WikiCommentR project_handle target comment_id)
Right (widget, form) -> defaultLayout $ previewWidget form "post" ($(widgetFile "wiki_discussion_wrapper"))
Right (widget, form) -> defaultLayout $ previewWidget form "post" (wikiDiscussionPage project_handle target widget)
--------------------------------------------------------------------------------
-- /#target/diff/#from/#to
......
......@@ -133,11 +133,13 @@ renderWikiPageEvent :: Text -> WikiPageId -> WikiPage -> UserMap -> Widget
renderWikiPageEvent project_handle _ wiki_page _ = do
-- TODO(aaron)
-- The commented stuff here (and in the whamlet commented part)
-- is because there's no wikiPageUser yet and the
-- user_map is also not needed until this is active--
-- is because there's no wikiPageUser and the
-- user_map is also not needed until that is active--
-- let editor = fromMaybe
-- (error "renderWikiPageEvent: wiki editor not found in user map")
-- (M.lookup (wikiPageUser wiki_page) user_map)
--perhaps instead of a wikiPageUser, we should just figure out how to pull
--the user from the first wiki edit for the event of new pages
--
[whamlet|
<div .event>
......
......@@ -65,12 +65,12 @@
$forall closure <- earlier_closures
<div .closed>
A comment above this one was closed at ^{renderTime (commentClosingTs closure)}
A comment above was closed at ^{renderTime (commentClosingTs closure)}
#{commentClosingReason closure}
$forall retract <- earlier_retracts
<div .retracted>
A comment above this one was retracted ^{renderTime (commentRetractingTs retract)}
A comment above was retracted ^{renderTime (commentRetractingTs retract)}
#{commentRetractingReason retract}
$maybe closure <- mclosure
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment