svn commit: r1601075 - in /openmeetings/branches/3.0.x/WebContent/src: base/mainAttributes.lzx modules/conference/conference/conferenceMenubar.lzx modules/invitation/inviteMainWindow.lzx

[solomax]

Author: solomax
Date: Sat Jun  7 07:54:11 2014
New Revision: 1601075

URL: http://svn.apache.org/r1601075
Log:
[OPENMEETINGS-1015] "Send invitation" action menu is disabled until all time 
zones are loaded

Modified:
    openmeetings/branches/3.0.x/WebContent/src/base/mainAttributes.lzx
    
openmeetings/branches/3.0.x/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
    
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx

Modified: openmeetings/branches/3.0.x/WebContent/src/base/mainAttributes.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/mainAttributes.lzx?rev=1601075&r1=1601074&r2=1601075&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/mainAttributes.lzx 
(original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/mainAttributes.lzx Sat Jun  
7 07:54:11 2014
@@ -277,6 +277,7 @@ the LAST RoomClient Object that has been
 <attribute name="timeZoneId" value="0" type="number" />
 <attribute name="jNameTimeZone" value="" type="string" />
 <attribute name="timeZones" type="object" />
+<attribute name="timeZonesLoaded" type="boolean" value="false"/>
 <attribute name="lastName" value="" type="string" />
 <attribute name="mail" value="" type="string" />
 <attribute name="lastLogin" value="" type="string" />

Modified: 
openmeetings/branches/3.0.x/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1601075&r1=1601074&r2=1601075&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
 (original)
+++ 
openmeetings/branches/3.0.x/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
 Sat Jun  7 07:54:11 2014
@@ -217,7 +217,7 @@
                        layout="axis:y;spacing:1" bgcolor="$once{ 
canvas.getThemeColor('menuBackgroundColor') }" >
                        
                        <conferencDropDownMenuItem labelid="213" 
command="cmd_invitation" 
-                                               enabled="${ canvas.ismoderator 
}" />
+                                               enabled="${ 
canvas.timeZonesLoaded &amp;&amp; canvas.ismoderator }" />
                        <horizontalDropDownSpacer />
                        <conferencDropDownMenuItem labelid="239" 
command="cmd_shareDesktop" 
                                                enabled="${ 
classroot.btnRef.classroot.viewType != 'interview' &amp;&amp; 
canvas.ismoderator }" />                      

Modified: 
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx?rev=1601075&r1=1601074&r2=1601075&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx
 (original)
+++ 
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx
 Sat Jun  7 07:54:11 2014
@@ -59,6 +59,7 @@
                        } else {
                                lz.Timer.removeTimer(addTimezoneItemsDelegate);
                                addTimezoneItemsDelegate = null;
+                               canvas.setAttribute("timeZonesLoaded", true);
                        }
                        if ($debug) Debug.write(":: addTimezoneItems :: ", 
itemCount);
                        lz.Timer.resetTimer(addTimezoneItemsDelegate, 500);