JAFFA-691:Update error message to include Form Name when the form cou…

…ld not be auto-printed due to bad printer setup. Checked-in changes on behalf of Vinod S.
jaffa-projects · Jul 2, 2020 · 3e091e9 · 3e091e9
1 parent 458c06e
commit 3e091e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...components-printing/source/java/org/jaffa/modules/printing/ApplicationResources.pfragment b/...components-printing/source/java/org/jaffa/modules/printing/ApplicationResources.pfragment
@@ -16,7 +16,7 @@ exception.org.jaffa.modules.printing.services.FormProcessor.OutputTypeMismatch=I
 exception.org.jaffa.modules.printing.components.exceptions.FormSelectionException.AdditionalDataNotFound=Form detail data is required before generating the form.
 exception.org.jaffa.modules.printing.components.exceptions.FormSelectionException.InvalidAdditionalComponent=Additional Component is null or not found.
 exception.org.jaffa.modules.printing.components.exceptions.FormSelectionException.InvalidCopies=In order to print, Copies must be greater than zero.
-exception.org.jaffa.modules.printing.components.exceptions.FormSelectionException.InvalidOutputDestination=The output destination (Printer, E-Mail or Publish) was not provided.
+exception.org.jaffa.modules.printing.components.exceptions.FormSelectionException.InvalidOutputDestination=The output destination ([label.Jaffa.Printing.FormSelection.Printer] or [label.Jaffa.Printing.FormSelection.Email]) was not provided for [label.Jaffa.Printing.FormSelection.FormName] {0}.
 exception.org.jaffa.modules.printing.components.exceptions.FormSelectionException.NoFormDefinedForEvent=There are no Forms configured for Event '{0}'.  Forms not generated.
 exception.org.jaffa.modules.printing.components.exceptions.FormSelectionException.FormPreviewEventNotDefined=No Form Event is defined for this link.
 exception.org.jaffa.modules.printing.components.exceptions.FormSelectionException.SecurityException=You do not have permission to generate this form or label.

diff --git a/...es/printing/components/formselectionmaintenance/ui/FormSelectionMaintenanceComponent.java b/...es/printing/components/formselectionmaintenance/ui/FormSelectionMaintenanceComponent.java
@@ -826,8 +826,9 @@ protected void validateFields(GridModelRow row, ApplicationExceptions appExps, b
                 EditBoxModel mPrinter = (EditBoxModel) row.get("printer");
                 EditBoxModel mEmail = (EditBoxModel) row.get("email");
                 CheckBoxModel mPublish = (CheckBoxModel) row.get("publish");
-                if ((mPrinter.getValue() == null) && (mEmail.getValue() == null) && (mPublish.getState() != true) && !showForm) {
-                    appExps.add(new FormSelectionException(FormSelectionException.INVALID_OUTPUT_DESTINATION));
+                String formName = row.get("formName") != null ? (String) row.get("formName") : "";
+                if ((mPrinter.getValue() == null) && (mEmail.getValue() == null) && (mPublish.getState() != true)) {
+                     appExps.add(new FormSelectionException(FormSelectionException.INVALID_OUTPUT_DESTINATION, formName));
                 }
             }
             //Validate AdditionalData exist or not