Revision: 3821
Author: seba.wagner
Date: Mon Jun 13 10:23:41 2011
Log: Modifications for new Flags in room configuration
http://code.google.com/p/openmeetings/source/detail?r=3821
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/roomadmin/roomValueForm.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/rpcerrorDialog.lzx
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddOrgRoom.java
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddRoomTypes.java
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/RoomTest.java
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/roomadmin/roomValueForm.lzx
Fri Jun 10 02:02:54 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/roomadmin/roomValueForm.lzx
Mon Jun 13 10:23:41 2011
@@ -38,6 +38,8 @@
this.redirectURL.setAttribute("text","");
this._listRoomModerators.clearList();
this.ownerId.setAttribute("text","0");
+ this.waitForRecording.setValue(false);
+ this.allowRecording.setValue(false);
</handler>
<handler name="ondelete" >
@@ -135,6 +137,17 @@
this.ownerId.setAttribute("text","0");
}
+ if (obj.waitForRecording != null && obj.waitForRecording){
+ this.waitForRecording.setValue(true);
+ } else {
+ this.waitForRecording.setValue(false);
+ }
+
+ if (obj.allowRecording != null && obj.allowRecording){
+ this.allowRecording.setValue(true);
+ } else {
+ this.allowRecording.setValue(false);
+ }
this._listRoomModerators.getRoomModeratorsByRoomId.doCall();
]]>
@@ -217,6 +230,9 @@
this.sendObject["sipNumber"] = parent.sipNumber.getText();
this.sendObject["conferencePin"] =
parent.conferencePin.getText();
+ this.sendObject["waitForRecording"] =
parent.waitForRecording.getValue();
+ this.sendObject["allowRecording"] =
parent.allowRecording.getValue();
+
var ownerId = parent.ownerId.getText();
if (ownerId == "") ownerId = 0;
this.sendObject["ownerId"] = ownerId;
@@ -430,6 +446,12 @@
<labelText labelid="1102" x="24" y="820" fontstyle="italic"
multiline="true" width="370" />
+ <!-- isClosed -->
+ <labelText labelid="1355" width="200" y="860" resize="false" x="2"/>
+ <labelCheckbox name="waitForRecording" width="270" y="860" x="130"
fontsize="11" />
+
+ <labelText labelid="1356" width="200" y="880" resize="false" x="2"/>
+ <labelCheckbox name="allowRecording" width="270" y="880" x="130"
fontsize="11" />
<!-- RoomClient List Right Side -->
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Thu Jun 9 11:28:01 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Mon Jun 13 10:23:41 2011
@@ -56,6 +56,15 @@
if (this.roomobj.isClosed) {
canvas.roomClosed();
}
+
+ if (this.roomobj.waitForRecording) {
+
+ new lz.errorDialog(canvas,{
+ labelid:1316,
+ errortext:canvas.getLabelName(1315)
+ });
+
+ }
canvas.currentRoomObject = this.roomobj;
canvas._mainbgcontentNavi.setAttribute('height',0);
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/rpcerrorDialog.lzx
Mon Apr 18 05:08:54 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/rpcerrorDialog.lzx
Mon Jun 13 10:23:41 2011
@@ -37,7 +37,9 @@
<handler name="oninit">
lz.ModeManager.makeModal(this);
- this.getErrorByCode.doCall();
+ if (errorid != 0) {
+ this.getErrorByCode.doCall();
+ }
</handler>
<handler name="onclose">
lz.ModeManager.release(this);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Mon Jun 13 10:23:41 2011
@@ -162,6 +162,8 @@
"", // redirectURL
"", // sipNumber
"", //
conferencePIN
+ null, // ownerID
+ null,
null); // ownerID
log.debug("Appointmentlogic.saveAppointment : Room - " +
room_id);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Mon Apr 25 06:16:00 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Roommanagement.java
Mon Jun 13 10:23:41 2011
@@ -820,7 +820,9 @@
String redirectURL,
String sipNumber,
String conferencePin,
- Long ownerId){
+ Long ownerId,
+ Boolean waitForRecording,
+ Boolean allowRecording){
log.debug("addRoom");
@@ -853,6 +855,9 @@
r.setConferencePin(conferencePin);
r.setOwnerId(ownerId);
+ r.setWaitForRecording(waitForRecording);
+ r.setAllowRecording(allowRecording);
+
//handle SIP Issues
OpenXGReturnObject openXGReturnObject =
OpenXGHttpClient.getInstance().openSIPgCreateConference();
@@ -1441,7 +1446,9 @@
String redirectURL,
String sipNumber,
String conferencePin,
- Long ownerId){
+ Long ownerId,
+ Boolean waitForRecording,
+ Boolean allowRecording){
try {
log.debug("*** updateRoom numberOfPartizipants:
"+numberOfPartizipants);
if
(AuthLevelmanagement.getInstance().checkAdminLevel(user_level)){
@@ -1470,6 +1477,9 @@
r.setConferencePin(conferencePin);
r.setOwnerId(ownerId);
+ r.setWaitForRecording(waitForRecording);
+ r.setAllowRecording(allowRecording);
+
Object idf = HibernateUtil.createSession();
Session session = HibernateUtil.getSession();
Transaction tx = session.beginTransaction();
@@ -1827,7 +1837,9 @@
"", //redirectURL
"", //sipNumber
"", //conferencePin
-
ownerId
+
ownerId,
+
null,
+
null
);
if (rooms_id != null) {
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Tue Jun 7 03:24:12 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Mon Jun 13 10:23:41 2011
@@ -461,37 +461,53 @@
Roommanagement.getInstance().addRoom(3, "public Interview Room",
interview_Id,
"", new Long(16), true, null, false, false,
null, false, null, true,
- false, false, "", "", "", null);
+ false, false, "", "", "", null,
+ null,
+ null);
Roommanagement.getInstance().addRoom(3, "public Conference Room",
conference_Id,
"", new Long(32), true, null, false, false,
null, false, null, true,
- false, false, "", "", "", null);
+ false, false, "", "", "", null,
+ null,
+ null);
Roommanagement.getInstance().addRoom(3, "public Video Only Room",
conference_Id,
"", new Long(32), true, null, false, false,
null, false, null, true,
- false, false, "", "", "", null);
+ false, false, "", "", "", null,
+ null,
+ null);
Roommanagement.getInstance().addRoom(3,
"public Video And Whiteboard Room", conference_Id, "", new Long(32),
true,
- null, false, false, null, false, null, true, false, false, "", "", "",
null);
+ null, false, false, null, false, null, true, false, false, "", "", "",
null,
+ null,
+ null);
Roommanagement.getInstance().addRoom(3, "public Restricted Room",
restricted_Id,
"", new Long(100), true, null, false, false,
null, false, null, true,
- false, false, "", "", "", null);
+ false, false, "", "", "", null,
+ null,
+ null);
long room2 = Roommanagement.getInstance().addRoom(3,
"private Conference Room", conference_Id, "", new Long(32), false,
null,
- false, false, null, false, null, true, false, false, "",
"", "", null);
+ false, false, null, false, null, true, false, false, "",
"", "", null,
+ null,
+ null);
Roommanagement.getInstance().addRoomToOrganisation(3, room2, 1);
Roommanagement.getInstance().addRoom(3,
"public Audience Room", audience_Id, "", new
Long(32), true, null,
- false, false, null, false, null, true, false, false, "",
"", "", null);
+ false, false, null, false, null, true, false, false, "",
"", "", null,
+ null,
+ null);
long room4 = Roommanagement.getInstance().addRoom(3,
"private Audience Room", audience_Id, "", new
Long(32), false, null,
- false, false, null, false, null, true, false, false, "",
"", "", null);
+ false, false, null, false, null, true, false, false, "",
"", "", null,
+ null,
+ null);
Roommanagement.getInstance().addRoomToOrganisation(3, room4, 1);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/ConferenceService.java
Mon Jun 13 10:23:41 2011
@@ -541,7 +541,9 @@
argObjectMap.get("redirectURL").toString(),
argObjectMap.get("sipNumber").toString(),
argObjectMap.get("conferencePin").toString(),
-
Long.valueOf(argObjectMap.get("ownerId").toString()).longValue());
+
Long.valueOf(argObjectMap.get("ownerId").toString()).longValue(),
+
Boolean.valueOf(argObjectMap.get("waitForRecording").toString()),
+
Boolean.valueOf(argObjectMap.get("allowRecording").toString()));
} else if (rooms_id>0){
return Roommanagement.getInstance().updateRoom(User_level,
rooms_id,
Long.valueOf(argObjectMap.get("roomtypes_id").toString()).longValue(),
@@ -559,7 +561,9 @@
argObjectMap.get("redirectURL").toString(),
argObjectMap.get("sipNumber").toString(),
argObjectMap.get("conferencePin").toString(),
-
Long.valueOf(argObjectMap.get("ownerId").toString()).longValue());
+
Long.valueOf(argObjectMap.get("ownerId").toString()).longValue(),
+
Boolean.valueOf(argObjectMap.get("waitForRecording").toString()),
+
Boolean.valueOf(argObjectMap.get("allowRecording").toString()));
}
} catch (Exception e){
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/remote/UserService.java
Mon Jun 13 10:23:41 2011
@@ -809,7 +809,9 @@
"",
// redirectURL
"",
// sipNumber
"",
// conferencePIN
- null);
// ownerId
+ null,
// ownerId
+ null,
+ null);
room =
Roommanagement.getInstance().getRoomById(room_id);
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/MethodGateway.java
Mon Jun 13 10:23:41 2011
@@ -197,7 +197,7 @@
Long returnVal =
Roommanagement.getInstance().addRoom(user_level, name, roomtypes_id,
comment,
numberOfPartizipants, ispublic, null,
false, false,
null, false, null, true, false, false, ""
- , "",
"", null);
+ , "",
"", null, null, null);
XStream xStream = new XStream(new
XppDriver());
xStream.setMode(XStream.NO_REFERENCES);
=======================================
---
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
Mon Apr 25 06:16:00 2011
+++
/trunk/singlewebapp/src/roomservice/org/openmeetings/axis/services/RoomService.java
Mon Jun 13 10:23:41 2011
@@ -506,7 +506,7 @@
return Roommanagement.getInstance().addRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants,
ispublic, null,
false, false, null
- , false, null, true, false, false, "",
"", "", null);
+ , false, null, true, false, false, "",
"", "", null, null, null);
} catch (Exception err) {
log.error("[addRoom] ",err);
}
@@ -527,7 +527,7 @@
return Roommanagement.getInstance().addRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants,
ispublic, null,
appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- true, false, false, "", "",
"", null);
+ true, false, false, "", "",
"", null, null, null);
} catch (Exception err) {
log.error("[addRoomWithModeration] ",err);
}
@@ -567,7 +567,7 @@
return Roommanagement.getInstance().addRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants,
ispublic, null,
appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- allowUserQuestions, false, false, "",
"", "", null);
+ allowUserQuestions, false, false, "",
"", "", null, null, null);
} catch (Exception err) {
log.error("[addRoomWithModerationAndQuestions] ",err);
}
@@ -590,7 +590,7 @@
return Roommanagement.getInstance().addRoom(user_level, name,
roomtypes_id, comment,
numberOfPartizipants,
ispublic, null,
appointment,
isDemoRoom, demoTime, isModeratedRoom, null,
- allowUserQuestions, isAudioOnly, false, "",
"", "", null);
+ allowUserQuestions, isAudioOnly, false, "", "", "", null, null,
null);
} catch (Exception err) {
log.error("[addRoomWithModerationQuestionsAndAudioType]
",err);
throw new AxisFault(err.getMessage());
@@ -698,7 +698,7 @@
Long user_level =
Usermanagement.getInstance().getUserLevelByID(users_id);
return Roommanagement.getInstance().updateRoom(user_level, rooms_id,
roomtypes_id, name, ispublic,
comment, numberOfPartizipants, null,
appointment, false, null, false,
- null,true,false, false, "", "", "",
null);
+ null,true,false, false, "", "", "",
null, null, null);
} catch (Exception err) {
log.error("[addRoom] ",err);
}
@@ -721,7 +721,7 @@
return Roommanagement.getInstance().updateRoom(user_level, room_id,
roomtypes_id,
name, ispublic, comment,
numberOfPartizipants, null,
appointment, isDemoRoom, demoTime,
isModeratedRoom,null,true,false,
- false, "", "", "", null);
+ false, "", "", "", null, null, null);
} catch (Exception err) {
log.error("[updateRoomWithModeration] ",err);
}
@@ -745,7 +745,7 @@
return Roommanagement.getInstance().updateRoom(user_level, room_id,
roomtypes_id,
name, ispublic, comment,
numberOfPartizipants, null,
appointment, isDemoRoom, demoTime,
isModeratedRoom,
- null,allowUserQuestions,false, false, "", "",
"", null);
+ null,allowUserQuestions,false, false, "", "",
"", null, null, null);
} catch (Exception err) {
log.error("[updateRoomWithModerationAndQuestions]
",err);
}
=======================================
---
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddOrgRoom.java
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddOrgRoom.java
Mon Jun 13 10:23:41 2011
@@ -18,7 +18,7 @@
public void testAddOrgRoom(){
long room = Roommanagement.getInstance().addRoom(3,"roomOrg", 1, "", new
Long(4), true,null,
- false, false, null, false, null, true, false, false, "",
"", "", null);
+ false, false, null, false, null, true, false, false, "", "", "", null,
null, null);
Roommanagement.getInstance().addRoomToOrganisation(3,room, 1);
}
=======================================
---
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddRoomTypes.java
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/src/test/org/openmeetings/test/rooms/AddRoomTypes.java
Mon Jun 13 10:23:41 2011
@@ -23,11 +23,11 @@
// log.error("audience_Id: "+audience_Id);
long room = Roommanagement.getInstance().addRoom(3,"public Audience
Room", 2,"", new Long(4), false, null,
- false, false, null, false, null, true, false, false, "",
"", "", null);
+ false, false, null, false, null, true, false, false, "", "", "", null,
null, null);
Roommanagement.getInstance().addRoomToOrganisation(3,room, 1);
long room2 = Roommanagement.getInstance().addRoom(3,"private Audience
Room", 2,"", new Long(4), true, null,
- false, false, null, false, null, true, false, false, "",
"", "", null);
+ false, false, null, false, null, true, false, false, "", "", "", null,
null, null);
Roommanagement.getInstance().addRoomToOrganisation(3,room2, 1);
}
=======================================
--- /trunk/singlewebapp/src/test/org/openmeetings/test/rooms/RoomTest.java
Sat Apr 2 02:21:16 2011
+++ /trunk/singlewebapp/src/test/org/openmeetings/test/rooms/RoomTest.java
Mon Jun 13 10:23:41 2011
@@ -18,10 +18,10 @@
public void testRoomTest(){
//Public Rooms
long room1 = Roommanagement.getInstance().addRoom(3, "room1", 1, "", new
Long(4), true, null,
- false, false, null, false, null, true, false, false, "",
"", "", null);
+ false, false, null, false, null, true, false, false, "", "", "", null,
null, null);
log.error("room1: "+room1);
long room2 = Roommanagement.getInstance().addRoom(3, "room1", 2, "", new
Long(4), true, null,
- true, false, null, false, null, true, false, false, "",
"", "", null);
+ true, false, null, false, null, true, false, false, "", "", "", null,
null, null);
log.error("room2: "+room2);
}
--
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.
