Author: solomax
Date: Mon Sep 21 09:52:34 2015
New Revision: 1704246
URL: http://svn.apache.org/viewvc?rev=1704246&view=rev
Log:
[OPENMEETINGS-1249] tzid is taken into account while checking invitation; style
issue is fixed
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java?rev=1704246&r1=1704245&r2=1704246&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/data/conference/InvitationManager.java
Mon Sep 21 09:52:34 2015
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.data.conference;
+import static org.apache.openmeetings.util.CalendarHelper.getZoneId;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import java.security.NoSuchAlgorithmException;
@@ -55,6 +56,7 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.threeten.bp.LocalDateTime;
+import org.threeten.bp.ZonedDateTime;
/**
*
@@ -206,7 +208,7 @@ public class InvitationManager implement
}
break;
case Period:
- LocalDateTime now =
LocalDateTime.now();
+ LocalDateTime now =
ZonedDateTime.now(getZoneId(i.getInvitee().getTimeZoneId())).toLocalDateTime();
LocalDateTime from =
CalendarHelper.getDateTime(i.getValidFrom(), i.getInvitee().getTimeZoneId());
LocalDateTime to =
CalendarHelper.getDateTime(i.getValidTo(), i.getInvitee().getTimeZoneId());
if (now.isAfter(from) &&
now.isBefore(to)) {
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html?rev=1704246&r1=1704245&r2=1704246&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
Mon Sep 21 09:52:34 2015
@@ -90,8 +90,8 @@
</button>
</td>
<td>
- <div
style="display: inline=block; width: 300px;"><wicket:message key="570"
/></div><span wicket:id="start"></span><br/>
- <div
style="display: inline=block; width: 300px;"><wicket:message key="571"
/></div><span wicket:id="end"></span>
+ <div
style="display: inline-block; width: 300px;"><wicket:message key="570"
/></div><span wicket:id="start"></span><br/>
+ <div
style="display: inline-block; width: 300px;"><wicket:message key="571"
/></div><span wicket:id="end"></span>
</td>
</tr>
</table>
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=1704246&r1=1704245&r2=1704246&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
Mon Sep 21 09:52:34 2015
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.service.room;
+import static org.apache.openmeetings.util.CalendarHelper.getZoneId;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
@@ -59,6 +60,7 @@ import org.red5.logging.Red5LoggerFactor
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.threeten.bp.LocalDateTime;
+import org.threeten.bp.ZonedDateTime;
/**
*
@@ -210,7 +212,7 @@ public class InvitationManager implement
}
break;
case Period:
- LocalDateTime now =
LocalDateTime.now();
+ LocalDateTime now =
ZonedDateTime.now(getZoneId(i.getInvitee().getTimeZoneId())).toLocalDateTime();
LocalDateTime from =
CalendarHelper.getDateTime(i.getValidFrom(), i.getInvitee().getTimeZoneId());
LocalDateTime to =
CalendarHelper.getDateTime(i.getValidTo(), i.getInvitee().getTimeZoneId());
if (now.isAfter(from) &&
now.isBefore(to)) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html?rev=1704246&r1=1704245&r2=1704246&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
Mon Sep 21 09:52:34 2015
@@ -90,8 +90,8 @@
</button>
</td>
<td>
- <div
style="display: inline=block; width: 300px;"><wicket:message key="570"
/></div><span wicket:id="start"></span><br/>
- <div
style="display: inline=block; width: 300px;"><wicket:message key="571"
/></div><span wicket:id="end"></span>
+ <div
style="display: inline-block; width: 300px;"><wicket:message key="570"
/></div><span wicket:id="start"></span><br/>
+ <div
style="display: inline-block; width: 300px;"><wicket:message key="571"
/></div><span wicket:id="end"></span>
</td>
</tr>
</table>
