You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/02/24 07:36:23 UTC

svn commit: r1661850 - in /openmeetings/branches/3.0.x/WebContent/src: base/hibernate/ modules/chat/ modules/conference/participants/ modules/conference/tabcontent/chat/

Author: solomax
Date: Tue Feb 24 06:36:22 2015
New Revision: 1661850

URL: http://svn.apache.org/r1661850
Log:
[OPENMEETINGS-1182] Last name of Joomla users is not displayed as 'null'

Modified:
    openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
    openmeetings/branches/3.0.x/WebContent/src/modules/chat/globalMethods.lzx
    openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantList.lzx
    openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantListItem.lzx
    openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
    openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx

Modified: openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1661850&r1=1661849&r2=1661850&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx Tue Feb 24 06:36:22 2015
@@ -547,11 +547,13 @@
                     
                     canvas.setAttribute('allowRecording',value.allowRecording);
                     
-                    canvas.setAttribute('firstName',value.firstname);
-                    canvas.setAttribute('lastName',value.lastname);
+                    var fName = value.firstname == null ? "" : value.firstname;
+                    var lName = value.lastname == null ? "" : value.lastname;
+                    canvas.setAttribute('firstName', fName);
+                    canvas.setAttribute('lastName', lName);
                     
-                    hib.userobject.firstname = value.firstname;
-                    hib.userobject.lastname = value.lastname;
+                    hib.userobject.firstname = fName;
+                    hib.userobject.lastname = lName;
                     
                     canvas.setAttribute('mail','');
                     canvas.setAttribute('lastLogin','');
@@ -820,8 +822,8 @@
 			if ($debug) Debug.write("!!!!!!!!!!! loginWicket", value);
 			if (value != null) {
 				canvas.setAttribute('user_id',value.user_id);
-				canvas.setAttribute('firstName',value.firstname);
-				canvas.setAttribute('lastName',value.lastname);
+				canvas.setAttribute('firstName', value.firstname == null ? "" : value.firstname);
+				canvas.setAttribute('lastName', value.lastname == null ? "" : value.lastname);
 				canvas.setAttribute('mail','');
 				canvas.setAttribute('lastLogin','');
 				canvas.setAttribute('official_code','');

Modified: openmeetings/branches/3.0.x/WebContent/src/modules/chat/globalMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/chat/globalMethods.lzx?rev=1661850&r1=1661849&r2=1661850&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/chat/globalMethods.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/chat/globalMethods.lzx Tue Feb 24 06:36:22 2015
@@ -159,17 +159,14 @@ function getLineHeight(){
 
 
 <method name="addChatHistory" args="value,client">
-  	<![CDATA[
-  	Debug.write("addChatHistory: ",value,client);
-    if (value[7]){
-          var newmessage = "<FONT COLOR='"+value[5]+"' size='11'>"+client.firstname+" "+client.lastname+"</FONT>:<FONT COLOR='0x000000' size='11'>"+value[4]+"</FONT><br />";
-    } else {
-          var newmessage = "<FONT COLOR='"+value[5]+"' size='11'>"+client.firstname+" "+client.lastname+"</FONT>:<FONT COLOR='0x000000' size='11'>"+value[4]+"</FONT><br />";
-    }
-  	//Debug.write("newmessage: ",newmessage);
-  	canvas._chatcontent.addChatItem(newmessage);  // Is "addChatItem()" used?  By what? h.kuze 2008/3/27
-  	canvas._chathistory.push(newmessage);
-  	]]>
+<![CDATA[
+	if ($debug) Debug.write("addChatHistory: ", value,client);
+	var name = (client.firstname == null ? "" : client.firstname) + " " + (client.lastname == null ? "" : client.lastname);
+	var newmessage = "<FONT COLOR='"+value[5]+"' size='11'>"+name+"</FONT>:<FONT COLOR='0x000000' size='11'>"+value[4]+"</FONT><br />";
+	//Debug.write("newmessage: ",newmessage);
+	canvas._chatcontent.addChatItem(newmessage);  // Is "addChatItem()" used?  By what? h.kuze 2008/3/27
+	canvas._chathistory.push(newmessage);
+]]>
 </method>
 
 <method name="resetFormatedChatHistory">

Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantList.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantList.lzx?rev=1661850&r1=1661849&r2=1661850&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantList.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantList.lzx Tue Feb 24 06:36:22 2015
@@ -74,7 +74,7 @@
                 }
             }
             
-            var lastname = object.lastname;
+            var lastname = object.lastname == null ? "" : object.lastname;
             
             if ($debug) Debug.write("object.isSuperModerator ",object.isSuperModerator);
             

Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantListItem.lzx?rev=1661850&r1=1661849&r2=1661850&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantListItem.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/participants/participantListItem.lzx Tue Feb 24 06:36:22 2015
@@ -365,8 +365,8 @@
         </handler>
     </image>
     
-    <labelText name="_firstName" fontsize="10" x="40" text="${ parent.firstname }" />
-    <labelText name="_lastName" fontsize="10" x="40" y="20" text="${ parent.lastname }" />
+    <labelText name="_firstName" fontsize="10" x="40" text="${ parent.firstname == null ? '' : parent.firstname }" />
+    <labelText name="_lastName" fontsize="10" x="40" y="20" text="${ parent.lastname == null ? '' : parent.lastname }" />
     
 	<miniIcons name="_start_private_chat_rsc" x="114" y = "2" width="16" height="16"
 		resource="start_private_chat_rsc" showhandcursor="true"

Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1661850&r1=1661849&r2=1661850&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx Tue Feb 24 06:36:22 2015
@@ -113,11 +113,12 @@
                                             });
             var tempWidth = this.content.chatbar.getCurrentSize();
             
+            var tabname = (refObj.firstname == null ? "" : refObj.firstname) + " " + (refObj.lastname == null ? "" : refObj.lastname);
             var tWhiteboardBtn = new lz.chatMiniButton(this.content.chatbar,{
                                        objRef:chatTabPrivateRef,
                                        width:tempWidth,
                                        isactive:true,
-                                       btnName:refObj.firstname+" "+refObj.lastname
+                                       btnName: tabname
                                     });
             
             this.content.chatbar.currentBtn = tWhiteboardBtn;                       

Modified: openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx?rev=1661850&r1=1661849&r2=1661850&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/conference/tabcontent/chat/chatOutput.lzx Tue Feb 24 06:36:22 2015
@@ -84,16 +84,8 @@
         <![CDATA[
             //if($debug) Debug.write("chatOutput/addChatHistory: ",value,client);
             canvas.currentBaseConferenceRoom._chatPanelStrict.startBlink();
-            //is Right To Left ? not checked for the moment
-            if (value[7]){
-                var username = client.firstname+" "+client.lastname;
-            } else {
-                var username = client.firstname+" "+client.lastname;
-            }
+            var username = (client.firstname == null ? "" : client.firstname) + " " + (client.lastname == null ? "" : client.lastname);
             var messageObj = value[value.length - 1];
-            //var newmessage = "<FONT COLOR='"+value[5]+"' size='11'>"+client.firstname+" "+client.lastname+"</FONT>:<FONT COLOR='0x000000' size='11'>"+value[4]+"</FONT><br />";
-            //Debug.write("newmessage: ",newmessage);
-            //this._cbtext.setAttribute('text',this._cbtext.text+newmessage);
             var usercolor = value[5];
             
             var isDirectLink = null;