Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6875 s2s exclude fields when sharing #6937

Merged
merged 9 commits into from
Oct 13, 2021

Conversation

vidi42
Copy link
Contributor

@vidi42 vidi42 commented Oct 11, 2021

Fixes #6875

@vidi42 vidi42 requested a review from leventegal-she October 11, 2021 14:25
@vidi42 vidi42 linked an issue Oct 11, 2021 that may be closed by this pull request
@@ -62,7 +62,7 @@
*/
public class SormasToSormasRestClient {

public static final String SORMAS_REST_URL_TEMPLATE = "https://%s" + SORMAS_REST_PATH + "%s";
public static final String SORMAS_REST_URL_TEMPLATE = "http://%s" + SORMAS_REST_PATH + "%s";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please revert to https

@vidi42 vidi42 requested a review from leventegal-she October 12, 2021 06:13
# Conflicts:
#	sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/data/received/ReceivedDataProcessorHelper.java
#	sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/entities/caze/CaseShareDataBuilder.java
#	sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/entities/caze/ReceivedCaseProcessor.java
#	sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/entities/contact/ContactShareDataBuilder.java
#	sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/entities/contact/ReceivedContactProcessor.java
#	sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/entities/event/EventShareDataBuilder.java
#	sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/entities/event/ReceivedEventProcessor.java
#	sormas-backend/src/main/java/de/symeda/sormas/backend/sormastosormas/share/ShareDataBuilderHelper.java
#	sormas-backend/src/test/java/de/symeda/sormas/backend/AbstractBeanTest.java
#	sormas-backend/src/test/java/de/symeda/sormas/backend/sormastosormas/entities/SormasToSormasCaseFacadeEjbTest.java
#	sormas-backend/src/test/java/de/symeda/sormas/backend/sormastosormas/entities/SormasToSormasContactFacadeEjbTest.java
@vidi42 vidi42 requested a review from leventegal-she October 13, 2021 11:43
@vidi42 vidi42 merged commit 043517f into hotfix-1.64.1 Oct 13, 2021
@vidi42 vidi42 deleted the 6875_s2s_exclude_fields_when_sharing branch October 13, 2021 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Configuration for S2S to exclude fields from sharing [3]
2 participants