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 2022/05/26 04:10:13 UTC
[openmeetings] branch master updated (3ab660fab -> 1fb71af36)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
from 3ab660fab [OPENMEETINGS-2732] postgresql
new 2b088f435 [OPENMEETINGS-2520] sonar should be more happy
new 1fb71af36 [OPENMEETINGS-2739] generate URL is disabled if non-contact is selected
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/openmeetings/web/common/InvitationForm.java | 7 ++++++-
.../src/test/java/org/apache/openmeetings/cli/TestAdmin.java | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
[openmeetings] 01/02: [OPENMEETINGS-2520] sonar should be more happy
Posted by 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
commit 2b088f4357b03fa09c4ed64651789183e7f3c343
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu May 26 10:57:26 2022 +0700
[OPENMEETINGS-2520] sonar should be more happy
---
.../src/test/java/org/apache/openmeetings/cli/TestAdmin.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
index 432f235cf..c7ddeefe4 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
@@ -141,5 +141,6 @@ class TestAdmin {
void testFilesNoDb() throws Exception {
//clean-up report
new Admin().process("-f");
+ assertTrue(true, "No exception is thrown");
}
}
[openmeetings] 02/02: [OPENMEETINGS-2739] generate URL is disabled if non-contact is selected
Posted by 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
commit 1fb71af36b660b12031628bf237c04940ebc5cd0
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu May 26 11:10:03 2022 +0700
[OPENMEETINGS-2739] generate URL is disabled if non-contact is selected
---
.../java/org/apache/openmeetings/web/common/InvitationForm.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
index 39365a6e0..d6d16f616 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
@@ -150,9 +150,14 @@ public abstract class InvitationForm extends Form<Invitation> {
protected void updateButtons(AjaxRequestTarget target) {
Collection<User> recpnts = recipients.getModelObject();
+ boolean generateEnabled = false;
+ if (recpnts.size() == 1) {
+ User u = recpnts.iterator().next();
+ generateEnabled = getUserId().equals(u.getId()) || User.Type.CONTACT == u.getType();
+ }
target.add(
dialog.getSend().setEnabled(!recpnts.isEmpty())
- , dialog.getGenerate().setEnabled(recpnts.size() == 1)
+ , dialog.getGenerate().setEnabled(generateEnabled)
);
}