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 2021/06/17 03:08:21 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2625] default
group is marked with asterisk
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 8146359 [OPENMEETINGS-2625] default group is marked with asterisk
8146359 is described below
commit 81463597920ec24b64e52b4fc5796955a6726ed2
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jun 17 10:08:03 2021 +0700
[OPENMEETINGS-2625] default group is marked with asterisk
---
.../org/apache/openmeetings/web/admin/groups/GroupsPanel.html | 9 +++++++--
.../org/apache/openmeetings/web/admin/groups/GroupsPanel.java | 2 ++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
index 5798de3..12a5218 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
@@ -32,8 +32,13 @@
</thead>
<tbody wicket:id="listContainer">
<tr wicket:id="groupList">
- <td class="col-1"><div class="col-wrapper"><span wicket:id="id"></span></div></td>
- <td class="col-11"><div class="col-wrapper"><span wicket:id="name"></span></div></td>
+ <td class="col-1"><div class="col-wrapper">
+ <span wicket:id="id"></span>
+ </div></td>
+ <td class="col-11"><div class="col-wrapper">
+ <i wicket:id="default" class="fas fa-asterisk m-1 text-primary"></i>
+ <span wicket:id="name"></span>
+ </div></td>
</tr>
</tbody>
</table>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
index 56ed420..a72f18f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.admin.groups;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_CLASS;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultGroup;
import static org.apache.openmeetings.web.app.WebSession.getRights;
import java.util.Iterator;
@@ -70,6 +71,7 @@ public class GroupsPanel extends AdminBasePanel {
protected void populateItem(Item<Group> item) {
final Group g = item.getModelObject();
item.add(new Label("id"));
+ item.add(new WebMarkupContainer("default").setVisible(g.getId().equals(getDefaultGroup())));
Label name = new Label("name");
if (g.isExternal()) {
name.add(AttributeModifier.append("class", "external"));