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

Fix edit bug staging (#582)

Browse Source 
* Fix edit bug staging

* Fix comp err

* Fix mod message bug

* Fix compile bug

* Run fmt

* Fix other bug
This commit is contained in:
Geometrically
2023-04-21 13:55:50 -07:00
committed by GitHub
parent 3a6b9f04f9
commit 72cfa683cf
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/routes/v2/projects.rs
View File

@@ -1052,7 +1052,9 @@ pub async fn project_edit(
} }
if let Some(moderation_message) = &new_project.moderation_message { if let Some(moderation_message) = &new_project.moderation_message {
if !user.role.is_mod() && project_item.inner.status != ProjectStatus::Approved { if !user.role.is_mod()
&& (!project_item.inner.status.is_approved() || moderation_message != &None)
{
return Err(ApiError::CustomAuthentication( return Err(ApiError::CustomAuthentication(
"You do not have the permissions to edit the moderation message of this project!" "You do not have the permissions to edit the moderation message of this project!"
.to_string(), .to_string(),
@@ -1073,7 +1075,10 @@ pub async fn project_edit(
} }
if let Some(moderation_message_body) = &new_project.moderation_message_body { if let Some(moderation_message_body) = &new_project.moderation_message_body {
if !user.role.is_mod() && project_item.inner.status != ProjectStatus::Approved { if !user.role.is_mod()
&& (!project_item.inner.status.is_approved()
|| moderation_message_body != &None)
{
return Err(ApiError::CustomAuthentication( return Err(ApiError::CustomAuthentication(
"You do not have the permissions to edit the moderation message body of this project!" "You do not have the permissions to edit the moderation message body of this project!"
.to_string(), .to_string(),
@@ -1268,7 +1273,7 @@ pub async fn projects_edit(
if !user.role.is_mod() { if !user.role.is_mod() {
if let Some(member) = team_members if let Some(member) = team_members
.iter() .iter()
.find(|x| x.team_id == project.inner.team_id) .find(|x| x.team_id == project.inner.team_id && x.user.id == user.id.into())
{ {
if !member.permissions.contains(Permissions::EDIT_DETAILS) { if !member.permissions.contains(Permissions::EDIT_DETAILS) {
return Err(ApiError::CustomAuthentication(format!( return Err(ApiError::CustomAuthentication(format!(