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/09 08:42:31 UTC
svn commit: r1630298 [2/2] - in /openmeetings:
branches/3.0.x/src/db/java/org/apache/openmeetings/db/dao/calendar/
branches/3.0.x/src/main/java/org/apache/openmeetings/remote/
branches/3.0.x/src/main/webapp/languages/
trunk/singlewebapp/openmeetings-db...
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/slovak.xml Thu Oct 9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
<string id="1598" name="security">
<value>Security</value>
</string>
+ <string id="1599" name="security">
+ <value>Access denied. You have no rights to enter this room.</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/spanish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/spanish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/spanish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/spanish.xml Thu Oct 9 06:42:29 2014
@@ -4825,4 +4825,7 @@ see http://openmeetings.apache.org/Langu
<string id="1598" name="security">
<value>Security</value>
</string>
+ <string id="1599" name="security">
+ <value>Access denied. You have no rights to enter this room.</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/swedish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/swedish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/swedish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/swedish.xml Thu Oct 9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
<string id="1598" name="security">
<value>Security</value>
</string>
+ <string id="1599" name="security">
+ <value>Access denied. You have no rights to enter this room.</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/thai.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/thai.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/thai.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/thai.xml Thu Oct 9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
<string id="1598" name="security">
<value>Security</value>
</string>
+ <string id="1599" name="security">
+ <value>Access denied. You have no rights to enter this room.</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/turkish.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/turkish.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/turkish.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/turkish.xml Thu Oct 9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
<string id="1598" name="security">
<value>Security</value>
</string>
+ <string id="1599" name="security">
+ <value>Access denied. You have no rights to enter this room.</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ukrainian.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ukrainian.xml?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ukrainian.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/ukrainian.xml Thu Oct 9 06:42:29 2014
@@ -4820,4 +4820,7 @@ see http://openmeetings.apache.org/Langu
<string id="1598" name="security">
<value>Security</value>
</string>
+ <string id="1599" name="security">
+ <value>Access denied. You have no rights to enter this room.</value>
+ </string>
</language>
Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java?rev=1630298&r1=1630297&r2=1630298&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java Thu Oct 9 06:42:29 2014
@@ -510,13 +510,10 @@ public class CalendarWebService {
Appointment appointment = new Appointment();
- Appointment appStored = appointmentDao.getAppointmentByRoomId(
- users_id, room_id);
+ Appointment appStored = appointmentDao.getAppointmentByOwnerRoom(users_id, room_id);
- appointment.setStart(appStored
- .getStart());
- appointment.setEnd(appStored
- .getEnd());
+ appointment.setStart(appStored.getStart());
+ appointment.setEnd(appStored.getEnd());
return appointment;
}