Small fixes

portnov [2009-07-09 17:48:40]
Small fixes
Filename
Framework/Pager.hs
diff --git a/Framework/Pager.hs b/Framework/Pager.hs
index b2e17b0..4a68ffe 100644
--- a/Framework/Pager.hs
+++ b/Framework/Pager.hs
@@ -21,11 +21,11 @@ import Framework.Http.Vars
 type Pager = HttpRequest -> Int -> Int -> String

 -- | Simple pager
-pager :: Int->                                     -- ^ Number of items per page
-         Query->                                   -- ^ Query itself
-         [SqlValue]->                              -- ^ Query parameters
-         Model->                                   -- ^ Model to return
-         Controller ActionConfig ([Model], String) -- ^ (List of models, pager HTML)
+pager :: Int                                       -- ^ Number of items per page
+      -> Query                                     -- ^ Query itself
+      -> [SqlValue]                                -- ^ Query parameters
+      -> Model                                     -- ^ Model to return
+      -> Controller ActionConfig ([Model], String) -- ^ (List of models, pager HTML)
 pager = genericPager genpager

 -- | Generic pager function
@@ -43,11 +43,11 @@ genericPager pg perpage q params model = do
       then do items <- querySQL' q params model
               return (items, "")
       else do
+        rq <- asks request
         let page = read $ httpGetVar' rq "page" "1"
         let first = (page-1)*perpage
         let pages = (itemCount `div` perpage)+1
         items <- querySQL' (q `limit` (first,perpage)) params model
-        rq <- asks request
         return (items, pg rq pages page)

 -- | Simple pager HTML generator
ViewGit