Revision: 4450
Author: solomax666
Date: Fri Oct 21 11:35:16 2011
Log: - room types were not created in case default rooms creation was
skipped
http://code.google.com/p/openmeetings/source/detail?r=4450
Modified:
/tags/1_8
/tags/1_8/src/app/org/openmeetings/app/installation/ImportInitvalues.java
/tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Install.java
/tags/1_8/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
/tags/1_8/src/test/org/openmeetings/test/smoke/SmokeTest.java
=======================================
---
/tags/1_8/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Sat Sep 24 01:51:38 2011
+++
/tags/1_8/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Fri Oct 21 11:35:16 2011
@@ -473,7 +473,8 @@
}
- public void loadDefaultRooms() {
+
+ public void loadDefaultRooms(boolean createRooms) {
long conference_Id = roommanagement.addRoomType("conference");
log.debug("conference_Id: " + conference_Id);
@@ -488,46 +489,47 @@
long custom_Id = roommanagement.addRoomType("custom");
log.debug("custom_Id: " + custom_Id);
-
- roommanagement.addRoom(3, "public Interview Room", interview_Id,
"",
- new Long(16), true, null, false, false, null,
false, null,
- true, false, false, "", "", "", null, null,
null, false);
-
- roommanagement.addRoom(3, "public Conference Room", conference_Id,
"",
- new Long(32), true, null, false, false, null,
false, null,
- true, false, false, "", "", "", null, null,
null, false);
-
- roommanagement.addRoom(3, "public Video Only Room", conference_Id,
"",
- new Long(32), true, null, false, false, null,
false, null,
- true, false, false, "", "", "", null, null,
null, false);
-
- roommanagement.addRoom(3, "public Video And Whiteboard Room",
- conference_Id, "", new Long(32), true, null,
false, false,
- null, false, null, true, false, false, "", "",
"", null, null,
- null, false);
-
- roommanagement.addRoom(3, "public Restricted Room", restricted_Id,
"",
- new Long(100), true, null, false, false, null,
false, null,
- true, false, false, "", "", "", null, null,
null, false);
-
- long room2 = roommanagement.addRoom(3, "private Conference
Room",
- conference_Id, "", new Long(32), false, null,
false, false,
- null, false, null, true, false, false, "", "",
"", null, null,
- null, false);
-
- roommanagement.addRoomToOrganisation(3, room2, 1);
-
- roommanagement.addRoom(3, "public Audience Room", audience_Id,
"",
- new Long(32), true, null, false, false, null,
false, null,
- true, false, false, "", "", "", null, null,
null, false);
-
- long room4 = roommanagement.addRoom(3, "private Audience Room",
- audience_Id, "", new Long(32), false, null,
false, false, null,
- false, null, true, false, false, "", "", "",
null, null, null,
- false);
-
- roommanagement.addRoomToOrganisation(3, room4, 1);
-
+
+ if (createRooms) {
+ roommanagement.addRoom(3, "public Interview Room", interview_Id,
"",
+ new Long(16), true, null, false, false,
null, false, null,
+ true, false, false, "", "", "", null,
null, null, false);
+
+ roommanagement.addRoom(3, "public Conference Room",
conference_Id, "",
+ new Long(32), true, null, false, false,
null, false, null,
+ true, false, false, "", "", "", null,
null, null, false);
+
+ roommanagement.addRoom(3, "public Video Only Room",
conference_Id, "",
+ new Long(32), true, null, false, false,
null, false, null,
+ true, false, false, "", "", "", null,
null, null, false);
+
+ roommanagement.addRoom(3, "public Video And Whiteboard
Room",
+ conference_Id, "", new Long(32), true,
null, false, false,
+ null, false, null, true, false, false, "", "",
"", null, null,
+ null, false);
+
+ roommanagement.addRoom(3, "public Restricted Room",
restricted_Id, "",
+ new Long(100), true, null, false,
false, null, false, null,
+ true, false, false, "", "", "", null,
null, null, false);
+
+ long room2 = roommanagement.addRoom(3, "private Conference
Room",
+ conference_Id, "", new Long(32), false,
null, false, false,
+ null, false, null, true, false, false, "", "",
"", null, null,
+ null, false);
+
+ roommanagement.addRoomToOrganisation(3, room2, 1);
+
+ roommanagement.addRoom(3, "public Audience Room", audience_Id,
"",
+ new Long(32), true, null, false, false,
null, false, null,
+ true, false, false, "", "", "", null,
null, null, false);
+
+ long room4 = roommanagement.addRoom(3, "private Audience
Room",
+ audience_Id, "", new Long(32), false,
null, false, false, null,
+ false, null, true, false, false, "", "",
"", null, null, null,
+ false);
+
+ roommanagement.addRoomToOrganisation(3, room4, 1);
+ }
}
public void loadInitUserAndOrganisation(String username, String
userpass,
=======================================
--- /tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Install.java
Fri Oct 21 07:54:09 2011
+++ /tags/1_8/src/app/org/openmeetings/servlet/outputhandler/Install.java
Fri Oct 21 11:35:16 2011
@@ -363,9 +363,7 @@
getImportInitvalues().loadInitUserAndOrganisation(username,
userpass, useremail,
orgname, timeZone, configdefaultLang);
- if ("1".equals(createDefaultRooms)) {
-
getImportInitvalues().loadDefaultRooms();
- }
+
getImportInitvalues().loadDefaultRooms("1".equals(createDefaultRooms));
// AppointMent Categories
getImportInitvalues().loadInitAppointmentCategories();
=======================================
---
/tags/1_8/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
Sat Sep 24 01:51:38 2011
+++
/tags/1_8/src/test/org/openmeetings/test/AbstractOpenmeetingsSpringTest.java
Fri Oct 21 11:35:16 2011
@@ -396,7 +396,7 @@
importInitvalues.loadInitUserAndOrganisation(username, userpass,
useremail, orgname, timeZone,
configdefaultLang);
- importInitvalues.loadDefaultRooms();
+ importInitvalues.loadDefaultRooms(true);
// AppointMent Categories
importInitvalues.loadInitAppointmentCategories();
=======================================
--- /tags/1_8/src/test/org/openmeetings/test/smoke/SmokeTest.java Sat Sep
24 01:51:38 2011
+++ /tags/1_8/src/test/org/openmeetings/test/smoke/SmokeTest.java Fri Oct
21 11:35:16 2011
@@ -128,7 +128,7 @@
importInitvalues.loadInitUserAndOrganisation(username,
userpass,
useremail, orgname, timeZone,
configdefaultLang);
- importInitvalues.loadDefaultRooms();
+ importInitvalues.loadDefaultRooms(true);
// AppointMent Categories
importInitvalues.loadInitAppointmentCategories();
--
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.
