You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/10/23 18:14:12 UTC
svn commit: r1633865 - in /openmeetings:
branches/3.0.x/src/main/java/org/apache/openmeetings/util/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/
trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room...
Author: solomax
Date: Thu Oct 23 16:14:12 2014
New Revision: 1633865
URL: http://svn.apache.org/r1633865
Log:
Invitation was not sent in case CalendarService#saveAppointment was used
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/util/LinkHelper.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/util/LinkHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/util/LinkHelper.java?rev=1633865&r1=1633864&r2=1633865&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/util/LinkHelper.java (original)
+++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/util/LinkHelper.java Thu Oct 23 16:14:12 2014
@@ -38,7 +38,7 @@ public class LinkHelper {
link += "&language=" + i.getInvitee().getLanguage_id().toString();
}
} else {
- link = getRoomUrlFragment(i.getRoom().getRooms_id()).getLink();
+ link = getRoomUrlFragment(i.getRoom().getRooms_id()).getLink(baseUrl);
}
}
return link;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java?rev=1633865&r1=1633864&r2=1633865&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/util/OmUrlFragment.java Thu Oct 23 16:14:12 2014
@@ -294,6 +294,10 @@ public class OmUrlFragment implements Se
}
public String getLink() {
- return getBean(ConfigurationDao.class).getBaseUrl() + "#" + getArea().name() + "/" + getType();
+ return getLink(getBean(ConfigurationDao.class).getBaseUrl());
+ }
+
+ public String getLink(String baseUrl) {
+ return baseUrl + "#" + getArea().name() + "/" + getType();
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1633865&r1=1633864&r2=1633865&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java Thu Oct 23 16:14:12 2014
@@ -19,6 +19,7 @@
package org.apache.openmeetings.service.room;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
import java.security.NoSuchAlgorithmException;
import java.util.Calendar;
@@ -226,7 +227,7 @@ public class InvitationManager implement
}
public void sendInvitionLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception {
- String invitation_link = ((IApplication)Application.get()).getOmInvitationLink(configDao.getBaseUrl(), i); //TODO check for exceptions
+ String invitation_link = ((IApplication)Application.get(wicketApplicationName)).getOmInvitationLink(configDao.getBaseUrl(), i); //TODO check for exceptions
User owner = i.getInvitedBy();
String invitorName = owner.getFirstname() + " " + owner.getLastname();
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java?rev=1633865&r1=1633864&r2=1633865&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/UserWebService.java Thu Oct 23 16:14:12 2014
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.ut
import java.util.ArrayList;
import java.util.Date;
-import javax.jws.WebMethod;
import javax.jws.WebService;
import javax.ws.rs.GET;
import javax.ws.rs.Path;