Merge 5cb8fee0ad into a2ad1dc7c3

src/db/models/user.rs

@@ -284,21 +284,22 @@ impl User {
 
         db_run! {conn:
             sqlite, mysql {
-                match diesel::replace_into(users::table)
+                let value = UserDb::to_db(self);
-                    .values(UserDb::to_db(self))
+                // Don't use replace_into() since it wants to delete the record first.
+                match diesel::update(users::table)
+                    .filter(users::uuid.eq(&self.uuid))
+                    .set(&value)
                     .execute(conn)
                 {
-                    Ok(_) => Ok(()),
+                    Ok(1) => Ok(()),
-                    // Record already exists and causes a Foreign Key Violation because replace_into() wants to delete the record first.
+                    Ok(_) => {
-                    Err(diesel::result::Error::DatabaseError(diesel::result::DatabaseErrorKind::ForeignKeyViolation, _)) => {
+                        diesel::insert_into(users::table)
-                        diesel::update(users::table)
+                            .values(value)
-                            .filter(users::uuid.eq(&self.uuid))
-                            .set(UserDb::to_db(self))
                             .execute(conn)
                             .map_res("Error saving user")
                     }
                     Err(e) => Err(e.into()),
-                }.map_res("Error saving user")
+                }.map_res("Error updating user")
             }
             postgresql {
                 let value = UserDb::to_db(self);

src/static/scripts/admin_users.js

@@ -33,11 +33,11 @@ function deleteSSOUser(event) {
         alert("Required parameters not found!");
         return false;
     }
-    const input_email = prompt(`To delete user "${email}", please type the email below`);
+    const input_email = prompt(`To delete user "${email}" SSO association, please type the email below`);
     if (input_email != null) {
         if (input_email == email) {
             _delete(`${BASE_URL}/admin/users/${id}/sso`,
-                "User SSO Associtation deleted correctly",
+                "User SSO association deleted correctly",
                 "Error deleting user SSO association"
             );
         } else {