eightequal/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix revocation of invites, allow for /user_id/teams to be useful

Browse Source
This commit is contained in:
Geometrically
2020-12-27 18:50:10 -07:00
parent 833cb99f41
commit 8c1688657a
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/teams.rs
View File

@@ -27,6 +27,7 @@ pub async fn team_members_get(
let team_members: Vec<crate::models::teams::TeamMember> = members_data
.into_iter()
.map(|data| crate::models::teams::TeamMember {
team_id: id,
user_id: data.user_id.into(),
role: data.role,
permissions: Some(data.permissions),
@@ -44,6 +45,7 @@ pub async fn team_members_get(
if team_member.accepted {
team_members.push(
crate::models::teams::TeamMember {
team_id: id,
user_id: team_member.user_id.into(),
role: team_member.role,
permissions: None,
@@ -298,7 +300,7 @@ pub async fn remove_team_member(
}
};
let delete_member = TeamMember::get_from_user_id(id, user_id, &**pool).await?;
let delete_member = TeamMember::get_from_user_id_pending(id, user_id, &**pool).await?;
if let Some(delete_member) = delete_member {
if delete_member.role == crate::models::teams::OWNER_ROLE {

1
src/routes/users.rs
View File

@@ -175,6 +175,7 @@ pub async fn teams(
let team_members: Vec<crate::models::teams::TeamMember> = results
.into_iter()
.map(|data| crate::models::teams::TeamMember {
team_id: data.team_id.into(),
user_id: data.user_id.into(),
role: data.role,
permissions: if same_user {