Merge commit '2fcbe0c82e189115e67e83daf7d6d34a4c9da877' into CONNECT

CONNECT-Solution · May 9, 2019 · 11a26f2 · 11a26f2
2 parents bcf6785 + 2fcbe0c
commit 11a26f2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/...eral/CONNECTAdminGUI/src/main/java/gov/hhs/fha/nhinc/admingui/managed/CertficateBean.java b/...eral/CONNECTAdminGUI/src/main/java/gov/hhs/fha/nhinc/admingui/managed/CertficateBean.java
@@ -687,14 +687,23 @@ public void createCertificate() {
             cacheAlias.add(getAlias());
             createCSR();
             disableNext[1] = false;
+
+
+            //Clear out the fields so they have to type it in again and cant spam create button.
+            setCommonName(null);
+            setOrganization(null);
+            setOrganizationalUnit(null);
+            setCountryName(null);
+            setExchangeType(null);
         } else {
             HelperUtil.addMessageError(null, MessageFormat.format("Failed to create certificate for: {0}", getAlias()));
         }
     }
 
     public void createCSR() {
         if (StringUtils.isBlank(getAlias())) {
-            HelperUtil.addMessageError(null, "Required fields cannot be empty when creating CSR.");
+            csrText = null;
+            csrFileType = null;
             return;
         }
         SimpleCertificateResponseMessageType response = service.createCSR(getAlias());
@@ -746,6 +755,7 @@ private void clearImportWizard() {
         csrFileType = null;
         csrText = null;
         disableNext = new boolean[] { true, true, true, true, true, true };
+        enableTab(0);
         disableImportAction = true;
     }
 

diff --git a/Product/Production/Adapters/General/CONNECTAdminGUI/src/main/webapp/certificateManager.xhtml b/Product/Production/Adapters/General/CONNECTAdminGUI/src/main/webapp/certificateManager.xhtml
@@ -350,7 +350,7 @@
                                         <div class="content">
                                             <h:outputText>The Import Wizard allow users to create and import signed certificates.</h:outputText>
                                             <br /> <br />
-                                            <h:outputText>User can start the process either by clicking on Creating a Self Signed Certificate or Generating a Certificate Signing Request (CSR). User also has the option of resuming the process using Import SSL Certificate.</h:outputText>
+                                            <h:outputText>User can start the process either by clicking on Creating a Self Signed Certificate or Generating a Certificate Signing Request (CSR). User also has the option of resuming the process using the Import SSL Certificate(s) option.</h:outputText>
                                             <br /> <br />
                                             <h:outputText>Note: The certificates created by the Import wizard are stored in the application properties directory under ~/importWizard/new/. User has to manually replace the existing certificates with the ones created by Import wizard and restart the server for changes to take effect.</h:outputText>
                                             <br /> <br />
@@ -516,12 +516,10 @@
                                                     <h:outputLabel class="control-label" for="inputAliasCSR"
                                                         value="* Alias:" />
                                                     <p:selectOneMenu styleClass="form-control" id="inputAliasCSR"
-                                                        required="true" requiredMessage="Alias is required."
                                                         value="#{certificateBean.alias}" filter="true"
                                                         filterMatchMode="startsWith">
                                                         <p:ajax listener="#{certificateBean.createCSR}" update="@form" />
-                                                        <f:selectItem itemLabel="---" itemValue=""
-                                                            noSelectionOption="true" />
+                                                        <f:selectItem itemLabel="---" itemValue=""/>
                                                         <f:selectItems value="#{certificateBean.cacheAlias}" />
                                                     </p:selectOneMenu>
                                                 </div>

diff --git a/...uct/Production/Adapters/General/CONNECTAdminGUI/src/main/webapp/deletePassKeyDialog.xhtml b/...uct/Production/Adapters/General/CONNECTAdminGUI/src/main/webapp/deletePassKeyDialog.xhtml
@@ -22,7 +22,7 @@
                         <div class="form-group">
                             <div class="col-sm-12">
                                 <div class="form-button-row">
-                                    <p:commandButton  id="savePasskey" styleClass="btn btn-primary" value="OK" ajax="true" update=":certTabView:trustStoreForm :deletePassKeyDlgForm" actionListener="#{certificateBean.validateAndDeleteCertificate}" />
+                                    <p:commandButton  id="savePasskey" styleClass="btn btn-primary" value="OK" ajax="true" update=":certTabView:trustStoreForm :deletePassKeyDlgForm" actionListener="#{certificateBean.validateAndDeleteCertificate}" onclick="$(PF('deletePassKeyDlg').hide()"/>
                                     <p:commandButton id="closePassKey" styleClass="btn btn-primary" value="Cancel" onclick="$('#deletePassKeyDlgForm\\:deletePasskey').val('');PF('deletePassKeyDlg').hide()"/>
                                 </div>
                             </div>