Spiegel von
https://github.com/dani-garcia/vaultwarden.git
synchronisiert 2024-11-04 02:18:00 +01:00
Merge pull request #387 from mprasil/collections_edit_revision
Update revision when adding or removing cipher from collection
Dieser Commit ist enthalten in:
Commit
7ce06b3808
1 geänderte Dateien mit 8 neuen und 0 gelöschten Zeilen
|
@ -278,6 +278,7 @@ pub struct CollectionCipher {
|
||||||
/// Database methods
|
/// Database methods
|
||||||
impl CollectionCipher {
|
impl CollectionCipher {
|
||||||
pub fn save(cipher_uuid: &str, collection_uuid: &str, conn: &DbConn) -> EmptyResult {
|
pub fn save(cipher_uuid: &str, collection_uuid: &str, conn: &DbConn) -> EmptyResult {
|
||||||
|
Self::update_users_revision(&collection_uuid, conn);
|
||||||
diesel::replace_into(ciphers_collections::table)
|
diesel::replace_into(ciphers_collections::table)
|
||||||
.values((
|
.values((
|
||||||
ciphers_collections::cipher_uuid.eq(cipher_uuid),
|
ciphers_collections::cipher_uuid.eq(cipher_uuid),
|
||||||
|
@ -288,6 +289,7 @@ impl CollectionCipher {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn delete(cipher_uuid: &str, collection_uuid: &str, conn: &DbConn) -> EmptyResult {
|
pub fn delete(cipher_uuid: &str, collection_uuid: &str, conn: &DbConn) -> EmptyResult {
|
||||||
|
Self::update_users_revision(&collection_uuid, conn);
|
||||||
diesel::delete(
|
diesel::delete(
|
||||||
ciphers_collections::table
|
ciphers_collections::table
|
||||||
.filter(ciphers_collections::cipher_uuid.eq(cipher_uuid))
|
.filter(ciphers_collections::cipher_uuid.eq(cipher_uuid))
|
||||||
|
@ -308,4 +310,10 @@ impl CollectionCipher {
|
||||||
.execute(&**conn)
|
.execute(&**conn)
|
||||||
.map_res("Error removing ciphers from collection")
|
.map_res("Error removing ciphers from collection")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn update_users_revision(collection_uuid: &str, conn: &DbConn) {
|
||||||
|
if let Some(collection) = Collection::find_by_uuid(collection_uuid, conn) {
|
||||||
|
collection.update_users_revision(conn);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Laden …
In neuem Issue referenzieren