Fix deprecation warnings

This commit is contained in:
2022-04-18 17:13:41 +02:00
parent fad92c5930
commit 5cf1f63674
9 changed files with 39 additions and 51 deletions

View File

@ -16,21 +16,21 @@ use crate::utils::string_utils::rand_str;
#[derive(Template)]
#[template(path = "settings/clients_list.html")]
struct ClientsListTemplate {
_parent: BaseSettingsPage,
_p: BaseSettingsPage,
clients: Vec<Client>,
}
#[derive(Template)]
#[template(path = "settings/users_list.html")]
struct UsersListTemplate {
_parent: BaseSettingsPage,
_p: BaseSettingsPage,
users: Vec<User>,
}
#[derive(Template)]
#[template(path = "settings/edit_user.html")]
struct EditUserTemplate {
_parent: BaseSettingsPage,
_p: BaseSettingsPage,
u: User,
clients: Vec<Client>,
}
@ -38,7 +38,7 @@ struct EditUserTemplate {
pub async fn clients_route(user: CurrentUser, clients: web::Data<ClientManager>) -> impl Responder {
HttpResponse::Ok().body(ClientsListTemplate {
_parent: BaseSettingsPage::get(
_p: BaseSettingsPage::get(
"Clients list",
&user,
None,
@ -122,7 +122,7 @@ pub async fn users_route(user: CurrentUser, users: web::Data<Addr<UsersActor>>,
let users = users.send(users_actor::GetAllUsersRequest).await.unwrap().0;
HttpResponse::Ok().body(UsersListTemplate {
_parent: BaseSettingsPage::get(
_p: BaseSettingsPage::get(
"Users list",
&user,
danger,
@ -134,7 +134,7 @@ pub async fn users_route(user: CurrentUser, users: web::Data<Addr<UsersActor>>,
pub async fn create_user(user: CurrentUser, clients: web::Data<ClientManager>) -> impl Responder {
HttpResponse::Ok().body(EditUserTemplate {
_parent: BaseSettingsPage::get("Create a new user", user.deref(), None, None),
_p: BaseSettingsPage::get("Create a new user", user.deref(), None, None),
u: Default::default(),
clients: clients.cloned(),
}.render().unwrap())
@ -155,7 +155,7 @@ pub async fn edit_user(user: CurrentUser,
HttpResponse::Ok().body(EditUserTemplate {
_parent: BaseSettingsPage::get(
_p: BaseSettingsPage::get(
"Edit user account",
user.deref(),
match edited_account.is_none() {