andrey/album
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Fix ordering.

Browse Source
This commit is contained in:
Rasmus Kaj 2016-11-03 16:01:20 +01:00
parent e2784cc75c
commit 704c930010
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.rs
View File

@ -258,7 +258,7 @@ fn tag_one<'mw>(req: &mut Request,
use rphotos::schema::tags::dsl::{slug, tags}; use rphotos::schema::tags::dsl::{slug, tags};
let c: &PgConnection = &req.db_conn(); let c: &PgConnection = &req.db_conn();
if let Ok(tag) = tags.filter(slug.eq(tslug)).first::<Tag>(c) { if let Ok(tag) = tags.filter(slug.eq(tslug)).first::<Tag>(c) {
use rphotos::schema::photos::dsl::id; use rphotos::schema::photos::dsl::{date, grade, id};
use rphotos::schema::photo_tags::dsl::{photo_id, photo_tags, tag_id}; use rphotos::schema::photo_tags::dsl::{photo_id, photo_tags, tag_id};
return render(res, |o| templates::tag( return render(res, |o| templates::tag(
o, o,
@ -266,10 +266,8 @@ fn tag_one<'mw>(req: &mut Request,
Photo::query(req.authorized_user().is_some()) Photo::query(req.authorized_user().is_some())
.filter(id.eq_any(photo_tags.select(photo_id) .filter(id.eq_any(photo_tags.select(photo_id)
.filter(tag_id.eq(tag.id)))) .filter(tag_id.eq(tag.id))))
.order((grade.desc().nulls_last(), date.desc().nulls_last()))
.load(c).unwrap(), .load(c).unwrap(),
// TODO
// .desc_nulls_last("grade")
// .desc_nulls_last("date")
tag)); tag));
} }
res.error(StatusCode::NotFound, "Not a tag") res.error(StatusCode::NotFound, "Not a tag")
@ -306,7 +304,7 @@ fn place_one<'mw>(req: &mut Request,
use rphotos::schema::places::dsl::{places, slug}; use rphotos::schema::places::dsl::{places, slug};
let c: &PgConnection = &req.db_conn(); let c: &PgConnection = &req.db_conn();
if let Ok(place) = places.filter(slug.eq(tslug)).first::<Place>(c) { if let Ok(place) = places.filter(slug.eq(tslug)).first::<Place>(c) {
use rphotos::schema::photos::dsl::id; use rphotos::schema::photos::dsl::{date, grade, id};
use rphotos::schema::photo_places::dsl::{photo_id, photo_places, use rphotos::schema::photo_places::dsl::{photo_id, photo_places,
place_id}; place_id};
return render(res, |o| templates::place( return render(res, |o| templates::place(
@ -315,10 +313,8 @@ fn place_one<'mw>(req: &mut Request,
Photo::query(req.authorized_user().is_some()) Photo::query(req.authorized_user().is_some())
.filter(id.eq_any(photo_places.select(photo_id) .filter(id.eq_any(photo_places.select(photo_id)
.filter(place_id.eq(place.id)))) .filter(place_id.eq(place.id))))
.order((grade.desc().nulls_last(), date.desc().nulls_last()))
.load(c).unwrap(), .load(c).unwrap(),
// TODO
// .desc_nulls_last("grade")
// .desc_nulls_last("date")
place)); place));
} }
res.error(StatusCode::NotFound, "Not a place") res.error(StatusCode::NotFound, "Not a place")
@ -355,7 +351,7 @@ fn person_one<'mw>(req: &mut Request,
use rphotos::schema::people::dsl::{people, slug}; use rphotos::schema::people::dsl::{people, slug};
let c: &PgConnection = &req.db_conn(); let c: &PgConnection = &req.db_conn();
if let Ok(person) = people.filter(slug.eq(tslug)).first::<Person>(c) { if let Ok(person) = people.filter(slug.eq(tslug)).first::<Person>(c) {
use rphotos::schema::photos::dsl::id; use rphotos::schema::photos::dsl::{date, grade, id};
use rphotos::schema::photo_people::dsl::{person_id, photo_id, use rphotos::schema::photo_people::dsl::{person_id, photo_id,
photo_people}; photo_people};
return render(res, |o| templates::person( return render(res, |o| templates::person(
@ -364,10 +360,8 @@ fn person_one<'mw>(req: &mut Request,
Photo::query(req.authorized_user().is_some()) Photo::query(req.authorized_user().is_some())
.filter(id.eq_any(photo_people.select(photo_id) .filter(id.eq_any(photo_people.select(photo_id)
.filter(person_id.eq(person.id)))) .filter(person_id.eq(person.id))))
.order((grade.desc().nulls_last(), date.desc().nulls_last()))
.load(c).unwrap(), .load(c).unwrap(),
// TODO
// .desc_nulls_last("grade")
// .desc_nulls_last("date")
person)); person));
} }
res.error(StatusCode::NotFound, "Not a person") res.error(StatusCode::NotFound, "Not a person")