Ensure migrate stored password dialogue is shown only if any server passwords are saved. #5123
parent
7d0ba9448b
commit
cbb89b09b1
|
@ -873,9 +873,17 @@ def set_master_password():
|
||||||
present=True,
|
present=True,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
|
is_master_password_present = True
|
||||||
|
keyring_name = ''
|
||||||
|
for server in all_server:
|
||||||
|
if server.password and server.save_password:
|
||||||
|
is_master_password_present = False
|
||||||
|
keyring_name = config.KEYRING_NAME
|
||||||
|
break
|
||||||
|
|
||||||
return form_master_password_response(
|
return form_master_password_response(
|
||||||
present=False,
|
present=is_master_password_present,
|
||||||
keyring_name=config.KEYRING_NAME
|
keyring_name=keyring_name
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
current_app.logger.warning(
|
current_app.logger.warning(
|
||||||
|
|
Loading…
Reference in New Issue