Author: solomax
Date: Thu Mar 21 02:38:58 2013
New Revision: 1459134

URL: http://svn.apache.org/r1459134
Log:
[OPENMEETINGS-572] null valued fields are displayed properly

Modified:
    openmeetings/branches/2.1/WebContent/src/base/mainMethods.lzx
    
openmeetings/branches/2.1/WebContent/src/modules/admin/useradmin/userAdminListItem.lzx
    
openmeetings/branches/2.1/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
    
openmeetings/branches/2.1/WebContent/src/modules/settings/editUserProfile.lzx
    
openmeetings/branches/2.1/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
    
openmeetings/branches/2.1/WebContent/src/modules/settings/viewUserProfile.lzx
    openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
    
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminListItem.lzx
    
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
    
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
    
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
    
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx

Modified: openmeetings/branches/2.1/WebContent/src/base/mainMethods.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/base/mainMethods.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- openmeetings/branches/2.1/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/branches/2.1/WebContent/src/base/mainMethods.lzx Thu Mar 21 
02:38:58 2013
@@ -1114,4 +1114,8 @@
                }
        </method>
        
+       <method name="getNotNullString" args="value">
+               return value == null ? '' : value;
+       </method>
+       
 </library>

Modified: 
openmeetings/branches/2.1/WebContent/src/modules/admin/useradmin/userAdminListItem.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/admin/useradmin/userAdminListItem.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- 
openmeetings/branches/2.1/WebContent/src/modules/admin/useradmin/userAdminListItem.lzx
 (original)
+++ 
openmeetings/branches/2.1/WebContent/src/modules/admin/useradmin/userAdminListItem.lzx
 Thu Mar 21 02:38:58 2013
@@ -30,8 +30,8 @@
        
        <turnOverTextItem text="$once{ parent.user_id }" width="60" />
        <turnOverTextItem text="$once{ parent.login }" width="100" />
-       <turnOverTextItem text="$once{ parent.firstname }" width="132" />
-       <turnOverTextItem text="$once{ parent.lastname }" width="132" />
+       <turnOverTextItem text="$once{ 
canvas.getNotNullString(parent.firstname) }" width="132" />
+       <turnOverTextItem text="$once{ canvas.getNotNullString(parent.lastname) 
}" width="132" />
        
 </class>
 

Modified: 
openmeetings/branches/2.1/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- 
openmeetings/branches/2.1/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
 (original)
+++ 
openmeetings/branches/2.1/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
 Thu Mar 21 02:38:58 2013
@@ -120,7 +120,7 @@
                        this.getUserById.doCall();
                }
     </method>
