Author: solomax
Date: Mon Aug 12 06:05:29 2013
New Revision: 1513044
URL: http://svn.apache.org/r1513044
Log:
[OPENMEETINGS-746] user TZ was displayed improperly
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1513044&r1=1513043&r2=1513044&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
Mon Aug 12 06:05:29 2013
@@ -129,7 +129,7 @@ public class UserSearchPanel extends Use
User u = item.getModelObject();
final long userId = u.getUser_id();
item.add(new Label("name", getName(u)));
- item.add(new Label("tz",
getBean(TimezoneUtil.class).getTimezoneByUser(u)));
+ item.add(new Label("tz",
getBean(TimezoneUtil.class).getTimezoneByUser(u).getID()));
item.add(new Label("offer", u.getUserOffers()));
item.add(new Label("search",
u.getUserSearchs()));
item.add(new WebMarkupContainer("view").add(new
AjaxEventBehavior("onclick") {