Merge pull request #2381 from LibreSign/backport/2380/stable28

[stable28] Hide form after generate certificate
LibreSign · Feb 28, 2024 · 74342f0 · 74342f0
2 parents 1a719a0 + 7ef9e4f
commit 74342f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/views/Settings/RootCertificateCfssl.vue b/src/views/Settings/RootCertificateCfssl.vue
@@ -164,7 +164,7 @@ export default {
 	},
 	computed: {
 		configureOk() {
-			return this.configureCheckStore.isConfigureOk('cfssl') || this.certificate.generated
+			return this.configureCheckStore.isConfigureOk('cfssl') || this.certificate.configPath.length > 0
 		},
 		loaded() {
 			return this.configureCheckStore.items.length > 0
@@ -206,7 +206,6 @@ export default {
 				},
 				cfsslUri: '',
 				configPath: '',
-				generated: false,
 			}
 			this.customData = false
 			this.formDisabled = false

diff --git a/src/views/Settings/RootCertificateOpenSsl.vue b/src/views/Settings/RootCertificateOpenSsl.vue
@@ -140,7 +140,6 @@ export default {
 					names: [],
 				},
 				configPath: '',
-				generated: false,
 			},
 			error: false,
 			customData: false,
@@ -152,7 +151,7 @@ export default {
 	},
 	computed: {
 		configureOk() {
-			return this.configureCheckStore.isConfigureOk('openssl') || this.certificate.generated
+			return this.configureCheckStore.isConfigureOk('openssl') || this.certificate.configPath.length > 0
 		},
 		loaded() {
 			return this.configureCheckStore.items.length > 0
@@ -193,7 +192,6 @@ export default {
 					names: [],
 				},
 				configPath: '',
-				generated: false,
 			}
 			this.customData = false
 			this.formDisabled = false
@@ -248,10 +246,7 @@ export default {
 				}
 				this.certificate = response.data
 				this.customData = loadState('libresign', 'config_path').length > 0 && this.certificate.configPath.length > 0
-				if (this.certificate.generated) {
-					this.afterCertificateGenerated()
-					return
-				}
+				this.afterCertificateGenerated()
 			} catch (e) {
 				console.error(e)
 			}