Fix conflict

This commit is contained in:
Chris Tsang 2021-09-21 22:00:02 +08:00
parent 2404411351
commit c80621916a

View File

@ -90,6 +90,7 @@ async fn list(
let paginator = Post::find()
.order_by_asc(post::Column::Id)
.paginate(&conn, posts_per_page);
let num_pages = paginator.num_pages().await.ok().unwrap();
// Fetch paginated posts
let posts = paginator
@ -104,7 +105,7 @@ async fn list(
posts_per_page: posts_per_page,
posts: posts,
flash: flash.map(FlashMessage::into_inner),
num_pages: paginator.num_pages().await.ok().unwrap(),
num_pages: num_pages,
},
)
}