Merge pull request #4228 from LibreSign/backport/4227/stable29

[stable29] fix: display cfssl settings
LibreSign · Jan 1, 2025 · 5d58bff · 5d58bff
2 parents cc819c2 + 6437503
commit 5d58bff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/views/Settings/RootCertificateCfssl.vue b/src/views/Settings/RootCertificateCfssl.vue
@@ -25,7 +25,7 @@
 	<NcSettingsSection v-if="isThisEngine && loaded && configureCheckStore.cfsslBinariesOk()"
 		:name="name"
 		:description="description">
-		<div v-if="configureOk && !isCertificateGenerated" id="tableRootCertificateCfssl" class="form-libresign">
+		<div v-if="configureOk && isCertificateGenerated" id="tableRootCertificateCfssl" class="form-libresign">
 			<table class="grid">
 				<tbody>
 					<tr>
@@ -65,7 +65,7 @@
 				</template>
 			</NcDialog>
 		</div>
-		<div v-else-if="!configureOk && isCertificateGenerated" id="formRootCertificate" class="form-libresign">
+		<div v-else id="formRootCertificate" class="form-libresign">
 			<div class="form-group">
 				<label for="commonName" class="form-heading--required">{{ t('libresign', 'Name (CN)') }}</label>
 				<NcTextField id="commonName"
@@ -264,7 +264,8 @@ export default {
 					throw new Error(response.data.ocs.data)
 				}
 				this.certificate = response.data.ocs.data
-				this.customData = loadState('libresign', 'config_path').length > 0 && (this.certificate?.cfsslUri?.length > 0 || this.certificate.configPath.length > 0)
+				this.customData = loadState('libresign', 'config_path').length > 0
+					&& (this.certificate?.cfsslUri?.length > 0 || this.certificate.configPath.length > 0)
 				if (this.certificate.generated) {
 					this.afterCertificateGenerated()
 					return

diff --git a/src/views/Settings/RootCertificateOpenSsl.vue b/src/views/Settings/RootCertificateOpenSsl.vue
@@ -249,7 +249,8 @@ export default {
 					throw new Error(response.data.ocs.data)
 				}
 				this.certificate = response.data.ocs.data
-				this.customData = loadState('libresign', 'config_path').length > 0 && this.certificate.configPath.length > 0
+				this.customData = loadState('libresign', 'config_path').length > 0
+					&& this.certificate.configPath.length > 0
 				if (this.certificate.generated) {
 					this.afterCertificateGenerated()
 				}