Skip to content
Permalink
Browse files

updated disable ssl label

(cherry picked from commit 53788aa)
  • Loading branch information
Samweli authored and nyalldawson committed Jun 3, 2020
1 parent 0b91396 commit 76a4f78de6523fe339dad433e73ee9e46c66068d
Showing with 9 additions and 8 deletions.
  1. +7 −6 python/plugins/MetaSearch/dialogs/maindialog.py
  2. +2 −2 python/plugins/MetaSearch/ui/maindialog.ui
@@ -98,7 +98,7 @@ def __init__(self, iface):
self.startfrom = 0
self.maxrecords = 10
self.timeout = 10
self.disable_ssl = False
self.disable_ssl_verification = False
self.constraints = []

# Servers tab
@@ -450,9 +450,6 @@ def search(self):
# set timeout
self.timeout = self.spnTimeout.value()

# ssl mode
self.disable_ssl = self.disableSSL.isChecked()

# bbox
# CRS is WGS84 with axis order longitude, latitude
# defined by 'urn:ogc:def:crs:OGC:1.3:CRS84'
@@ -824,10 +821,12 @@ def show_metadata(self):

identifier = get_item_data(item, 'identifier')

self.disable_ssl_verification = self.disableSSLVerification.isChecked()

try:
with OverrideCursor(Qt.WaitCursor):
auth = None
if self.disable_ssl:
if self.disable_ssl_verification:
auth = Authentication(verify=False)
cat = CatalogueServiceWeb(self.catalog_url, timeout=self.timeout, # spellok
username=self.catalog_username,
@@ -907,10 +906,12 @@ def reject(self):
def _get_csw(self):
"""convenience function to init owslib.csw.CatalogueServiceWeb""" # spellok

self.disable_ssl_verification = self.disableSSLVerification.isChecked()

# connect to the server
with OverrideCursor(Qt.WaitCursor):
auth = None
if self.disable_ssl:
if self.disable_ssl_verification:
auth = Authentication(verify=False)
try:
self.catalog = CatalogueServiceWeb(self.catalog_url, # spellok
@@ -501,12 +501,12 @@
<item row="1" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Disable SSL</string>
<string>Disable SSL verification</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="disableSSL">
<widget class="QCheckBox" name="disableSSLVerification">
<property name="text">
<string/>
</property>

0 comments on commit 76a4f78

Please sign in to comment.
You can’t perform that action at this time.