diff options
| author | Harald Eilertsen <haraldei@anduin.net> | 2019-04-08 16:25:54 +0200 |
|---|---|---|
| committer | Harald Eilertsen <haraldei@anduin.net> | 2019-04-08 16:25:54 +0200 |
| commit | 30f65b62e84fcd9975643716d61fa21bc8495291 (patch) | |
| tree | 28839044ab6acac3d94f0b0280c036b16d3bfddf /src/controllers | |
| parent | ad0e585abed7a189b6117e9187c9afff809d1414 (diff) | |
| download | ramaskrik-social-30f65b62e84fcd9975643716d61fa21bc8495291.tar.gz ramaskrik-social-30f65b62e84fcd9975643716d61fa21bc8495291.tar.bz2 ramaskrik-social-30f65b62e84fcd9975643716d61fa21bc8495291.zip | |
Import model structs to main models module.
Diffstat (limited to 'src/controllers')
| -rw-r--r-- | src/controllers/film.rs | 4 | ||||
| -rw-r--r-- | src/controllers/room.rs | 4 | ||||
| -rw-r--r-- | src/controllers/screening.rs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/controllers/film.rs b/src/controllers/film.rs index e61a543..827b3ab 100644 --- a/src/controllers/film.rs +++ b/src/controllers/film.rs @@ -18,7 +18,7 @@ use crate::{ db, - models::film, + models, }; use rocket::get; @@ -27,6 +27,6 @@ use rocket_contrib::{ }; #[get("/")] -pub fn get_films(db: db::Connection) -> Json<Vec<film::Film>> { +pub fn get_films(db: db::Connection) -> Json<Vec<models::Film>> { Json(db.get_films().unwrap()) } diff --git a/src/controllers/room.rs b/src/controllers/room.rs index a203454..419afae 100644 --- a/src/controllers/room.rs +++ b/src/controllers/room.rs @@ -18,7 +18,7 @@ use crate::{ db, - models::room, + models, }; use rocket::get; @@ -27,6 +27,6 @@ use rocket_contrib::{ }; #[get("/")] -pub fn get_rooms(db: db::Connection) -> Json<Vec<room::Room>> { +pub fn get_rooms(db: db::Connection) -> Json<Vec<models::Room>> { Json(db.get_rooms().unwrap()) } diff --git a/src/controllers/screening.rs b/src/controllers/screening.rs index 622e9cb..29b6afa 100644 --- a/src/controllers/screening.rs +++ b/src/controllers/screening.rs @@ -18,7 +18,7 @@ use crate::{ db, - models::{screening::Screening, film::Film, room::Room}, + models::{Film, Room, Screening}, }; use rocket::get; |