Ehrenamt/ff-admin-server
2
0
Fork 0
Code Issues 19 Pull requests Projects Releases 34 Packages Wiki Activity Actions

Merge pull request 'patches v1.7.3' (#120) from develop into main

Browse source 
Reviewed-on: #120
This commit is contained in:
Julian Krauser 2025-07-14 12:29:06 +00:00
commit d74286a2a3
16 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/service/club/calendarService.ts
View file

@ -13,7 +13,7 @@ export default abstract class CalendarService {
.getRepository(calendar)
.createQueryBuilder("calendar")
.leftJoinAndSelect("calendar.type", "type")
.orderBy("starttime", "ASC")
.orderBy("calendar.starttime", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/club/newsletter/newsletterService.ts
View file

@ -12,7 +12,7 @@ export default abstract class NewsletterService {
return await dataSource
.getRepository(newsletter)
.createQueryBuilder("newsletter")
.orderBy("createdAt", "DESC")
.orderBy("newsletter.createdAt", "DESC")
.offset(offset)
.limit(count)
.getManyAndCount()

2
src/service/club/protocol/protocolService.ts
View file

@ -14,7 +14,7 @@ export default abstract class ProtocolService {
.createQueryBuilder("protocol")
.offset(offset)
.limit(count)
.orderBy("date", "DESC")
.orderBy("protocol.date", "DESC")
.getManyAndCount()
.then((res) => {
return res;

2
src/service/configuration/awardService.ts
View file

@ -13,7 +13,7 @@ export default abstract class AwardService {
return await dataSource
.getRepository(award)
.createQueryBuilder("award")
.orderBy("award", "ASC")
.orderBy("award.award", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/configuration/calendarTypeService.ts
View file

@ -12,7 +12,7 @@ export default abstract class CalendarTypeService {
return await dataSource
.getRepository(calendarType)
.createQueryBuilder("calendarType")
.orderBy("type", "ASC")
.orderBy("calendarType.type", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/configuration/communicationTypeService.ts
View file

@ -12,7 +12,7 @@ export default abstract class CommunicationTypeService {
return await dataSource
.getRepository(communicationType)
.createQueryBuilder("communicationType")
.orderBy("type", "ASC")
.orderBy("communicationType.type", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/configuration/education.ts
View file

@ -11,7 +11,7 @@ export default abstract class EducationService {
return await dataSource
.getRepository(education)
.createQueryBuilder("education")
.orderBy("education", "ASC")
.orderBy("education.education", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/configuration/executivePositionService.ts
View file

@ -13,7 +13,7 @@ export default abstract class ExecutivePositionService {
return await dataSource
.getRepository(executivePosition)
.createQueryBuilder("executivePosition")
.orderBy("position", "ASC")
.orderBy("executivePosition.position", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/configuration/membershipStatusService.ts
View file

@ -13,7 +13,7 @@ export default abstract class MembershipStatusService {
return await dataSource
.getRepository(membershipStatus)
.createQueryBuilder("membershipStatus")
.orderBy("status", "ASC")
.orderBy("membershipStatus.status", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/configuration/qualification.ts
View file

@ -14,7 +14,7 @@ export default abstract class QualificationService {
return await dataSource
.getRepository(qualification)
.createQueryBuilder("qualification")
.orderBy("qualification", "ASC")
.orderBy("qualification.qualification", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/configuration/queryStoreService.ts
View file

@ -12,7 +12,7 @@ export default abstract class QueryStoreService {
return await dataSource
.getRepository(query)
.createQueryBuilder("queryStore")
.orderBy("title", "ASC")
.orderBy("queryStore.title", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/configuration/salutationService.ts
View file

@ -12,7 +12,7 @@ export default abstract class SalutationService {
return await dataSource
.getRepository(salutation)
.createQueryBuilder("salutation")
.orderBy("salutation", "ASC")
.orderBy("salutation.salutation", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/configuration/templateService.ts
View file

@ -13,7 +13,7 @@ export default abstract class TemplateService {
return await dataSource
.getRepository(template)
.createQueryBuilder("template")
.orderBy("template", "ASC")
.orderBy("template.template", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/configuration/templateUsageService.ts
View file

@ -15,7 +15,7 @@ export default abstract class TemplateUsageService {
.leftJoinAndSelect("templateUsage.header", "headerTemplate")
.leftJoinAndSelect("templateUsage.body", "bodyTemplate")
.leftJoinAndSelect("templateUsage.footer", "footerTemplate")
.orderBy("scope", "ASC")
.orderBy("templateUsage.scope", "ASC")
.getMany()
.then((res) => {
return res;

2
src/service/management/roleService.ts
View file

@ -13,7 +13,7 @@ export default abstract class RoleService {
.getRepository(role)
.createQueryBuilder("role")
.leftJoinAndSelect("role.permissions", "role_permissions")
.orderBy("role", "ASC")
.orderBy("role.role", "ASC")
.getMany()
.then((res) => {
return res;

4
src/service/management/userService.ts
View file

@ -16,8 +16,8 @@ export default abstract class UserService {
.leftJoinAndSelect("user.roles", "roles")
.leftJoinAndSelect("user.permissions", "permissions")
.leftJoinAndSelect("roles.permissions", "role_permissions")
.orderBy("firstname", "ASC")
.addOrderBy("lastname", "ASC")
.orderBy("user.firstname", "ASC")
.addOrderBy("user.lastname", "ASC")
.getMany()
.then((res) => {
return res;