Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-16 04:12:53 +01:00
Merge branch 'fix-attachment-sharing' of https://github.com/jjlin/vaultwarden into jjlin-fix-attachment-sharing
Dieser Commit ist enthalten in:
Commit
41add45e67
2 geänderte Dateien mit 0 neuen und 16 gelöschten Zeilen
|
@ -687,12 +687,6 @@ fn put_cipher_share_selected(
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
let attachments = Attachment::find_by_ciphers(cipher_ids, &conn);
|
|
||||||
|
|
||||||
if !attachments.is_empty() {
|
|
||||||
err!("Ciphers should not have any attachments.")
|
|
||||||
}
|
|
||||||
|
|
||||||
while let Some(cipher) = data.Ciphers.pop() {
|
while let Some(cipher) = data.Ciphers.pop() {
|
||||||
let mut shared_cipher_data = ShareCipherData {
|
let mut shared_cipher_data = ShareCipherData {
|
||||||
Cipher: cipher,
|
Cipher: cipher,
|
||||||
|
|
|
@ -143,16 +143,6 @@ impl Attachment {
|
||||||
}}
|
}}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_by_ciphers(cipher_uuids: Vec<String>, conn: &DbConn) -> Vec<Self> {
|
|
||||||
db_run! { conn: {
|
|
||||||
attachments::table
|
|
||||||
.filter(attachments::cipher_uuid.eq_any(cipher_uuids))
|
|
||||||
.load::<AttachmentDb>(conn)
|
|
||||||
.expect("Error loading attachments")
|
|
||||||
.from_db()
|
|
||||||
}}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn size_by_user(user_uuid: &str, conn: &DbConn) -> i64 {
|
pub fn size_by_user(user_uuid: &str, conn: &DbConn) -> i64 {
|
||||||
db_run! { conn: {
|
db_run! { conn: {
|
||||||
let result: Option<i64> = attachments::table
|
let result: Option<i64> = attachments::table
|
||||||
|
|
Laden …
In neuem Issue referenzieren