Revision: 2560
Author: seba.wagner
Date: Sat Oct 31 02:33:08 2009
Log: Fix :80 problem in Calendar Invitations
http://code.google.com/p/openmeetings/source/detail?r=2560
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/dialogue/termindetails.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/inviteMainWindow.lzx
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/dialogue/termindetails.lzx
Tue Oct 20 02:47:37 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/dialogue/termindetails.lzx
Sat Oct 31 02:33:08 2009
@@ -20,18 +20,31 @@
</handler>
<handler name="oninit">
- this._date.bringToFront();
- this._erinnerungedit.selectItemAt(2);
- this._repetitionselect.selectItemAt(0);
-
- //Point URL to actual File
- var urlObject = lz.Browser.getBaseURL();
- this.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+urlObject.port+urlObject.path+urlObject.file;
-
- if ($debug) Debug.write("parent.baseUrl ",this.baseUrl);
-
- this.getAppointmentCategoryList.doCall();
- this.getAppointmentReminderTypList.doCall();
+ <![CDATA[
+ this._date.bringToFront();
+ this._erinnerungedit.selectItemAt(2);
+ this._repetitionselect.selectItemAt(0);
+
+ //Point URL to actual File
+ var urlObject = lz.Browser.getBaseURL();
+ //If Port is Null or undefinied use port 80
+ if (urlObject.port!=null &&
urlObject.port!=undefined){
+ var port = urlObject.port;
+
+ if (port != 80) {
+ this.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+port+urlObject.path+urlObject.file;
+ } else {
+ this.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path+urlObject.file;
+ }
+ } else {
+ this.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path+urlObject.file;
+ }
+
+ if ($debug) Debug.write("parent.baseUrl ",this.baseUrl);
+
+ this.getAppointmentCategoryList.doCall();
+ this.getAppointmentReminderTypList.doCall();
+ ]]>
</handler>
<method name="defaulttermindetails">
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/inviteMainWindow.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/inviteMainWindow.lzx
Sat Oct 31 02:33:08 2009
@@ -76,10 +76,16 @@
//If Port is Null or undefinied use
port 80
if (urlObject.port!=null &&
urlObject.port!=undefined){
var port = urlObject.port;
+
+ if (port != 80) {
+ parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+port+urlObject.path+urlObject.file;
+ } else {
+ parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path+urlObject.file;
+ }
} else {
- var port = 80;
- }
- parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+":"+port+urlObject.path+urlObject.file;
+ parent.baseUrl =
urlObject.protocol+"://"+urlObject.host+urlObject.path+urlObject.file;
+ }
+
if( $debug )
Debug.write("parent.baseUrl: ",parent.baseUrl);
if (!canvas.isConference){
parent.roomType = "audience";
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
