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 2020/09/17 15:45:22 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2429] proper fix
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 6bbce4d [OPENMEETINGS-2429] proper fix
6bbce4d is described below
commit 6bbce4d2d1739a354215a3d41b2c7ac230155846
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Sep 17 22:45:06 2020 +0700
[OPENMEETINGS-2429] proper fix
---
.../apache/openmeetings/db/dao/room/RoomDao.java | 11 +++---
.../web/user/dashboard/MyRoomsWidget.java | 15 ++++++--
.../openmeetings/web/user/dashboard/OmWidget.java | 41 ----------------------
.../web/user/dashboard/RecentRoomsWidget.java | 15 ++++++--
.../openmeetings/web/user/dashboard/RssWidget.java | 15 ++++++--
.../web/user/dashboard/StartWidget.java | 15 ++++++--
.../web/user/dashboard/WelcomeWidget.java | 15 ++++++--
.../web/user/dashboard/admin/AdminWidget.java | 16 +++++++--
.../src/main/webapp/WEB-INF/classes/hazelcast.xml | 2 +-
9 files changed, 85 insertions(+), 60 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
index 3d2f039..02b84f5 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
@@ -232,11 +232,10 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> {
public Room getUserRoom(Long ownerId, Room.Type type, String name) {
log.debug("getUserRoom : {} || {}", ownerId, type);
- Room room = null;
- List<Room> ll = em.createNamedQuery("getRoomByOwnerAndTypeId", Room.class).setParameter("ownerId", ownerId).setParameter("type", type).getResultList();
- if (!ll.isEmpty()) {
- room = ll.get(0);
- }
+ Room room = single(em.createNamedQuery("getRoomByOwnerAndTypeId", Room.class)
+ .setParameter("ownerId", ownerId)
+ .setParameter("type", type)
+ .getResultList());
if (room == null) {
log.debug("Could not find room {} || {}", ownerId, type);
@@ -257,6 +256,8 @@ public class RoomDao implements IGroupAdminDataProviderDao<Room> {
}
return null;
} else {
+ room.setName(name);
+ room = update(room, ownerId);
return room;
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
index cb50887..6828f96 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
@@ -18,20 +18,31 @@
*/
package org.apache.openmeetings.web.user.dashboard;
+import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class MyRoomsWidget extends OmWidget {
+public class MyRoomsWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
public static final String WIDGET_ID_MY_ROOMS = "MyRoomsWidget";
public MyRoomsWidget() {
- super(WIDGET_ID_MY_ROOMS, "781");
location = new WidgetLocation(0, 1);
}
@Override
+ public String getId() {
+ return WIDGET_ID_MY_ROOMS;
+ }
+
+ @Override
+ public String getTitle() {
+ return Application.getString("781");
+ }
+
+ @Override
public WidgetView createView(String viewId) {
return new MyRoomsWidgetView(viewId, new Model<>(this));
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidget.java
deleted file mode 100644
index 4d5b963..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmWidget.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.user.dashboard;
-
-import org.apache.openmeetings.web.app.Application;
-import org.wicketstuff.dashboard.AbstractWidget;
-
-public abstract class OmWidget extends AbstractWidget {
- private static final long serialVersionUID = 1L;
- private final String label;
-
- public OmWidget(String id, String label) {
- this.id = id;
- this.label = label;
- }
-
- public String getLabel() {
- return label;
- }
-
- @Override
- public String getTitle() {
- return Application.getString(label);
- }
-}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java
index 18a9363..bc4f51f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java
@@ -18,20 +18,31 @@
*/
package org.apache.openmeetings.web.user.dashboard;
+import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class RecentRoomsWidget extends OmWidget {
+public class RecentRoomsWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
public static final String WIDGET_ID_RECENT_ROOMS = "RecentRoomsWidget";
public RecentRoomsWidget() {
- super(WIDGET_ID_RECENT_ROOMS, "widget.recent.title");
location = new WidgetLocation(1, 1);
}
@Override
+ public String getId() {
+ return WIDGET_ID_RECENT_ROOMS;
+ }
+
+ @Override
+ public String getTitle() {
+ return Application.getString("widget.recent.title");
+ }
+
+ @Override
public WidgetView createView(String viewId) {
return new RecentRoomsWidgetView(viewId, new Model<>(this));
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
index 4afc86b..a532de3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
@@ -18,20 +18,31 @@
*/
package org.apache.openmeetings.web.user.dashboard;
+import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class RssWidget extends OmWidget {
+public class RssWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
public static final String WIDGET_ID_RSS = "RssWidget";
public RssWidget() {
- super(WIDGET_ID_RSS, "277");
location = new WidgetLocation(1, 1);
}
@Override
+ public String getId() {
+ return WIDGET_ID_RSS;
+ }
+
+ @Override
+ public String getTitle() {
+ return Application.getString("277");
+ }
+
+ @Override
public WidgetView createView(String viewId) {
return new RssWidgetView(viewId, new Model<>(this));
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
index 9e31a3e..9bc4454 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
@@ -18,19 +18,30 @@
*/
package org.apache.openmeetings.web.user.dashboard;
+import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class StartWidget extends OmWidget {
+public class StartWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
public StartWidget() {
- super("StartWidget", "widget.start.title");
location = new WidgetLocation(1, 0);
}
@Override
+ public String getId() {
+ return "StartWidget";
+ }
+
+ @Override
+ public String getTitle() {
+ return Application.getString("widget.start.title");
+ }
+
+ @Override
public WidgetView createView(String viewId) {
return new StartWidgetView(viewId, new Model<>(this));
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
index 8151099..35aa445 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
@@ -18,19 +18,30 @@
*/
package org.apache.openmeetings.web.user.dashboard;
+import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class WelcomeWidget extends OmWidget {
+public class WelcomeWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
public WelcomeWidget() {
- super("WelcomeWidget", "1546");
location = new WidgetLocation(0, 0);
}
@Override
+ public String getId() {
+ return "WelcomeWidget";
+ }
+
+ @Override
+ public String getTitle() {
+ return Application.getString("1546");
+ }
+
+ @Override
public WidgetView createView(String viewId) {
return new WelcomeWidgetView(viewId, new Model<>(this));
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
index 3bc2a2e..9dfa759 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
@@ -18,21 +18,31 @@
*/
package org.apache.openmeetings.web.user.dashboard.admin;
-import org.apache.openmeetings.web.user.dashboard.OmWidget;
+import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
+import org.wicketstuff.dashboard.AbstractWidget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
-public class AdminWidget extends OmWidget {
+public class AdminWidget extends AbstractWidget {
private static final long serialVersionUID = 1L;
public static final String WIDGET_ID_ADMIN = "AdminWidget";
public AdminWidget() {
- super(WIDGET_ID_ADMIN, "dashboard.widget.admin.title");
location = new WidgetLocation(0, 2);
}
@Override
+ public String getId() {
+ return WIDGET_ID_ADMIN;
+ }
+
+ @Override
+ public String getTitle() {
+ return Application.getString("dashboard.widget.admin.title");
+ }
+
+ @Override
public WidgetView createView(String viewId) {
return new AdminWidgetView(viewId, new Model<>(this));
}
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
index cce3280..a6739ec 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/hazelcast.xml
@@ -21,7 +21,7 @@
<hazelcast
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://www.hazelcast.com/schema/config"
- xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-4.1.xsd"
+ xsi:schemaLocation="http://www.hazelcast.com/schema/config http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd"
>
<map name="ONLINE_USERS_KEY">
<near-cache>