mirror of
https://github.com/Frooodle/Stirling-PDF.git
synced 2025-08-16 13:47:28 +02:00
cleanup and fixes
This commit is contained in:
parent
31c397d016
commit
d1c8802890
@ -1,9 +1,8 @@
|
||||
multipart.enabled=true
|
||||
logging.level.org.springframework=WARN
|
||||
logging.level.org.hibernate=WARN
|
||||
#ogging.level.root=DEBUG
|
||||
#logging.level.root=DEBUG
|
||||
logging.level.org.eclipse.jetty=WARN
|
||||
#logging.level.com.zaxxer.hikari=WARN
|
||||
#logging.level.org.springframework.security.saml2=TRACE
|
||||
#logging.level.org.springframework.security=DEBUG
|
||||
#logging.level.org.opensaml=DEBUG
|
||||
|
@ -443,10 +443,6 @@ public class AccountWebController {
|
||||
model.addAttribute("messageType", messageType);
|
||||
model.addAttribute("role", user.get().getRolesAsString());
|
||||
model.addAttribute("isSystemAdmin", user.get().isSystemAdmin());
|
||||
System.out.println("user.get().getRolesAsString()" + user.get().getRolesAsString());
|
||||
|
||||
System.out.println(
|
||||
"isSystemAdmin\", user.get().isSystemAdmin()" + user.get().isSystemAdmin());
|
||||
model.addAttribute("settings", settingsJson);
|
||||
model.addAttribute("changeCredsFlag", user.get().isFirstLogin());
|
||||
model.addAttribute("currentPage", "account");
|
||||
|
@ -38,9 +38,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
|
||||
|
||||
List<User> findByTeam(Team team);
|
||||
|
||||
List<User> findAllByTeam(Team team);
|
||||
|
||||
@Query("SELECT u FROM User u WHERE u.team IS NULL")
|
||||
@Query("SELECT u FROM User u WHERE u.team IS NULL AND u.organization.id = :organizationId")
|
||||
List<User> findUsersInOrganizationWithoutTeam(@Param("organizationId") Long organizationId);
|
||||
|
||||
@Query("SELECT u FROM User u JOIN u.authorities a WHERE a.authority = :role")
|
||||
|
Loading…
Reference in New Issue
Block a user