Skip to content

Commit 40ddc8b

Browse files
committed
BSR
1 parent de047e2 commit 40ddc8b

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

client/src/tabs/Tokens.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ export const Tokens = () => {
111111
name={I18n.t("tokens.secret")}
112112
toolTip={I18n.t("tokens.secretTooltip")}
113113
disabled={true}
114+
customClassName={"token-secret"}
114115
copyClipBoard={true}/>
115116

116117
<InputField value={description}

client/src/tabs/Tokens.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ div.mod-tokens {
114114
}
115115
}
116116

117+
.input-field.token-secret input {
118+
font-weight: 600;
119+
}
120+
117121
.description {
118122
margin-bottom: 25px;
119123
}

server/src/main/java/invite/repository/RoleRepository.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public interface RoleRepository extends JpaRepository<Role, Long>, QueryRewriter
2121
nativeQuery = true)
2222
List<Role> search(String keyWord, int limit);
2323

24-
2524
@Query(value = """
2625
SELECT r.id as id, r.name as name, r.description as description,
2726
(SELECT COUNT(*) FROM user_roles ur WHERE ur.role_id=r.id) as userRoleCount
@@ -77,7 +76,7 @@ SELECT COUNT(r.id) FROM roles r WHERE r.organization_guid = ?1
7776
default String rewrite(String query, Sort sort) {
7877
Sort.Order userRoleCount = sort.getOrderFor("userRoleCount");
7978
if (userRoleCount != null) {
80-
//Spring can not sort on aggregated columns
79+
//Spring cannot sort on aggregated columns
8180
return query.replace(" order by r.userRoleCount", " order by userRoleCount");
8281
}
8382
return query;

server/src/main/java/invite/security/UserPermissions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ public static void assertRoleAccess(User user, Role accessRole, Authority author
113113
.orElseThrow(UserRestrictionException::new);
114114
}
115115

116-
//Does one off the userRoles has Authority.MANAGE and has the same application as the role
116+
//Does one of the userRoles has Authority.MANAGE and has the same application as the role
117117
private static boolean mayInviteByApplication(Set<UserRole> userRoles, Authority intendedAuthority, Role role) {
118118
return userRoles.stream()
119119
.anyMatch(userRole -> userRole.hasAccessToApplication(role) &&
120120
userRole.getAuthority().hasEqualOrHigherRights(Authority.MANAGER) &&
121121
userRole.getAuthority().hasEqualOrHigherRights(intendedAuthority));
122122
}
123123

124-
//Does one the userRoles has at least the Authority higher than the intendedAuthority and NOT Guest
124+
//Does one of the userRoles have at least the Authority higher than the intendedAuthority and NOT Guest
125125
private static boolean mayInviteByAuthority(Set<UserRole> userRoles, Authority intendedAuthority, Role role) {
126126
return userRoles.stream()
127127
.anyMatch(userRole -> userRole.getAuthority().hasHigherRights(intendedAuthority) &&

0 commit comments

Comments
 (0)