Merge pull request #725 from premkumarbalu/release-2.1

OLE-8884 - Removed mandatory for Phone source and email source in Patron screen
openlibraryenvironment · May 20, 2016 · 27512ee · 27512ee
2 parents 68cb324 + cd8681e
commit 27512ee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/ole-app/olefs/src/main/java/org/kuali/ole/deliver/bo/OleEmailBo.java b/ole-app/olefs/src/main/java/org/kuali/ole/deliver/bo/OleEmailBo.java
@@ -45,7 +45,12 @@ public String getEmailSource() {
     }
 
     public void setEmailSource(String emailSource) {
-        this.emailSource = emailSource;
+
+        if (emailSource!=null&&!emailSource.equals("")) {
+            this.emailSource = emailSource;
+        } else {
+            this.emailSource = null;
+        }
     }
 
     public String getEmailSourceName() {

diff --git a/ole-app/olefs/src/main/java/org/kuali/ole/deliver/bo/OlePhoneBo.java b/ole-app/olefs/src/main/java/org/kuali/ole/deliver/bo/OlePhoneBo.java
@@ -45,7 +45,12 @@ public String getPhoneSource() {
     }
 
     public void setPhoneSource(String phoneSource) {
-        this.phoneSource = phoneSource;
+
+        if (phoneSource!=null && !phoneSource.equals("")) {
+            this.phoneSource = phoneSource;
+        } else {
+            this.phoneSource = null;
+        }
     }
 
     public String getPhoneSourceName() {

diff --git a/...rc/main/resources/org/kuali/ole/deliver/document/OlePatronDocumentMaintenanceDocument.xml b/...rc/main/resources/org/kuali/ole/deliver/document/OlePatronDocumentMaintenanceDocument.xml
@@ -1433,7 +1433,7 @@
                     </property>
                 </bean>
                 <bean id="olePhoneNumberSource" parent="OlePatron-InputField" p:propertyName="olePhoneBo.phoneSource"
-                      p:label="Phone Number Source" p:required="true" p:enableAutoDirectInquiry="false">
+                      p:label="Phone Number Source" p:enableAutoDirectInquiry="false">
                     <property name="optionsFinder">
                         <bean class="org.kuali.ole.deliver.keyvalue.OleAddressSourceKeyValue"/>
                     </property>
@@ -1509,7 +1509,7 @@
                     </property>
                 </bean>
                 <bean id="oleEmailAddressSource" parent="OlePatron-InputField" p:propertyName="oleEmailBo.emailSource"
-                      p:label="Email Address Source" p:required="true" p:enableAutoDirectInquiry="false">
+                      p:label="Email Address Source" p:enableAutoDirectInquiry="false">
                     <property name="optionsFinder">
                         <bean class="org.kuali.ole.deliver.keyvalue.OleAddressSourceKeyValue"/>
                     </property>