Revision: 4580
Author: seba.wagner
Date: Thu Nov 17 06:58:06 2011
Log: Update issue 1574
add new config key "calendar.conference.rooms.default.size"
Fixes issue 1574
http://code.google.com/p/openmeetings/source/detail?r=4580
Modified:
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Sun Nov 6 05:52:37 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/data/calendar/management/AppointmentLogic.java
Thu Nov 17 06:58:06 2011
@@ -131,11 +131,14 @@
// TODO:Add this user as the default Moderator of the Room
+ Long numberOfParticipants = cfgManagement.getConfValue(
+ "calendar.conference.rooms.default.size", Long.class,
"50");
+
Long room_id = roommanagement.addRoom(3, // Userlevel
appointmentName, // name
roomType, // RoomType
"", // Comment
- new Long(8), // Number of participants
+ numberOfParticipants, // Number of participants
true, // public
null, // Organisations
true, // Appointment
@@ -446,25 +449,23 @@
+
inv.getInvitations_id());
continue;
}
-
+
TimeZone tZone = null;
-
+
if (mm.getOmTimeZone() != null) {
- tZone =
timezoneUtil.getTimezoneByOmTimeZoneId(mm.getOmTimeZone().getOmtimezoneId());
+ tZone =
timezoneUtil.getTimezoneByOmTimeZoneId(mm
+
.getOmTimeZone().getOmtimezoneId());
} else {
tZone = TimeZone.getDefault();
}
-
+
String subject =
generateSubject(labelid1158, ment, tZone);
String message =
generateMessage(labelid1158, ment,
language_id,
labelid1153, labelid1154, tZone);
-
invitationManagement.sendInvitationReminderLink(
- message,
- inv.getBaseUrl(),
- mm.getEmail(),
- subject,
+
invitationManagement.sendInvitationReminderLink(message,
+ inv.getBaseUrl(),
mm.getEmail(), subject,
inv.getHash());
inv.setUpdatetime(new Date());
@@ -473,15 +474,15 @@
}
}
}
-
+
private String generateSubject(Fieldlanguagesvalues labelid1158,
Appointment ment, TimeZone timezone) {
-
+
String message = labelid1158.getValue() + " "
+ ment.getAppointmentName();
- message += ' '
- +
CalendarPatterns.getDateWithTimeByMiliSecondsAndTimeZone(
+ message += ' ' + CalendarPatterns
+ .getDateWithTimeByMiliSecondsAndTimeZone(
ment.getAppointmentStarttime(),
timezone);
message += " - "
@@ -489,9 +490,8 @@
ment.getAppointmentEndtime(),
timezone);
return message;
-
- }
-
+
+ }
/**
* Generate a localized message including the time and date of the
meeting
@@ -507,7 +507,8 @@
*/
private String generateMessage(Fieldlanguagesvalues labelid1158,
Appointment ment, Long language_id,
- Fieldlanguagesvalues labelid1153, Fieldlanguagesvalues labelid1154,
TimeZone timezone) {
+ Fieldlanguagesvalues labelid1153, Fieldlanguagesvalues
labelid1154,
+ TimeZone timezone) {
String message = labelid1158.getValue() + " "
+ ment.getAppointmentName();
=======================================
---
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Wed Nov 16 06:36:51 2011
+++
/trunk/singlewebapp/src/app/org/openmeetings/app/installation/ImportInitvalues.java
Thu Nov 17 06:58:06 2011
@@ -481,6 +481,9 @@
cfgManagement.addConfByKey(3, "user.pass.minimum.length", "4",
null,
"Number of chars needed in a user login");
+
cfgManagement.addConfByKey(3, "calendar.conference.rooms.default.size", "50",
null,
+ "Default number of participants conference room
created via calendar");
+
}
--
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.
