This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 9a8a5f33189758b692de331064b4c2e64d5959cc
Merge: 31d14a2b0 732a4c576
Author: Mike Jumper <mjum...@apache.org>
AuthorDate: Fri Jun 21 15:29:36 2024 -0700
GUACAMOLE-1479: Merge change to styling of disabled users/groups.
.../guacamole/auth/jdbc/user/ModeledUser.java | 38 +++++------------
.../auth/jdbc/usergroup/ModeledUserGroup.java | 41 ++++++-------------
.../src/main/resources/translations/ca.json | 3 --
.../src/main/resources/translations/de.json | 5 +--
.../src/main/resources/translations/en.json | 3 --
.../src/main/resources/translations/es.json | 3 --
.../src/main/resources/translations/fr.json | 3 --
.../src/main/resources/translations/ja.json | 4 +-
.../src/main/resources/translations/ko.json | 3 --
.../src/main/resources/translations/pl.json | 3 --
.../src/main/resources/translations/pt.json | 3 --
.../src/main/resources/translations/ru.json | 3 --
.../src/main/resources/translations/zh.json | 3 --
.../guacamole/net/auth/AbstractUserGroup.java | 2 +-
.../apache/guacamole/net/auth/DelegatingUser.java | 10 +++++
.../guacamole/net/auth/DelegatingUserGroup.java | 10 +++++
.../org/apache/guacamole/net/auth/Disableable.java | 47 +++++++++++++---------
.../java/org/apache/guacamole/net/auth/User.java | 2 +-
.../org/apache/guacamole/net/auth/UserGroup.java | 2 +-
.../src/app/manage/templates/manageUser.html | 4 ++
.../src/app/manage/templates/manageUserGroup.html | 4 ++
.../src/app/manage/types/ManageableUser.js | 11 +++++
.../src/main/frontend/src/app/rest/types/User.js | 7 ++++
.../main/frontend/src/app/rest/types/UserGroup.js | 7 ++++
.../src/app/settings/styles/user-group-list.css | 12 ++++--
.../frontend/src/app/settings/styles/user-list.css | 8 +++-
.../app/settings/templates/settingsUserGroups.html | 2 +-
.../src/app/settings/templates/settingsUsers.html | 2 +-
.../src/main/frontend/src/translations/ca.json | 2 +
.../src/main/frontend/src/translations/de.json | 2 +
.../src/main/frontend/src/translations/en.json | 2 +
.../src/main/frontend/src/translations/es.json | 2 +
.../src/main/frontend/src/translations/fr.json | 2 +
.../src/main/frontend/src/translations/ja.json | 2 +
.../src/main/frontend/src/translations/ko.json | 2 +
.../src/main/frontend/src/translations/pl.json | 2 +
.../src/main/frontend/src/translations/pt.json | 2 +
.../src/main/frontend/src/translations/ru.json | 2 +
.../src/main/frontend/src/translations/zh.json | 6 ++-
.../org/apache/guacamole/rest/user/APIUser.java | 47 +++++++++++++++++++---
.../apache/guacamole/rest/user/APIUserWrapper.java | 10 +++++
.../guacamole/rest/user/UserObjectTranslator.java | 3 ++
.../guacamole/rest/usergroup/APIUserGroup.java | 27 +++++++++++++
.../rest/usergroup/APIUserGroupWrapper.java | 10 +++++
.../rest/usergroup/UserGroupObjectTranslator.java | 3 ++
45 files changed, 245 insertions(+), 126 deletions(-)
diff --cc
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
index 68e96a83b,a16880ba7..cc9f6802b
---
a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
+++
b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/resources/translations/en.json
@@@ -104,14 -103,8 +103,12 @@@
"USER_GROUP_ATTRIBUTES" : {
- "FIELD_HEADER_DISABLED" : "Disabled:",
-
"SECTION_HEADER_RESTRICTIONS" : "Group Restrictions"
- }
+ },
+
+ "CONNECTION_PARAMETERS": {
+ "DATABASE_PARAMETER_VALUE_TOO_LONG": "The value provided for
connection parameter {PARAMETER_NAME} exceeds the maximum allowed length of
{MAX_SIZE} {MAX_SIZE, plural, one{character} other{characters}}."
+ }
}
