Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2025-08-20 13:47:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup and fixes

Browse Source
This commit is contained in:
Anthony Stirling 2025-08-06 16:21:39 +01:00
parent 31c397d016
commit d1c8802890
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/core/src/main/resources/application.properties
View File

@ -1,9 +1,8 @@
multipart.enabled=true multipart.enabled=true
logging.level.org.springframework=WARN logging.level.org.springframework=WARN
logging.level.org.hibernate=WARN logging.level.org.hibernate=WARN
#ogging.level.root=DEBUG #logging.level.root=DEBUG
logging.level.org.eclipse.jetty=WARN logging.level.org.eclipse.jetty=WARN
#logging.level.com.zaxxer.hikari=WARN
#logging.level.org.springframework.security.saml2=TRACE #logging.level.org.springframework.security.saml2=TRACE
#logging.level.org.springframework.security=DEBUG #logging.level.org.springframework.security=DEBUG
#logging.level.org.opensaml=DEBUG #logging.level.org.opensaml=DEBUG

4
app/proprietary/src/main/java/stirling/software/proprietary/security/config/AccountWebController.java
View File

@ -443,10 +443,6 @@ public class AccountWebController {
model.addAttribute("messageType", messageType); model.addAttribute("messageType", messageType);
model.addAttribute("role", user.get().getRolesAsString()); model.addAttribute("role", user.get().getRolesAsString());
model.addAttribute("isSystemAdmin", user.get().isSystemAdmin()); 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("settings", settingsJson);
model.addAttribute("changeCredsFlag", user.get().isFirstLogin()); model.addAttribute("changeCredsFlag", user.get().isFirstLogin());
model.addAttribute("currentPage", "account"); model.addAttribute("currentPage", "account");

4
app/proprietary/src/main/java/stirling/software/proprietary/security/database/repository/UserRepository.java
View File

@ -38,9 +38,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
List<User> findByTeam(Team team); List<User> findByTeam(Team team);
List<User> findAllByTeam(Team team); @Query("SELECT u FROM User u WHERE u.team IS NULL AND u.organization.id = :organizationId")
@Query("SELECT u FROM User u WHERE u.team IS NULL")
List<User> findUsersInOrganizationWithoutTeam(@Param("organizationId") Long organizationId); List<User> findUsersInOrganizationWithoutTeam(@Param("organizationId") Long organizationId);
@Query("SELECT u FROM User u JOIN u.authorities a WHERE a.authority = :role") @Query("SELECT u FROM User u JOIN u.authorities a WHERE a.authority = :role")