diff options
| author | Sami Vänttinen <sami.vanttinen@protonmail.com> | 2020-03-22 17:44:06 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 17:44:06 +0300 |
| commit | d5e195754aae5a0e1d79a9a7ef22fbe88aa1e3c9 (patch) | |
| tree | 80efdc2718b0eb29d75f4b00eb03ca332ac3fbc5 | |
| parent | 4b5eb73e373bf2777d6500dbcd9279eb5e7f05fd (diff) | |
| parent | 61d2e33c068e3d77015372aa818a0bf4cf7db2f7 (diff) | |
Merge pull request #817 from keepassxreboot/fix/disable_group_name_by_version
Disable group name settings with older versions
| -rw-r--r-- | keepassxc-browser/options/options.html | 2 | ||||
| -rw-r--r-- | keepassxc-browser/options/options.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/keepassxc-browser/options/options.html b/keepassxc-browser/options/options.html index 06d1590..e8bff53 100644 --- a/keepassxc-browser/options/options.html +++ b/keepassxc-browser/options/options.html @@ -281,7 +281,7 @@ <input class="form-check-input" type="checkbox" name="showGroupNameInAutocomplete" id="showGroupNameInAutocomplete" value="true" /> <label class="form-check-label" for="showGroupNameInAutocomplete" data-i18n="optionsCheckboxShowGroupNameInAutocomplete"></label> <span class="form-text text-muted" data-i18n="optionsShowGroupNameInAutocompleteHelpText"></span> - <div class="alert alert-info mt-3 col-lg-9" role="alert"> + <div class="alert alert-info mt-3 col-lg-9" role="alert" id="versionRequiredAlert"> <i class="fa fa-exclamation-circle" aria-hidden="true"></i> <span data-i18n="optionsKeePassXCVersionRequired" i18n-placeholder="2.6.0"></span> </div> diff --git a/keepassxc-browser/options/options.js b/keepassxc-browser/options/options.js index ccad8eb..8a06375 100644 --- a/keepassxc-browser/options/options.js +++ b/keepassxc-browser/options/options.js @@ -269,6 +269,12 @@ options.showKeePassXCVersions = function(response) { $('#tab-about em.versionKPH').text(response.current); $('#tab-about span.kpxcVersion').text(response.current); $('#tab-general-settings button.checkUpdateKeePassXC:first').attr('disabled', false); + + if (response.current.startsWith('2.6') || response.current === '2.5.3-snapshot') { + $('#tab-general-settings #versionRequiredAlert').hide(); + } else { + $('#tab-general-settings #showGroupNameInAutocomplete').attr('disabled', true); + } }; options.getPartiallyHiddenKey = function(key) { |