Minor fixes to orderings and permission serialization (#102)

* Fix latest_version in search results

* Handle users with invalid permissions instead of skipping them

* Specify order of some queries, fix serialization of permissions

* Run sqlx prepare
This commit is contained in:
Aeledfyr
2020-11-10 10:27:36 -06:00
committed by GitHub
parent 578d673a4e
commit da911bfeb8
7 changed files with 83 additions and 18 deletions

View File

@@ -30,7 +30,7 @@ pub async fn team_members_get(
user_id: data.user_id.into(),
name: data.name,
role: data.role,
permissions: data.permissions,
permissions: Some(data.permissions),
})
.collect();
@@ -44,7 +44,7 @@ pub async fn team_members_get(
user_id: data.user_id.into(),
name: data.name,
role: data.role,
permissions: Permissions::default(),
permissions: None,
})
.collect();

View File

@@ -1,6 +1,5 @@
use crate::auth::{check_is_moderator_from_headers, get_user_from_headers};
use crate::database::models::{TeamMember, User};
use crate::models::teams::Permissions;
use crate::models::users::{Role, UserId};
use crate::routes::ApiError;
use actix_web::{delete, get, web, HttpRequest, HttpResponse};
@@ -152,9 +151,9 @@ pub async fn teams(
name: data.name,
role: data.role,
permissions: if same_user {
data.permissions
Some(data.permissions)
} else {
Permissions::default()
None
},
})
.collect();