From f1474f4432b5059d58a70f51a3ccbe619fd0234a Mon Sep 17 00:00:00 2001 From: Khan Thompson Date: Mon, 13 Feb 2012 01:09:01 +1100 Subject: [PATCH 1/3] Adding a comment to the models config file for the scaffolded site to help avoid gotcha --- yesod/scaffold/config/models.cg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yesod/scaffold/config/models.cg b/yesod/scaffold/config/models.cg index c6e732e2..bebe304c 100644 --- a/yesod/scaffold/config/models.cg +++ b/yesod/scaffold/config/models.cg @@ -9,3 +9,5 @@ Email UniqueEmail email -- By default this file is used in Model.hs (which is imported by Foundation.hs) + -- If you are using the devel server, and don't see your changes being generated, + -- you need to 'touch' the Model.hs file \ No newline at end of file From 68e8bfd2c148b5b14f297b9b3e5c25d55a85163b Mon Sep 17 00:00:00 2001 From: Khan Thompson Date: Mon, 13 Feb 2012 03:19:01 +1100 Subject: [PATCH 2/3] Add in handling for the persistFileWith case in determining dependent files for the yesod devel server --- yesod/Build.hs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/yesod/Build.hs b/yesod/Build.hs index 3527bf8d..097dab53 100644 --- a/yesod/Build.hs +++ b/yesod/Build.hs @@ -138,8 +138,12 @@ determineHamletDeps x = do <|> (A.string "$(widgetFile " >> return Hamlet) <|> (A.string "$(Settings.hamletFile " >> return Hamlet) <|> (A.string "$(Settings.widgetFile " >> return Hamlet) - <|> (A.string "$(persistFile " >> return Verbatim) <|> (A.string "$(parseRoutesFile " >> return Verbatim) + <|> (A.string "$(persistFile " >> return Verbatim) + <|> (do + A.string "$(persistFileWith " + A.many1 $ A.satisfy (/= '"') + return Verbatim) <|> (do _ <- A.string "\nmkMessage \"" A.skipWhile (/= '"') From 2c597fe01f4ffb30b77881ebd864e4d20bf3dad1 Mon Sep 17 00:00:00 2001 From: Khan Thompson Date: Mon, 13 Feb 2012 03:21:28 +1100 Subject: [PATCH 3/3] Revert "Adding a comment to the models config file for the scaffolded site to help avoid gotcha" This reverts commit f1474f4432b5059d58a70f51a3ccbe619fd0234a. --- yesod/scaffold/config/models.cg | 2 -- 1 file changed, 2 deletions(-) diff --git a/yesod/scaffold/config/models.cg b/yesod/scaffold/config/models.cg index bebe304c..c6e732e2 100644 --- a/yesod/scaffold/config/models.cg +++ b/yesod/scaffold/config/models.cg @@ -9,5 +9,3 @@ Email UniqueEmail email -- By default this file is used in Model.hs (which is imported by Foundation.hs) - -- If you are using the devel server, and don't see your changes being generated, - -- you need to 'touch' the Model.hs file \ No newline at end of file