mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix removing entry from history and improve logic of history tab showing

Browse source
This commit is contained in:
qycyfjy 2023-10-21 05:50:55 +08:00 • committed by Jonathan White
parent 6b3eaa7f3e
commit 7bfe9065cf
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/gui/entry/EditEntryWidget.cpp
View file

@ -1190,6 +1190,7 @@ bool EditEntryWidget::commitEntry()
} }
m_historyModel->setEntries(m_entry->historyItems(), m_entry); m_historyModel->setEntries(m_entry->historyItems(), m_entry);
setPageHidden(m_historyWidget, m_history || m_entry->historyItems().count() < 1);
m_advancedUi->attachmentsWidget->linkAttachments(m_entry->attachments()); m_advancedUi->attachmentsWidget->linkAttachments(m_entry->attachments());
showMessage(tr("Entry updated successfully."), MessageWidget::Positive); showMessage(tr("Entry updated successfully."), MessageWidget::Positive);

3
src/gui/entry/EntryHistoryModel.cpp
View file

@ -158,9 +158,10 @@ void EntryHistoryModel::deleteIndex(QModelIndex index)
{ {
auto entry = entryFromIndex(index); auto entry = entryFromIndex(index);
if (entry) { if (entry) {
beginRemoveRows(QModelIndex(), m_historyEntries.indexOf(entry), m_historyEntries.indexOf(entry)); beginRemoveRows(QModelIndex(), index.row(), index.row());
m_historyEntries.removeAll(entry); m_historyEntries.removeAll(entry);
m_deletedHistoryEntries << entry; m_deletedHistoryEntries << entry;
m_historyModifications.erase(m_historyModifications.begin() + index.row());
endRemoveRows(); endRemoveRows();
} }
} }