Author: solomax
Date: Sat May 31 07:28:13 2014
New Revision: 1598831

URL: http://svn.apache.org/r1598831
Log:
[OPENMEETINGS-1012] Correct tz is set in invitation window

Modified:
    
openmeetings/branches/3.0.x/WebContent/src/base/components/calendar/dateSelector.lzx
    
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/inviteMainWindow.lzx

Modified: 
openmeetings/branches/3.0.x/WebContent/src/base/components/calendar/dateSelector.lzx
URL: 
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/components/calendar/dateSelector.lzx?rev=1598831&r1=1598830&r2=1598831&view=diff
==============================================================================
--- 
openmeetings/branches/3.0.x/WebContent/src/base/components/calendar/dateSelector.lzx
 (original)
+++ 
openmeetings/branches/3.0.x/WebContent/src/base/components/calendar/dateSelector.lzx
 Sat May 31 07:28:13 2014
@@ -244,7 +244,9 @@
                this.setAttribute('year',this.showingdate.getFullYear());
                this.selecteddate = this.showingdate;
                var firstdayDate = this.getDateFirstDayInMonth();
-               this.content.content.destroy();
+               if (this.content.content != null) {
+                       this.content.content.destroy();
+               }
                new lz.dateSelectorMonth(this.content,{name:'content',
                                
firstweekNumber:this.getWeekNumber(firstdayDate.getTime()),
                                month:this.selecteddate.getMonth(),

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=1598831&r1=1598830&r2=1598831&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 May 31 07:28:13 2014
@@ -101,9 +101,9 @@
                        var std_time_offset = Math.round(std_time_offset);
                        var timeZoneJavaFormat = "Etc/GMT";
                        if (std_time_offset > 0) {
-                               timeZoneJavaFormat += "+"+std_time_offset;
-                       } else {
                                timeZoneJavaFormat += "-"+std_time_offset;
+                       } else {
+                               timeZoneJavaFormat += "+"+std_time_offset;
                        }
                        
                        if ($debug) Debug.write("timeZoneJavaFormat :: 
",timeZoneJavaFormat);


Reply via email to