Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix resolving placeholders in urls (#3281)

Browse Source 
* Replace placeholders in URLs copied from popup menu on the entry preview widget.
* Replace placeholders in URLs opened by double-clicking URL field in the entry table.
This commit is contained in:
Aigale 2019-06-20 03:48:35 +03:00 committed by Jonathan White
parent e40f10657d
commit c5a93ca215
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/DatabaseWidget.cpp
View File

@ -696,7 +696,7 @@ void DatabaseWidget::openUrlForEntry(Entry* entry)
} }
} }
} else { } else {
QUrl url = QUrl::fromUserInput(entry->url()); QUrl url = QUrl::fromUserInput(entry->resolveMultiplePlaceholders(entry->url()));
if (!url.isEmpty()) { if (!url.isEmpty()) {
QDesktopServices::openUrl(url); QDesktopServices::openUrl(url);
} }

2
src/gui/EntryPreviewWidget.cpp
View File

@ -202,7 +202,7 @@ void EntryPreviewWidget::updateEntryGeneralTab()
const QString url = m_currentEntry->url(); const QString url = m_currentEntry->url();
if (!url.isEmpty()) { if (!url.isEmpty()) {
// URL is well formed and can be opened in a browser // URL is well formed and can be opened in a browser
m_ui->entryUrlLabel->setUrl(url); m_ui->entryUrlLabel->setUrl(m_currentEntry->resolveMultiplePlaceholders(url));
m_ui->entryUrlLabel->setCursor(Qt::PointingHandCursor); m_ui->entryUrlLabel->setCursor(Qt::PointingHandCursor);
m_ui->entryUrlLabel->setOpenExternalLinks(false); m_ui->entryUrlLabel->setOpenExternalLinks(false);
} else { } else {