[openmeetings] branch master updated: [OPENMEETINGS-1900] user picture is fixed, logout is fixed

[so...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new b60ada3  [OPENMEETINGS-1900] user picture is fixed, logout is fixed
b60ada3 is described below

commit b60ada388a5e39c79b596683eb17e4c3e3af2c5b
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Jul 16 16:54:21 2018 +0700

    [OPENMEETINGS-1900] user picture is fixed, logout is fixed
---
 .../src/main/java/org/apache/openmeetings/web/pages/MainPage.java     | 4 ++--
 .../org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java     | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
index db1cada..22f75f4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/MainPage.java
@@ -101,8 +101,8 @@ public class MainPage extends BaseInitedPage {
 		if (_f != null) {
 			uf = _f;
 		}
-		if (loaded && uf != null) {
-			main.updateContents(uf, target, false);
+		if (loaded && _f != null) {
+			main.updateContents(_f, target, false);
 		}
 	}
 
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
index 9bcb491..eda4024 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
@@ -23,6 +23,7 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_TITLE;
 import static org.apache.openmeetings.web.app.WebSession.getUserId;
 import static org.apache.openmeetings.web.pages.BasePage.ALIGN_LEFT;
 import static org.apache.openmeetings.web.pages.BasePage.ALIGN_RIGHT;
+import static org.apache.openmeetings.web.util.ProfileImageResourceReference.getUrl;
 
 import org.apache.openmeetings.db.entity.basic.Client;
 import org.apache.openmeetings.db.entity.room.Room.Right;
@@ -38,6 +39,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.util.string.Strings;
 
 public class RoomClientPanel extends Panel {
@@ -49,7 +51,7 @@ public class RoomClientPanel extends Panel {
 		Client c = item.getModelObject();
 		final String uid = c.getUid();
 		item.setMarkupId(String.format("user%s", c.getUid()));
-		item.add(AttributeModifier.append("style", String.format("background-image: url(profile/%s);", c.getUserId())));
+		item.add(AttributeModifier.append("style", String.format("background-image: url(%s);", getUrl(RequestCycle.get(), c.getUser()))));
 		item.add(AttributeModifier.append("data-userid", c.getUserId()));
 		add(new RefreshIcon("refresh", uid));
 		final String name = getName(c);