Mercurial > urweb

diff demo/more/conference.ur @ 1027:be1aec7333a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Saving paper assignments
author Adam Chlipala <adamc@hcoop.net>
date Mon, 02 Nov 2009 14:11:08 -0500
parents 7facf72aaf0a
children 53a22f46f377
line wrap: on
line diff
--- a/demo/more/conference.ur	Mon Nov 02 11:37:41 2009 -0500
+++ b/demo/more/conference.ur	Mon Nov 02 14:11:08 2009 -0500
@@ -35,7 +35,8 @@
     constraint [Paper] ~ yourPaperTables
     val joinYourPaper : tabs ::: {{Type}} -> paper ::: {Type}
         -> [[Paper] ~ tabs] => [[Paper] ~ yourPaperTables] => [tabs ~ yourPaperTables] => [[Id] ~ paper] =>
-        sql_from_items ([Paper = [Id = paperId] ++ paper] ++ tabs)
+        userId
+        -> sql_from_items ([Paper = [Id = paperId] ++ paper] ++ tabs)
         -> sql_from_items (yourPaperTables ++ [Paper = [Id = paperId] ++ paper] ++ tabs)
 end
 
@@ -305,7 +306,7 @@
     and your () =
         me <- getLogin;
         listPapers (sql_query {Rows = sql_query1 {Distinct = False,
-                                                  From = O.joinYourPaper (sql_from_table [#Paper] paper),
+                                                  From = O.joinYourPaper me.Id (sql_from_table [#Paper] paper),
                                                   Where = (WHERE TRUE),
                                                   GroupBy = sql_subset_all [_],
                                                   Having = (WHERE TRUE),