Gallardo7761/huertos-bellavista
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: collaborator detection in backend and frontend

Browse Source 
modify: backend build script
revert: clean search bar on create/edit in frontend
update: API urls in frontend
This commit is contained in:
Jose
2026-03-07 03:10:02 +01:00
parent 76b30df1ba
commit 2dcd44a384
9 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/build-upload.sh
View File

@@ -6,5 +6,5 @@ cd ..
cd huertos/ || exit
mvn clean package
cd ..
scp core/target/core-*.jar root@huertosbellavista.es:/root/transfer
scp huertos/target/huertos-*.jar root@huertosbellavista.es:/root/transfer
scp core/target/core-*.jar root@159.69.155.167:/root/transfer
scp huertos/target/huertos-*.jar root@159.69.155.167:/root/transfer

2
backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/controller/MemberController.java
View File

@@ -4,7 +4,7 @@ import es.huertosbellavista.backend.huertos.dto.DropdownDto;
import es.huertosbellavista.backend.huertos.dto.MemberDto;
import es.huertosbellavista.backend.huertos.dto.MemberProfileDto;
import es.huertosbellavista.backend.huertos.dto.WaitlistCensoredDto;
import net.miarma.backend.huertos.dto.*;
import es.huertosbellavista.backend.huertos.dto.*;
import es.huertosbellavista.backend.huertos.dto.view.VIncomesWithInfoDto;
import es.huertosbellavista.backend.huertos.security.HuertosPrincipal;
import es.huertosbellavista.backend.huertos.service.MemberService;

2
backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/controller/RequestController.java
View File

@@ -3,7 +3,7 @@ package es.huertosbellavista.backend.huertos.controller;
import es.huertosbellavista.backend.huertos.dto.RequestCountDto;
import es.huertosbellavista.backend.huertos.dto.RequestDto;
import es.huertosbellavista.backend.huertos.dto.RequestWithMetadataDto;
import net.miarma.backend.huertos.dto.*;
import es.huertosbellavista.backend.huertos.dto.*;
import es.huertosbellavista.backend.huertos.mapper.RequestMapper;
import es.huertosbellavista.backend.huertos.mapper.RequestWithMetadataMapper;
import es.huertosbellavista.backend.huertos.model.Request;

3
backend/huertos/src/main/java/es/huertosbellavista/backend/huertos/service/MemberService.java
View File

@@ -178,7 +178,8 @@
.toList();
return plotMembers.stream()
.anyMatch(dto -> dto.metadata().getType().equals((byte)3));
.anyMatch(dto -> dto.metadata().getType().equals((byte)3) ||
dto.metadata().getType().equals((byte)0));
}
public Boolean hasGreenhouse(Integer memberNumber) {