-    
+
     <method name="initFields" args="obj">
        <![CDATA[
             if (obj == null) {
@@ -129,23 +129,23 @@
         
                        this.level.selectItem(String(obj.level_id));
                        this.username.setAttribute('text',obj.login);
-                       this.firstname.setAttribute('text',obj.firstname);
-                       this.lastname.setAttribute('text',obj.lastname);
+                       this.firstname.setAttribute('text', 
canvas.getNotNullString(obj.firstname));
+                       this.lastname.setAttribute('text', 
canvas.getNotNullString(obj.lastname));
                        this.userpass1.setAttribute('text','');
-                       this.email.setAttribute('text',obj.adresses.email);
-                       this.phone.setAttribute('text',obj.adresses.phone);
+                       this.email.setAttribute('text', 
canvas.getNotNullString(obj.adresses.email));
+                       this.phone.setAttribute('text', 
canvas.getNotNullString(obj.adresses.phone));
                        this.sendSMS.setValue(obj["sendSMS"] && obj.sendSMS!= 
null && obj.sendSMS);
                        
this.age.setAttribute('text',parseDateToString(obj.age));
-                       this.street.setAttribute('text',obj.adresses.street);
-                       
this.house.setAttribute('text',obj.adresses.additionalname);
-                       this.zip.setAttribute('text',obj.adresses.zip);
-                       this.town.setAttribute('text',obj.adresses.town);
-            
this.state.addAndSelectItem(obj.adresses.states.name,String(obj.adresses.states.state_id));
-                       
this.adress_comment.setAttribute('text',obj.adresses.comment);
+                       this.street.setAttribute('text', 
canvas.getNotNullString(obj.adresses.street));
+                       this.house.setAttribute('text', 
canvas.getNotNullString(obj.adresses.additionalname));
+                       this.zip.setAttribute('text', 
canvas.getNotNullString(obj.adresses.zip));
+                       this.town.setAttribute('text', 
canvas.getNotNullString(obj.adresses.town));
+                       
this.state.addAndSelectItem(obj.adresses.states.name,String(obj.adresses.states.state_id));
+                       this.adress_comment.setAttribute('text', 
canvas.getNotNullString(obj.adresses.comment));
                        this.status.selectItem(String(obj.status));
                        this.salutation.selectItem(String(obj.salutations_id));
                        this._timeZone.selectItem(String(obj.omTimeZone.jname));
-            this.languages.selectItem(String(obj.language_id));
+                       this.languages.selectItem(String(obj.language_id));
                        
                        if (obj["forceTimeZoneCheck"] && 
obj.forceTimeZoneCheck!= null) {
                                if (obj.forceTimeZoneCheck) {

Modified: 
openmeetings/branches/2.1/WebContent/src/modules/settings/editUserProfile.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/settings/editUserProfile.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- 
openmeetings/branches/2.1/WebContent/src/modules/settings/editUserProfile.lzx 
(original)
+++ 
openmeetings/branches/2.1/WebContent/src/modules/settings/editUserProfile.lzx 
Thu Mar 21 02:38:58 2013
@@ -50,7 +50,7 @@
     <method name="sendRefresh">
        this.getUserSelf.doCall();
     </method>    
-       
+
     <method name="initFields" args="obj">
        <![CDATA[
             this.userObj = obj;
@@ -64,17 +64,17 @@
             }
                        
                        //this.username.setAttribute('text',obj.login);
-                       this.firstname.setAttribute('text',obj.firstname);
-                       this.lastname.setAttribute('text',obj.lastname);
-                       this.email.setAttribute('text',obj.adresses.email);
-                       this.phone.setAttribute('text', obj.adresses.phone);
+                       this.firstname.setAttribute('text', 
canvas.getNotNullString(obj.firstname));
+                       this.lastname.setAttribute('text', 
canvas.getNotNullString(obj.lastname));
+                       this.email.setAttribute('text', 
canvas.getNotNullString(obj.adresses.email));
+                       this.phone.setAttribute('text', 
canvas.getNotNullString(obj.adresses.phone));
                        
this.age.setAttribute('text',parseDateToString(obj.age));
-                       this.street.setAttribute('text',obj.adresses.street);
-                       
this.house.setAttribute('text',obj.adresses.additionalname);
-                       this.zip.setAttribute('text',obj.adresses.zip);
-                       this.town.setAttribute('text',obj.adresses.town);
-                       
this.state.addAndSelectItem(obj.adresses.states.name,String(obj.adresses.states.state_id));
-                       
this.adress_comment.setAttribute('text',obj.adresses.comment);
+                       this.street.setAttribute('text', 
canvas.getNotNullString(obj.adresses.street));
+                       this.house.setAttribute('text', 
canvas.getNotNullString(obj.adresses.additionalname));
+                       this.zip.setAttribute('text', 
canvas.getNotNullString(obj.adresses.zip));
+                       this.town.setAttribute('text', 
canvas.getNotNullString(obj.adresses.town));
+                       this.state.addAndSelectItem(obj.adresses.states.name, 
String(obj.adresses.states.state_id));
+                       this.adress_comment.setAttribute('text', 
canvas.getNotNullString(obj.adresses.comment));
                        this.salutation.selectItem(String(obj.salutations_id));
                        this._timeZone.selectItem(String(obj.omTimeZone.jname));
                        this.languages.selectItem(String(obj.language_id));

Modified: 
openmeetings/branches/2.1/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- 
openmeetings/branches/2.1/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
 (original)
+++ 
openmeetings/branches/2.1/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
 Thu Mar 21 02:38:58 2013
@@ -246,7 +246,7 @@
                        <attribute name="searchOffers" value="" type="string" />
                        <attribute name="searchSearchs" value="" type="string" 
/>
                         -->
-               
+
                <method name="renderContent" args="rList">
                    <![CDATA[
                    
@@ -289,11 +289,11 @@
                                    list.subviews[i].isselected = false;
                                }
                                
-                               
list.subviews[i].setAttribute("username",records[i].title + ' ' + 
records[i].firstname+' '+records[i].lastname + ' ['+records[i].login+']');
-                               
list.subviews[i].setAttribute("timezone",records[i].omTimeZone.jname + 
'<br/>('+records[i].omTimeZone.ical+')');
-                               
list.subviews[i].setAttribute("searchOffers",records[i].userOffers);
-                               
list.subviews[i].setAttribute("searchSearchs",records[i].userSearchs);
-                               
list.subviews[i].setAttribute("pending",records[i].pending);
+                                                       
list.subviews[i].setAttribute("username",records[i].title + ' ' + 
canvas.getNotNullString(records[i].firstname) + ' ' + 
canvas.getNotNullString(records[i].lastname) + ' [' + records[i].login + ']');
+                                                       
list.subviews[i].setAttribute("timezone",records[i].omTimeZone.jname + 
'<br/>('+records[i].omTimeZone.ical+')');
+                                                       
list.subviews[i].setAttribute("searchOffers", 
canvas.getNotNullString(records[i].userOffers));
+                                                       
list.subviews[i].setAttribute("searchSearchs", 
canvas.getNotNullString(records[i].userSearchs));
+                                                       
list.subviews[i].setAttribute("pending",records[i].pending);
                                
                                list.subviews[i].setAttribute("itemId",i);
                                

Modified: 
openmeetings/branches/2.1/WebContent/src/modules/settings/viewUserProfile.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/2.1/WebContent/src/modules/settings/viewUserProfile.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- 
openmeetings/branches/2.1/WebContent/src/modules/settings/viewUserProfile.lzx 
(original)
+++ 
openmeetings/branches/2.1/WebContent/src/modules/settings/viewUserProfile.lzx 
Thu Mar 21 02:38:58 2013
@@ -196,19 +196,19 @@
             ]]>
         </handler>
     </netRemoteCallHib> 
-       
+
        <method name="showUserContactData">
                <![CDATA[
                
-            var tString = this.userObject.adresses.street + " " + 
this.userObject.adresses.additionalname + "<br/>";
-                   tString +=  this.userObject.adresses.zip + " " + 
this.userObject.adresses.town + "<br/>";
-                   tString +=  this.userObject.adresses.states.name + 
"<br/><br/>";
-            tString +=  this.userObject.adresses.email + "<br/>";
-            tString +=  this.userObject.adresses.phone + "<br/><br/>";
-            tString +=  this.userObject.adresses.comment + "<br/>";
-            
-            this.userContactData.setAttribute("text",tString);
-            
+                       var tString = 
canvas.getNotNullString(this.userObject.adresses.street) + " " + 
canvas.getNotNullString(this.userObject.adresses.additionalname) + "<br/>";
+                       tString += 
canvas.getNotNullString(this.userObject.adresses.zip) + " " + 
canvas.getNotNullString(this.userObject.adresses.town) + "<br/>";
+                       tString += 
canvas.getNotNullString(this.userObject.adresses.states.name) + "<br/><br/>";
+                       tString += 
canvas.getNotNullString(this.userObject.adresses.email) + "<br/>";
+                       tString += 
canvas.getNotNullString(this.userObject.adresses.phone) + "<br/><br/>";
+                       tString += 
canvas.getNotNullString(this.userObject.adresses.comment) + "<br/>";
+
+                       this.userContactData.setAttribute("text",tString);
+
                ]]>
        </method>
        

Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx 
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Thu Mar 
21 02:38:58 2013
@@ -1114,4 +1114,8 @@
                }
        </method>
        
+       <method name="getNotNullString" args="value">
+               return value == null ? '' : value;
+       </method>
+       
 </library>

Modified: 
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminListItem.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminListItem.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminListItem.lzx
 (original)
+++ 
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminListItem.lzx
 Thu Mar 21 02:38:58 2013
@@ -30,8 +30,8 @@
        
        <turnOverTextItem text="$once{ parent.user_id }" width="60" />
        <turnOverTextItem text="$once{ parent.login }" width="100" />
-       <turnOverTextItem text="$once{ parent.firstname }" width="132" />
-       <turnOverTextItem text="$once{ parent.lastname }" width="132" />
+       <turnOverTextItem text="$once{ 
canvas.getNotNullString(parent.firstname) }" width="132" />
+       <turnOverTextItem text="$once{ canvas.getNotNullString(parent.lastname) 
}" width="132" />
        
 </class>
 

Modified: 
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
 (original)
+++ 
openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdminValueForm.lzx
 Thu Mar 21 02:38:58 2013
@@ -120,7 +120,7 @@
                        this.getUserById.doCall();
                }
     </method>
-    
+
     <method name="initFields" args="obj">
        <![CDATA[
             if (obj == null) {
@@ -129,23 +129,23 @@
         
                        this.level.selectItem(String(obj.level_id));
                        this.username.setAttribute('text',obj.login);
-                       this.firstname.setAttribute('text',obj.firstname);
-                       this.lastname.setAttribute('text',obj.lastname);
+                       this.firstname.setAttribute('text', 
canvas.getNotNullString(obj.firstname));
+                       this.lastname.setAttribute('text', 
canvas.getNotNullString(obj.lastname));
                        this.userpass1.setAttribute('text','');
-                       this.email.setAttribute('text',obj.adresses.email);
-                       this.phone.setAttribute('text',obj.adresses.phone);
+                       this.email.setAttribute('text', 
canvas.getNotNullString(obj.adresses.email));
+                       this.phone.setAttribute('text', 
canvas.getNotNullString(obj.adresses.phone));
                        this.sendSMS.setValue(obj["sendSMS"] && obj.sendSMS!= 
null && obj.sendSMS);
                        
this.age.setAttribute('text',parseDateToString(obj.age));
-                       this.street.setAttribute('text',obj.adresses.street);
-                       
this.house.setAttribute('text',obj.adresses.additionalname);
-                       this.zip.setAttribute('text',obj.adresses.zip);
-                       this.town.setAttribute('text',obj.adresses.town);
-            
this.state.addAndSelectItem(obj.adresses.states.name,String(obj.adresses.states.state_id));
-                       
this.adress_comment.setAttribute('text',obj.adresses.comment);
+                       this.street.setAttribute('text', 
canvas.getNotNullString(obj.adresses.street));
+                       this.house.setAttribute('text', 
canvas.getNotNullString(obj.adresses.additionalname));
+                       this.zip.setAttribute('text', 
canvas.getNotNullString(obj.adresses.zip));
+                       this.town.setAttribute('text', 
canvas.getNotNullString(obj.adresses.town));
+                       
this.state.addAndSelectItem(obj.adresses.states.name,String(obj.adresses.states.state_id));
+                       this.adress_comment.setAttribute('text', 
canvas.getNotNullString(obj.adresses.comment));
                        this.status.selectItem(String(obj.status));
                        this.salutation.selectItem(String(obj.salutations_id));
                        this._timeZone.selectItem(String(obj.omTimeZone.jname));
-            this.languages.selectItem(String(obj.language_id));
+                       this.languages.selectItem(String(obj.language_id));
                        
                        if (obj["forceTimeZoneCheck"] && 
obj.forceTimeZoneCheck!= null) {
                                if (obj.forceTimeZoneCheck) {

Modified: 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
 (original)
+++ 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
 Thu Mar 21 02:38:58 2013
@@ -50,7 +50,7 @@
     <method name="sendRefresh">
        this.getUserSelf.doCall();
     </method>    
-       
+
     <method name="initFields" args="obj">
        <![CDATA[
             this.userObj = obj;
@@ -64,17 +64,17 @@
             }
                        
                        //this.username.setAttribute('text',obj.login);
-                       this.firstname.setAttribute('text',obj.firstname);
-                       this.lastname.setAttribute('text',obj.lastname);
-                       this.email.setAttribute('text',obj.adresses.email);
-                       this.phone.setAttribute('text', obj.adresses.phone);
+                       this.firstname.setAttribute('text', 
canvas.getNotNullString(obj.firstname));
+                       this.lastname.setAttribute('text', 
canvas.getNotNullString(obj.lastname));
+                       this.email.setAttribute('text', 
canvas.getNotNullString(obj.adresses.email));
+                       this.phone.setAttribute('text', 
canvas.getNotNullString(obj.adresses.phone));
                        
this.age.setAttribute('text',parseDateToString(obj.age));
-                       this.street.setAttribute('text',obj.adresses.street);
-                       
this.house.setAttribute('text',obj.adresses.additionalname);
-                       this.zip.setAttribute('text',obj.adresses.zip);
-                       this.town.setAttribute('text',obj.adresses.town);
-                       
this.state.addAndSelectItem(obj.adresses.states.name,String(obj.adresses.states.state_id));
-                       
this.adress_comment.setAttribute('text',obj.adresses.comment);
+                       this.street.setAttribute('text', 
canvas.getNotNullString(obj.adresses.street));
+                       this.house.setAttribute('text', 
canvas.getNotNullString(obj.adresses.additionalname));
+                       this.zip.setAttribute('text', 
canvas.getNotNullString(obj.adresses.zip));
+                       this.town.setAttribute('text', 
canvas.getNotNullString(obj.adresses.town));
+                       this.state.addAndSelectItem(obj.adresses.states.name, 
String(obj.adresses.states.state_id));
+                       this.adress_comment.setAttribute('text', 
canvas.getNotNullString(obj.adresses.comment));
                        this.salutation.selectItem(String(obj.salutations_id));
                        this._timeZone.selectItem(String(obj.omTimeZone.jname));
                        this.languages.selectItem(String(obj.language_id));

Modified: 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
 (original)
+++ 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
 Thu Mar 21 02:38:58 2013
@@ -246,7 +246,7 @@
                        <attribute name="searchOffers" value="" type="string" />
                        <attribute name="searchSearchs" value="" type="string" 
/>
                         -->
-               
+
                <method name="renderContent" args="rList">
                    <![CDATA[
                    
@@ -289,11 +289,11 @@
                                    list.subviews[i].isselected = false;
                                }
                                
-                               
list.subviews[i].setAttribute("username",records[i].title + ' ' + 
records[i].firstname+' '+records[i].lastname + ' ['+records[i].login+']');
-                               
list.subviews[i].setAttribute("timezone",records[i].omTimeZone.jname + 
'<br/>('+records[i].omTimeZone.ical+')');
-                               
list.subviews[i].setAttribute("searchOffers",records[i].userOffers);
-                               
list.subviews[i].setAttribute("searchSearchs",records[i].userSearchs);
-                               
list.subviews[i].setAttribute("pending",records[i].pending);
+                                                       
list.subviews[i].setAttribute("username",records[i].title + ' ' + 
canvas.getNotNullString(records[i].firstname) + ' ' + 
canvas.getNotNullString(records[i].lastname) + ' [' + records[i].login + ']');
+                                                       
list.subviews[i].setAttribute("timezone",records[i].omTimeZone.jname + 
'<br/>('+records[i].omTimeZone.ical+')');
+                                                       
list.subviews[i].setAttribute("searchOffers", 
canvas.getNotNullString(records[i].userOffers));
+                                                       
list.subviews[i].setAttribute("searchSearchs", 
canvas.getNotNullString(records[i].userSearchs));
+                                                       
list.subviews[i].setAttribute("pending",records[i].pending);
                                
                                list.subviews[i].setAttribute("itemId",i);
                                

Modified: 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx?rev=1459134&r1=1459133&r2=1459134&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx
 (original)
+++ 
openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/viewUserProfile.lzx
 Thu Mar 21 02:38:58 2013
@@ -196,19 +196,19 @@
             ]]>
         </handler>
     </netRemoteCallHib> 
-       
+
        <method name="showUserContactData">
                <![CDATA[
                
-            var tString = this.userObject.adresses.street + " " + 
this.userObject.adresses.additionalname + "<br/>";
-                   tString +=  this.userObject.adresses.zip + " " + 
this.userObject.adresses.town + "<br/>";
-                   tString +=  this.userObject.adresses.states.name + 
"<br/><br/>";
-            tString +=  this.userObject.adresses.email + "<br/>";
-            tString +=  this.userObject.adresses.phone + "<br/><br/>";
-            tString +=  this.userObject.adresses.comment + "<br/>";
-            
-            this.userContactData.setAttribute("text",tString);
-            
+                       var tString = 
canvas.getNotNullString(this.userObject.adresses.street) + " " + 
canvas.getNotNullString(this.userObject.adresses.additionalname) + "<br/>";
+                       tString += 
canvas.getNotNullString(this.userObject.adresses.zip) + " " + 
canvas.getNotNullString(this.userObject.adresses.town) + "<br/>";
+                       tString += 
canvas.getNotNullString(this.userObject.adresses.states.name) + "<br/><br/>";
+                       tString += 
canvas.getNotNullString(this.userObject.adresses.email) + "<br/>";
+                       tString += 
canvas.getNotNullString(this.userObject.adresses.phone) + "<br/><br/>";
+                       tString += 
canvas.getNotNullString(this.userObject.adresses.comment) + "<br/>";
+
+                       this.userContactData.setAttribute("text",tString);
+
                ]]>
        </method>
        


Reply via email to