saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-10 18:55:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into rocket-0.4

Browse Source 
# Conflicts:
#	src/db/models/organization.rs
This commit is contained in:
Daniel García
2018-11-14 16:14:49 +01:00
parent 4638786507 3cb911a52f
commit f84cbeaaf8
10 changed files with 163 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/models/user.rs
View File

@@ -157,7 +157,7 @@ impl User {
pub fn delete(self, conn: &DbConn) -> QueryResult<()> {
for user_org in UserOrganization::find_by_user(&self.uuid, &*conn) {
if user_org.type_ == UserOrgType::Owner as i32 {
if user_org.type_ == UserOrgType::Owner {
if UserOrganization::find_by_org_and_type(
&user_org.org_uuid,
UserOrgType::Owner as i32, &conn