From c00e79af78e0e935c183d76d720fb93019f278ee Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 13 Feb 2014 17:51:02 +0000 Subject: [PATCH] partial fix for addressbook CRM view does not propagate prefered telephone number to phone popup, set_value() on et2_radiobox_ro is NOT working --- addressbook/js/app.js | 7 +++++-- etemplate/js/et2_widget_radiobox.js | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addressbook/js/app.js b/addressbook/js/app.js index c8f2d26350..29aebca3da 100644 --- a/addressbook/js/app.js +++ b/addressbook/js/app.js @@ -212,8 +212,11 @@ app.classes.addressbook = AppJS.extend( } // change tel_prefer according to what var tel_prefer = this.et2.getWidgetById('tel_prefer'); - if (tel_prefer && tel_prefer.get_value && typeof what[tel_prefer.get_value()] != 'undefined') - tel_prefer.set_value(what[tel_prefer.get_value()]); + if (tel_prefer) + { + var val = tel_prefer.get_value ? tel_prefer.get_value() : tel_prefer.value; + if (typeof what[val] != 'undefined') tel_prefer.set_value(what[val]); + } }, /** diff --git a/etemplate/js/et2_widget_radiobox.js b/etemplate/js/et2_widget_radiobox.js index 445f011222..801aa76b81 100644 --- a/etemplate/js/et2_widget_radiobox.js +++ b/etemplate/js/et2_widget_radiobox.js @@ -192,6 +192,7 @@ var et2_radiobox_ro = et2_valueWidget.extend([et2_IDetachedDOM], * @param {string} _value */ set_value: function(_value) { + this.value = _value; if(_value == this.options.set_value) { this.span.text(this.options.ro_true); } else {