emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "Reverse order sorting to be desc"

Browse source 
This reverts commit 26e119479c.
This commit is contained in:
Vincent Prouillet 2017-06-17 08:42:18 +09:00
parent 6a059d86d0
commit 03bbe9cc90
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -7,8 +7,6 @@
- `path` and `permalink` now end with a `/` - `path` and `permalink` now end with a `/`
- Generate table of contents for each page - Generate table of contents for each page
- Add `section` to a page Tera context if there is one - Add `section` to a page Tera context if there is one
- Reverse `order` sorting to be more intuitive: they are now desc, think of them
as 1st, 2nd in the list
- Add `aliases` to pages for when you are changing urls but want to redirect - Add `aliases` to pages for when you are changing urls but want to redirect
to the new one to the new one

8
src/content/sorting.rs
View file

@ -38,7 +38,7 @@ pub fn sort_pages(pages: Vec<Page>, sort_by: SortBy) -> (Vec<Page>, Vec<Page>) {
cannot_be_sorted.push(page); cannot_be_sorted.push(page);
} }
} }
can_be_sorted.sort_by(|a, b| a.meta.order().cmp(&b.meta.order())); can_be_sorted.sort_by(|a, b| b.meta.order().cmp(&a.meta.order()));
(can_be_sorted, cannot_be_sorted) (can_be_sorted, cannot_be_sorted)
}, },
@ -120,10 +120,10 @@ mod tests {
create_page_with_order(1), create_page_with_order(1),
]; ];
let (pages, _) = sort_pages(input, SortBy::Order); let (pages, _) = sort_pages(input, SortBy::Order);
// Should be sorted by order // Should be sorted by date
assert_eq!(pages[0].clone().meta.order.unwrap(), 1); assert_eq!(pages[0].clone().meta.order.unwrap(), 3);
assert_eq!(pages[1].clone().meta.order.unwrap(), 2); assert_eq!(pages[1].clone().meta.order.unwrap(), 2);
assert_eq!(pages[2].clone().meta.order.unwrap(), 3); assert_eq!(pages[2].clone().meta.order.unwrap(), 1);
} }
#[test] #[test]