From d1c88028907b95b741804b94b049caad07cbea61 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Wed, 6 Aug 2025 16:21:39 +0100 Subject: [PATCH] cleanup and fixes --- app/core/src/main/resources/application.properties | 3 +-- .../proprietary/security/config/AccountWebController.java | 4 ---- .../security/database/repository/UserRepository.java | 4 +--- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/core/src/main/resources/application.properties b/app/core/src/main/resources/application.properties index 4bc07cfe8..bede26c02 100644 --- a/app/core/src/main/resources/application.properties +++ b/app/core/src/main/resources/application.properties @@ -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 diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java index 5df3a184a..0b3351e9b 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java @@ -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"); diff --git a/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java index e0a366b8d..d529bcab5 100644 --- a/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java +++ b/app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java @@ -38,9 +38,7 @@ public interface UserRepository extends JpaRepository { List findByTeam(Team team); - List 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 findUsersInOrganizationWithoutTeam(@Param("organizationId") Long organizationId); @Query("SELECT u FROM User u JOIN u.authorities a WHERE a.authority = :role")