Author: solomax
Date: Mon Jun 2 10:38:16 2014
New Revision: 1599161
URL: http://svn.apache.org/r1599161
Log:
[OPENMEETINGS-1013] profile pictures in room details are displayed as expected
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html?rev=1599161&r1=1599160&r2=1599161&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
Mon Jun 2 10:38:16 2014
@@ -58,7 +58,7 @@
<table class="adminListTable">
<tbody
wicket:id="clientsContainer">
<tr wicket:id="clients">
- <td
style="width: 50px; height:50px" ><div style="width: 50px; height:50px"><img
wicket:id="clientImage" width="50" height="50" /></div></td>
+ <td
style="width: 50px;"><img wicket:id="clientImage" style="min-width: 50px;
height:50px" /></td>
<td
style="width: 350px; height:50px">
<div style="width: 350px; height:50px"><span
wicket:id="clientLogin"></span> <wicket:ommessage key="408"/> <span
wicket:id="from"></span></div>
</td>
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java?rev=1599161&r1=1599160&r2=1599161&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
Mon Jun 2 10:38:16 2014
@@ -118,7 +118,10 @@ public class RoomsPanel extends UserPane
@Override
protected byte[] getData(Attributes
attributes) {
- String uri =
Application.getBean(UserDao.class).get(userId).getPictureuri();
+ String uri = null;
+ if (userId != null) {
+ uri =
Application.getBean(UserDao.class).get(userId > 0 ? userId :
-userId).getPictureuri();
+ }
File img =
OmFileHelper.getUserProfilePicture(userId, uri);
try {
return
IOUtils.toByteArray(new FileInputStream(img));
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html?rev=1599161&r1=1599160&r2=1599161&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
Mon Jun 2 10:38:16 2014
@@ -58,7 +58,7 @@
<table class="adminListTable">
<tbody
wicket:id="clientsContainer">
<tr wicket:id="clients">
- <td
style="width: 50px; height:50px" ><div style="width: 50px; height:50px"><img
wicket:id="clientImage" width="50" height="50" /></div></td>
+ <td
style="width: 50px;"><img wicket:id="clientImage" style="min-width: 50px;
height:50px" /></td>
<td
style="width: 350px; height:50px">
<div style="width: 350px; height:50px"><span
wicket:id="clientLogin"></span> <wicket:ommessage key="408"/> <span
wicket:id="from"></span></div>
</td>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java?rev=1599161&r1=1599160&r2=1599161&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
Mon Jun 2 10:38:16 2014
@@ -118,7 +118,10 @@ public class RoomsPanel extends UserPane
@Override
protected byte[] getData(Attributes
attributes) {
- String uri =
Application.getBean(UserDao.class).get(userId).getPictureuri();
+ String uri = null;
+ if (userId != null) {
+ uri =
Application.getBean(UserDao.class).get(userId > 0 ? userId :
-userId).getPictureuri();
+ }
File img =
OmFileHelper.getUserProfilePicture(userId, uri);
try {
return
IOUtils.toByteArray(new FileInputStream(img));
