Merge pull request #216 from mehtadev17/master

Pagination Limits

src/qu/query/validation.clj

@@ -144,6 +144,13 @@
         (catch NumberFormatException e
           (add-error query clause "Please use an integer."))))))
 
+(defn- validate-max-offset
+  [query]
+  (let [offset (->int (:offset query) 0)]
+    (if (> offset 10000)
+      (add-error query :offset (str "The maximum offset is 10,000."))
+      query)))
+
 (defn- validate-max-limit
   [query max]
   (let [limit (->int (:limit query) 0)]
@@ -170,5 +177,6 @@
         validate-where
         validate-order-by
         validate-limit
-        validate-offset)
+        validate-offset
+        validate-max-offset)
     query))

src/qu/views.clj

@@ -229,10 +229,11 @@
           current-page (or (get-in resource [:properties :page]) 1)
           href (:href resource)
           limit (get-in resource [:properties :query :limit])
+          limit-total (if (> total 10000) 10000 total)
           total-pages (if (zero? limit)
                         1
-                        (+ (quot total limit)
-                           (if (zero? (rem total limit)) 0 1)))
+                        (+ (quot limit-total limit)
+                           (if (zero? (rem limit-total limit)) 0 1)))
           window (range (max 1 (- current-page window-size))
                         (inc (min total-pages (+ current-page window-size))))
           in-window? (fn [page]
@@ -250,10 +251,7 @@
                  :href (href-for-page resource 1)})
           (concat [{:page "Next"
                     :class (when (>= current-page total-pages) "disabled")
-                    :href (href-for-page resource (inc current-page))}
-                   {:page "Last"
-                    :class (when (in-window? total-pages) "disabled")
-                    :href (href-for-page resource total-pages)}])))
+                    :href (when (< current-page total-pages) (href-for-page resource (inc current-page)))}])))
     []))
 
 (defmulti slice-query (fn [format _ _] format))