Allow to keep query params in paginate

Fix #349
2018-12-12 00:51:45 +01:00
parent 144f5966dd
commit fcbaf6eee3
3 changed files with 26 additions and 10 deletions
@@ -29,13 +29,11 @@ pub struct SearchQuery {
 macro_rules! param_to_query {
    ( $query:ident, $parsed_query:ident; normal: $($field:ident),*; date: $($date:ident),*) => {
        $(
-            if let Some(ref field) = $query.$field {
-                let mut rest = field.as_str();
-                while !rest.is_empty() {
-                    let (token, r) = Query::get_first_token(rest);
-                    rest = r;
-                    $parsed_query.$field(token, None);
-                }
+            let mut rest = $query.$field.as_ref().map(String::as_str).unwrap_or_default();
+            while !rest.is_empty() {
+                let (token, r) = Query::get_first_token(rest);
+                rest = r;
+                $parsed_query.$field(token, None);
            }
        )*
        $(