Merge remote-tracking branch 'github/master' into nmaster

1 files changed, 2 insertions, 2 deletions

diff --git a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js
index 0e4640e..a5a4697 100644
--- a/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js
+++ b/frontend/beta/js/Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js
@@ -79,49 +79,49 @@ YAHOO.extendX(Clipperz.PM.Components.RecordDetail.DirectLoginBindingComponent, C
                 ]});
 //MochiKit.Logging.logDebug("--- DirectLoginBindingComponent.render - 2");
                 this.getElement('editModeBox').setVisibilityMode(YAHOO.ext.Element.DISPLAY);
                 this.getElement('viewModeBox').setVisibilityMode(YAHOO.ext.Element.DISPLAY);
 
                 this.update();
 //MochiKit.Logging.logDebug("<<< DirectLoginBindingComponent.render");
         },
 
         //-------------------------------------------------------------------------
 
         'recordFieldOptions': function() {
                         varresult;
                 var option;
                         varrecordFieldKey;
                         varrecordFields;
 
 //MochiKit.Logging.logDebug(">>> DirectLoginBindingComponent.recordFieldOptions");
                 recordFields = this.directLoginBinding().directLogin().record().currentVersion().fields();
                 result = [];
                 option = {tag:'option', value:null, html:'---'};
                 result.push(option);
                 for (recordFieldKey in recordFields) {
         //TODO: remove the value: field and replace it with element.dom.value = <some value>
-                        option = {tag:'option', value:recordFieldKey, html:recordFields[recordFieldKey].label()}
+                        option = {tag:'option', value:recordFieldKey, html:Clipperz.Base.sanitizeString(recordFields[recordFieldKey].label())}
                         if (recordFieldKey == this.directLoginBinding().fieldKey()) {
                                 option['selected'] = true;
                         }
                         result.push(option);
                 }
 //MochiKit.Logging.logDebug("<<< DirectLoginBindingComponent.recordFieldOptions");
                 
                 return result;
         },
 
         //-------------------------------------------------------------------------
 
         'syncAndUpdateEditMode': function() {
                 this.synchronizeComponentValues();
                 this.updateEditMode();
         },
         
         'updateEditMode': function() {
                         varselectElementBox;
 
 //MochiKit.Logging.logDebug(">>> DirectLoginBindingComponent.updateEditMode");
                 this.getElement('viewModeBox').hide();
 
                 selectElementBox = this.getElement('editModeBox');
@@ -129,41 +129,41 @@ YAHOO.extendX(Clipperz.PM.Components.RecordDetail.DirectLoginBindingComponent, C
 
                 Clipperz.YUI.DomHelper.append(selectElementBox.dom, {tag:'select', id:this.getId('select'), children:this.recordFieldOptions()});
 
 /*
                 selectElement = this.getElement('select');
                 
                 selectElement.update("");
                 MochiKit.Iter.forEach(this.recordFieldOptions(), function(anOption) {
                         Clipperz.YUI.DomHelper.append(selectElement.dom, anOption);
                 });
 */
 
 
                 this.getElement('editModeBox').show();
 //MochiKit.Logging.logDebug("<<< DirectLoginBindingComponent.updateEditMode");
         },
         
         //-------------------------------------------------------------------------
 
         'updateViewMode': function() {
 //MochiKit.Logging.logDebug(">>> DirectLoginBindingComponent.updateViewMode");
                 this.getElement('editModeBox').hide();
                 this.getElement('viewModeBox').show();
 
-                this.getElement('viewValue').update(this.directLoginBinding().field().label());
+                this.getElement('viewValue').update(Clipperz.Base.sanitizeString(this.directLoginBinding().field().label()));
 //MochiKit.Logging.logDebug("<<< DirectLoginBindingComponent.updateViewMode");
         },
 
         //-------------------------------------------------------------------------
 
         'synchronizeComponentValues': function() {
 //MochiKit.Logging.logDebug(">>> DirectLoginBindingComponent.synchronizeComponentValues")
 //MochiKit.Logging.logDebug("--- DirectLoginBindingComponent.synchronizeComponentValues - 1 - " + this.getId('select'));
                 this.directLoginBinding().setFieldKey(this.getDom('select').value);
 //MochiKit.Logging.logDebug("<<< DirectLoginBindingComponent.synchronizeComponentValues");
         },
 
         //-------------------------------------------------------------------------
         __syntaxFix__: "syntax fix"
 });