CRM-15181, adv select fixes, for onbehalf profile

----------------------------------------
* CRM-15181: on behalf of profile: adv multi-select fails with preset options
  https://issues.civicrm.org/jira/browse/CRM-15181

diff --git a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
index b9181ecc6d37559725c9431269fd469cd81ba837..58e4ef82fcba347c8e62ed5c70a87836c9ca6ddc 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
@@ -201,7 +201,9 @@ function setOrgName( ) {
 function setLocationDetails(contactID , reset) {
   var submittedCID = {/literal}"{$submittedOnBehalf}"{literal};
   var submittedOnBehalfInfo = {/literal}'{$submittedOnBehalfInfo}'{literal};
-  submittedOnBehalfInfo = cj.parseJSON(submittedOnBehalfInfo);
+  if (submittedOnBehalfInfo) {
+    submittedOnBehalfInfo = cj.parseJSON(submittedOnBehalfInfo);
+  }
   if (submittedCID == contactID) {
     cj.each(submittedOnBehalfInfo, function(key, value) {
       cj('#onbehalf_' + key ).val(value);
@@ -246,6 +248,7 @@ function setLocationDetails(contactID , reset) {
             // remove selected values from left and selected values to right
             cj('#onbehalf\\['+ customFld +'\\]-f option[value="' + selectedOption + '"]').remove()
               .appendTo('#onbehalf\\['+ customFld +'\\]-t');
+            cj('#onbehalf_'+ customFld).val(selectedOption);
           }
         }
         else {