Revision: 2556
Author: seba.wagner
Date: Wed Oct 28 12:50:41 2009
Log: Fix roomObj when entering via SOAP
Fix menu bar, no duplicates and allow actions for non moderators
Fix no Moderation-Warning Dialog in Restricted Rooms
http://code.google.com/p/openmeetings/source/detail?r=2556
Modified:
/trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/testsetup/testSetup.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/testsetup/testingApplication.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/autoloaderBarOnly.lzx
=======================================
--- /trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml Mon Oct 26
08:30:27 2009
+++ /trunk/singlewebapp/WebContent/conf/hibernate.cfg.xml Wed Oct 28
12:50:41 2009
@@ -16,7 +16,7 @@
<property
name="connection.driver_class">com.mysql.jdbc.Driver</property>
<!-- for performance reasons changed to MyISAM from
org.hibernate.dialect.MySQLInnoDBDialect -->
<property
name="dialect">org.hibernate.dialect.MySQLMyISAMDialect</property>
- <property
name="connection.url">jdbc:mysql://localhost/openmeetings_act2win_2?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8</property>
+ <property
name="connection.url">jdbc:mysql://localhost/openmeetings_act2win_8?autoReconnect=true&useUnicode=true&createDatabaseIfNotExist=true&characterEncoding=utf-8</property>
<property name="hibernate.connection.CharSet">utf8</property>
<property
name="hibernate.connection.characterEncoding">utf8</property>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Tue Oct 27 12:27:49 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/base/hibernate/hibRtmpConnection.lzx
Wed Oct 28 12:50:41 2009
@@ -135,7 +135,7 @@
]]>
</handler>
- <method name="refreshSessionMeth">
+ <method name="refreshSessionMeth" args="calleeObj">
this.refreshSession.doCall();
</method>
@@ -256,6 +256,11 @@
} else {
+ if (value == null) {
+ new
lz.errorPopup(canvas,{error:'Invalid Hash'});
+ return;
+ }
+
canvas.initroomid = value.room_id;
canvas.becomemoderator =
value.becomemoderator;
@@ -564,6 +569,9 @@
}
canvas._drawarea.onopenWhiteBoard.sendEvent();
+ if ($debug)
Debug.write("roomType_id ",canvas.currentRoomObject);
+ if ($debug)
Debug.write("roomType_id ",canvas.currentRoomObject.roomtype.roomtypes_id);
+
if (canvas.currentRoomObject.roomtype.roomtypes_id!=3)
{
//We do not show this warning when the roomtype is 3
(restricted)
if (canvas.currentRoomObj.isModeratedRoom) {
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Tue
Oct 27 06:35:26 2009
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Wed
Oct 28 12:50:41 2009
@@ -354,21 +354,26 @@
} else {
canvas.isConference = false;
}
+
+ //this is needed cause in the rpc-method *getCurrentModeratorList*
we
check if its roomtype_id == 3
+ //and if roomtype_id == 3 we will not show any *There is no
Moderator* Warning Dialog
+ canvas.currentRoomObject = roomObj;
+
hib.currentroomid = roomId;
if (roomObj!=null){
if (roomTypeId==1){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomobj:roomObj});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomObj:roomObj});
//new
lz[canvas.conferenceRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
} else if (roomTypeId==2){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.eventRoomModule,roomobj:roomObj});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.eventRoomModule,roomObj:roomObj});
//new
lz[canvas.eventRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
} else if (roomTypeId==3){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:"restrictedConferenceRoom",roomobj:roomObj});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:"restrictedConferenceRoom",roomObj:roomObj});
//new
lz[canvas.eventRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
}
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Tue Oct 27 12:27:49 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Wed Oct 28 12:50:41 2009
@@ -51,7 +51,7 @@
}
]]>
</handler>
- <_labelMenuItem labelid="15" command="cmd_importFile" />
+ <_labelMenuItem labelid="15" command="cmd_importFile"
enabled="${ canvas.ismoderator }"/>
<menuseparator/>
<_labelMenuItem labelid="561" command="cmd_exportFilePNG" />
<_labelMenuItem labelid="562" command="cmd_exportFileJPG" />
@@ -65,7 +65,6 @@
</_labelMenu>
<_labelMenu labelid="635" width="250">
- <_labelMenuItem labelid="302" command="cmd_applyforMod" />
<_labelMenuItem labelid="213" command="cmd_invitation" />
<menuseparator/>
<_labelMenuItem labelid="239" enabled="${ canvas.ismoderator
}">
@@ -159,13 +158,13 @@
}
]]>
</handler>
- <_labelMenuItem labelid="15" command="cmd_importFile"
enabled="${ !canvas.ismoderator }" />
+ <_labelMenuItem labelid="15" command="cmd_importFile"
enabled="${ canvas.ismoderator }" />
<menuseparator/>
- <_labelMenuItem labelid="561" command="cmd_exportFilePNG"
enabled="${ !canvas.ismoderator }" />
- <_labelMenuItem labelid="562" command="cmd_exportFileJPG"
enabled="${ !canvas.ismoderator }" />
- <_labelMenuItem labelid="563" command="cmd_exportFilePDF"
enabled="${ !canvas.ismoderator }" />
- <_labelMenuItem labelid="560" command="cmd_exportFileSVG"
enabled="${ !canvas.ismoderator }" />
- <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
enabled="${ !canvas.ismoderator }" />
+ <_labelMenuItem labelid="561" command="cmd_exportFilePNG"
enabled="${ canvas.ismoderator }" />
+ <_labelMenuItem labelid="562" command="cmd_exportFileJPG"
enabled="${ canvas.ismoderator }" />
+ <_labelMenuItem labelid="563" command="cmd_exportFilePDF"
enabled="${ canvas.ismoderator }" />
+ <_labelMenuItem labelid="560" command="cmd_exportFileSVG"
enabled="${ canvas.ismoderator }" />
+ <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
enabled="${ canvas.ismoderator }" />
<!--
<menuseparator/>
<_labelMenuItem name="_exitItem" labelid="309"
command="cmd_quit" value="quit" />
@@ -173,7 +172,6 @@
</_labelMenu>
<_labelMenu labelid="635" width="250">
- <_labelMenuItem labelid="302" command="cmd_applyforMod"
enabled="${ canvas.ismoderator }" />
<_labelMenuItem labelid="213" command="cmd_invitation"
enabled="${ canvas.ismoderator }" />
<menuseparator/>
<_labelMenuItem labelid="239" enabled="${ canvas.ismoderator
}">
@@ -185,12 +183,7 @@
<_labelMenuItem labelid="306" command="cmd_editCamMicSettings"
enabled="${ canvas.ismoderator }" />
<_labelMenuItem labelid="307" command="cmd_editBoardSettings"
enabled="${ canvas.ismoderator }" />
<menuseparator/>
- <_labelMenuItem labelid="784" enabled="${ !canvas.ismoderator
}">
- <handler name="onselect" args="sel">
- //Apply for Moderation
- canvas.thishib.applyForModeration.doCall();
- </handler>
- </_labelMenuItem>
+ <_labelMenuItem labelid="302" command="cmd_applyforMod"
enabled="${ canvas.ismoderator }" />
<_labelMenuItem labelid="785" enabled="${ !canvas.ismoderator
}" >
<handler name="onselect" args="sel">
//Ask for Right to Draw on Whiteboard
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Mon Oct 26 05:40:41 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Wed Oct 28 12:50:41 2009
@@ -22,7 +22,9 @@
new
lz.moderationPanel(canvas._conferencemenu,{name:'_moderationPanel',align:'right'});
canvas._conferencemenu.setAttribute('visibility','visible');
- if(roomobj.appointment){
+ if ($debug) Debug.write("this.roomobj ",this.roomobj);
+
+ if(this.roomobj.appointment){
new lz.winni(canvas.conferenceView,{ name:'appDetail',
width:350, height:160, resizable:true, closeable:true,
x:300,y:200, roomobj:this.roomobj });
} else{
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/testsetup/testSetup.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/testsetup/testSetup.lzx
Wed Oct 28 12:50:41 2009
@@ -85,14 +85,15 @@
clearStageContent();
- if ($debug) Debug.write("roomClassname : ",
+this.roomClassName);
+ if ($debug) Debug.warn("roomClassname : ", this.roomClassName);
+ if ($debug) Debug.warn("canvas.currentRoomObj will be : ",
this.roomObj);
canvas.currentRoomObj = this.roomObj;
this.close();
new lz[this.roomClassName](canvas.main_content._content.inner,
{
- roomobj : this.roomObj
+ roomobj:this.roomObj
});
]]>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/testsetup/testingApplication.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/testsetup/testingApplication.lzx
Wed Oct 28 12:50:41 2009
@@ -30,7 +30,7 @@
lz.Timer.addTimer( this.counterDelegate, 1000 );
</method>
- <method name="count">
+ <method name="count" args="calleeObj">
if (this.recordingsCounter != 0){
this.recordingsCounter -= 1;
lz.Timer.addTimer( this.counterDelegate, 1000 );
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/autoloaderBarOnly.lzx
Mon Oct 26 05:40:41 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/autoloaderBarOnly.lzx
Wed Oct 28 12:50:41 2009
@@ -99,15 +99,15 @@
parent.close();
if
(canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==1){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomobj:canvas.thishib.currentInvitation.room});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.conferenceRoomModule,roomObj:canvas.thishib.currentInvitation.room});
} else if
(canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==2){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.eventRoomModule,roomobj:canvas.thishib.currentInvitation.room});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.eventRoomModule,roomObj:canvas.thishib.currentInvitation.room});
} else if
(canvas.thishib.currentInvitation.room.roomtype.roomtypes_id==3){
- new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:"restrictedConferenceRoom",roomobj:canvas.thishib.currentInvitation.room});
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:"restrictedConferenceRoom",roomObj:canvas.thishib.currentInvitation.room});
}
</handler>
</netRemoteCallHib>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
