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/12/07 03:48:49 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2533] tests
should be fixed
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 de54a57 [OPENMEETINGS-2533] tests should be fixed
de54a57 is described below
commit de54a5784abcfb993162461c8d3d48d7a9810a2a
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Mon Dec 7 10:48:36 2020 +0700
[OPENMEETINGS-2533] tests should be fixed
---
.../apache/openmeetings/web/admin/configurations/ConfigForm.java | 1 +
.../openmeetings/web/admin/configurations/ConfigsPanel.java | 1 -
.../java/org/apache/openmeetings/web/admin/labels/LabelsForm.java | 1 +
.../java/org/apache/openmeetings/web/admin/labels/LangPanel.java | 1 -
.../java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java | 8 ++++----
.../java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java | 1 -
.../java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java | 3 ++-
.../java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java | 3 +--
.../java/org/apache/openmeetings/web/admin/users/UserForm.java | 1 +
.../java/org/apache/openmeetings/web/admin/users/UsersPanel.java | 1 -
10 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
index 15de0d5..3563bc5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
@@ -159,6 +159,7 @@ public class ConfigForm extends AdminBaseForm<Configuration> {
booleanBox.add(valueB.setLabel(new ResourceModel("271"))).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
hotkeyBox.add(valueH.setLabel(new ResourceModel("271"))).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
add(stringBox, numberBox, booleanBox, hotkeyBox);
+ setNewRecordVisible(true);
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
index efdaa0e..f7f6de0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
@@ -92,7 +92,6 @@ public class ConfigsPanel extends AdminBasePanel {
add(navigator);
form = new ConfigForm("form", listContainer, new Configuration());
- form.setNewRecordVisible(true);
add(form);
super.onInitialize();
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
index 22ef297..7589eb2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
@@ -52,6 +52,7 @@ public class LabelsForm extends AdminBaseForm<StringLabel> {
super.onInitialize();
add(new RequiredTextField<String>("key").setLabel(new ResourceModel("165")));
add(new TextArea<String>("value"));
+ setNewRecordVisible(true);
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
index 3c36ece..0a5774e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
@@ -93,7 +93,6 @@ public class LangPanel extends AdminBasePanel {
language = new AbstractMap.SimpleEntry<>(1L, Locale.ENGLISH);
final LabelsForm form = new LabelsForm("form", this, new StringLabel(null, null));
- form.setNewRecordVisible(true);
add(form);
final SearchableDataView<StringLabel> dataView = new SearchableDataView<>(
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
index ab3063f..2a835a6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
@@ -51,7 +51,10 @@ public class LdapForm extends AdminBaseForm<LdapConfig> {
super(id, new CompoundPropertyModel<>(ldapConfig));
setOutputMarkupId(true);
this.listContainer = listContainer;
+ }
+ @Override
+ protected void onInitialize() {
add(new CheckBox("active"));
add(new DateLabel("inserted"));
add(new Label("insertedby.login"));
@@ -60,13 +63,10 @@ public class LdapForm extends AdminBaseForm<LdapConfig> {
add(new CheckBox("addDomainToUserName"));
add(new TextField<String>("domain"));
add(new TextArea<String>("comment"));
- }
-
- @Override
- protected void onInitialize() {
add(new RequiredTextField<String>("name").setLabel(new ResourceModel("165")));
add(new RequiredTextField<String>("configFileName").setLabel(new ResourceModel("1115")));
super.onInitialize();
+ setNewRecordVisible(true);
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
index 2b23200..f9e2c5e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
@@ -92,7 +92,6 @@ public class LdapsPanel extends AdminBasePanel {
add(navigator);
form = new LdapForm("form", listContainer, new LdapConfig());
- form.setNewRecordVisible(true);
add(form);
super.onInitialize();
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
index d4163e5..63a724a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
@@ -98,6 +98,7 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
@Override
protected void onInitialize() {
+ super.onInitialize();
add(new CheckBox("isEnabled"));
add(new RequiredTextField<String>("name").setLabel(new ResourceModel("165")));
add(new TextField<String>("iconUrl").setLabel(new ResourceModel("1575")));
@@ -129,7 +130,7 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
}
}).setOutputMarkupId(true));
add(attrsContainer.add(updateMapping()).setOutputMarkupId(true));
- super.onInitialize();
+ setNewRecordVisible(true);
}
private Component updateMapping() {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
index c988ad7..a14fe8b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
@@ -46,6 +46,7 @@ public class OAuthPanel extends AdminBasePanel {
@Override
protected void onInitialize() {
+ super.onInitialize();
SearchableDataView<OAuthServer> dataView = new SearchableDataView<>("oauthServersList",
new SearchableDataProvider<>(OAuth2Dao.class))
{
@@ -87,8 +88,6 @@ public class OAuthPanel extends AdminBasePanel {
add(navigator);
form = new OAuthForm("form", listContainer, new OAuthServer());
- form.setNewRecordVisible(true);
add(form);
- super.onInitialize();
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 39fc92a..7119198 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -174,6 +174,7 @@ public class UserForm extends AdminBaseForm<User> {
}));
mainContainer.add(new ComunityUserForm("comunity", getModel()));
remove(validationBehavior);
+ setNewRecordVisible(true);
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
index 729e914..cf261ef 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
@@ -111,7 +111,6 @@ public class UsersPanel extends AdminBasePanel {
.addButton(OmModalCloseButton.of("54"));
form = new UserForm("form", listContainer, getNewUserInstance(userDao.get(getUserId())), adminPass, warning);
- form.setNewRecordVisible(true);
add(form, warning);
super.onInitialize();
}