Author: eschwert
Date: Sat Jan 21 18:53:52 2012
New Revision: 1234395
URL: http://svn.apache.org/viewvc?rev=1234395&view=rev
Log:
OPENMEETINGS-20 OPENMEETINGS-21 OPENMEETINGS-22 OPENMEETINGS-23 OPENMEETINGS-24
add new params into the System Backup
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java?rev=1234395&r1=1234394&r2=1234395&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupExport.java
Sat Jan 21 18:53:52 2012
@@ -930,6 +930,42 @@ public class BackupExport {
r.setShowMicrophoneStatus(false);
room.addElement("showMicrophoneStatus").addCDATA("" +
r.getShowMicrophoneStatus());
}
+
+ if (r.getHideActionsMenu() != null) {
+ room.addElement("hideActionsMenu").addCDATA(""
+ r.getHideActionsMenu());
+ } else {
+ room.addElement("hideActionsMenu").addCDATA("");
+ }
+
+ if (r.getHideActivitiesAndActions() != null) {
+
room.addElement("hideActivitiesAndActions").addCDATA("" +
r.getHideActivitiesAndActions());
+ } else {
+
room.addElement("hideActivitiesAndActions").addCDATA("");
+ }
+
+ if (r.getHideChat() != null) {
+ room.addElement("hideChat").addCDATA("" +
r.getHideChat());
+ } else {
+ room.addElement("hideChat").addCDATA("");
+ }
+
+ if (r.getHideFilesExplorer() != null) {
+
room.addElement("hideFilesExplorer").addCDATA("" + r.getHideFilesExplorer());
+ } else {
+
room.addElement("hideFilesExplorer").addCDATA("");
+ }
+
+ if (r.getHideScreenSharing() != null) {
+
room.addElement("hideScreenSharing").addCDATA("" + r.getHideScreenSharing());
+ } else {
+
room.addElement("hideScreenSharing").addCDATA("");
+ }
+
+ if (r.getHideWhiteboard() != null) {
+ room.addElement("hideWhiteboard").addCDATA("" +
r.getHideWhiteboard());
+ } else {
+ room.addElement("hideWhiteboard").addCDATA("");
+ }
room.addElement("isClosed").addCDATA("" +
r.getIsClosed());
room.addElement("redirectURL").addCDATA("" +
r.getRedirectURL());
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java?rev=1234395&r1=1234394&r2=1234395&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/servlet/outputhandler/BackupImport.java
Sat Jan 21 18:53:52 2012
@@ -1961,6 +1961,42 @@ public class BackupImport {
redirectURL =
unformatString(roomObject.element(
"redirectURL").getText());
}
+
+ Boolean hideActionsMenu = false;
+ if
(roomObject.element("hideActionsMenu") != null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideActionsMenu").getText()));
+ }
+
+ Boolean
hideActivitiesAndActions = false;
+ if
(roomObject.element("hideActivitiesAndActions") != null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideActivitiesAndActions").getText()));
+ }
+
+ Boolean hideChat = false;
+ if
(roomObject.element("hideChat") != null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideChat").getText()));
+ }
+
+ Boolean hideFilesExplorer =
false;
+ if
(roomObject.element("hideFilesExplorer") != null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideFilesExplorer").getText()));
+ }
+
+ Boolean hideScreenSharing =
false;
+ if
(roomObject.element("hideScreenSharing") != null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideScreenSharing").getText()));
+ }
+
+ Boolean hideWhiteboard = false;
+ if
(roomObject.element("hideWhiteboard") != null) {
+ hideTopBar =
importBooleanType(unformatString(roomObject
+
.element("hideWhiteboard").getText()));
+ }
Rooms room = new Rooms();
room.setRooms_id(rooms_id);
@@ -1987,7 +2023,13 @@ public class BackupImport {
room.setWaitForRecording(waitForRecording);
room.setHideTopBar(hideTopBar);
room.setAllowRecording(allowRecording);
-
room.setShowMicrophoneStatus(showMicrophoneStatus);
+
room.setShowMicrophoneStatus(showMicrophoneStatus);
+
room.setHideActionsMenu(hideActionsMenu);
+
room.setHideActivitiesAndActions(hideActivitiesAndActions);
+ room.setHideChat(hideChat);
+
room.setHideFilesExplorer(hideFilesExplorer);
+
room.setHideScreenSharing(hideScreenSharing);
+
room.setHideWhiteboard(hideWhiteboard);
Long roomId =
room.getRooms_id();
