aboutsummaryrefslogtreecommitdiff
path: root/src/db/models/organization.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/db/models/organization.rs')
-rw-r--r--src/db/models/organization.rs28
1 files changed, 15 insertions, 13 deletions
diff --git a/src/db/models/organization.rs b/src/db/models/organization.rs
index 1eeb04d2..9931ed5b 100644
--- a/src/db/models/organization.rs
+++ b/src/db/models/organization.rs
@@ -1,8 +1,8 @@
+use num_traits::FromPrimitive;
use serde_json::Value;
use std::cmp::Ordering;
-use num_traits::FromPrimitive;
-use super::{CollectionUser, User, OrgPolicy};
+use super::{CollectionUser, OrgPolicy, User};
db_object! {
#[derive(Identifiable, Queryable, Insertable, AsChangeset)]
@@ -35,8 +35,7 @@ pub enum UserOrgStatus {
Confirmed = 2,
}
-#[derive(Copy, Clone, PartialEq, Eq)]
-#[derive(num_derive::FromPrimitive)]
+#[derive(Copy, Clone, PartialEq, Eq, num_derive::FromPrimitive)]
pub enum UserOrgType {
Owner = 0,
Admin = 1,
@@ -117,7 +116,10 @@ impl PartialOrd<UserOrgType> for i32 {
}
fn le(&self, other: &UserOrgType) -> bool {
- matches!(self.partial_cmp(other), Some(Ordering::Less) | Some(Ordering::Equal) | None)
+ matches!(
+ self.partial_cmp(other),
+ Some(Ordering::Less) | Some(Ordering::Equal) | None
+ )
}
}
@@ -236,7 +238,6 @@ impl Organization {
UserOrganization::delete_all_by_organization(&self.uuid, &conn)?;
OrgPolicy::delete_all_by_organization(&self.uuid, &conn)?;
-
db_run! { conn: {
diesel::delete(organizations::table.filter(organizations::uuid.eq(self.uuid)))
.execute(conn)
@@ -347,11 +348,13 @@ impl UserOrganization {
let collections = CollectionUser::find_by_organization_and_user_uuid(&self.org_uuid, &self.user_uuid, conn);
collections
.iter()
- .map(|c| json!({
- "Id": c.collection_uuid,
- "ReadOnly": c.read_only,
- "HidePasswords": c.hide_passwords,
- }))
+ .map(|c| {
+ json!({
+ "Id": c.collection_uuid,
+ "ReadOnly": c.read_only,
+ "HidePasswords": c.hide_passwords,
+ })
+ })
.collect()
};
@@ -446,8 +449,7 @@ impl UserOrganization {
}
pub fn has_full_access(&self) -> bool {
- (self.access_all || self.atype >= UserOrgType::Admin) &&
- self.has_status(UserOrgStatus::Confirmed)
+ (self.access_all || self.atype >= UserOrgType::Admin) && self.has_status(UserOrgStatus::Confirmed)
}
pub fn find_by_uuid(uuid: &str, conn: &DbConn) -> Option<Self> {