mirror of
https://github.com/bitwarden/browser
synced 2025-12-18 01:03:35 +00:00
fixed merge conflict
This commit is contained in:
@@ -604,9 +604,11 @@ export class AddEditComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
protected saveCipher(cipher: Cipher) {
|
||||
const isNotClone = this.editMode && !this.cloneMode;
|
||||
const orgAdmin = this.organization?.isAdmin;
|
||||
return this.cipher.id == null
|
||||
? this.cipherService.createWithServer(cipher)
|
||||
: this.cipherService.updateWithServer(cipher);
|
||||
? this.cipherService.createWithServer(cipher, orgAdmin)
|
||||
: this.cipherService.updateWithServer(cipher, orgAdmin, isNotClone);
|
||||
}
|
||||
|
||||
protected deleteCipher() {
|
||||
|
||||
Reference in New Issue
Block a user