| Chunk |
|---|
| Conflicting content |
|---|
// assign ownership to group (if provided) or to the user, and set access rights
if (groupName != null) {
<<<<<<< HEAD
this.permissionManager.getPatientAccess(affectedPatient).setOwner(group.getReference());
this.permissionManager.getPatientAccess(affectedPatient).addCollaborator(user.getProfileDocument(),
this.permissionManager.resolveAccessLevel("manage"));
} else {
this.permissionManager.getPatientAccess(affectedPatient).setOwner(user.getProfileDocument());
=======
this.permisionManager.getPatientAccess(affectedPatient).setOwner(group.getReference());
this.permisionManager.getPatientAccess(affectedPatient).addCollaborator(user.getProfileDocument(),
this.permisionManager.resolveAccessLevel("manage"));
}
else {
this.permisionManager.getPatientAccess(affectedPatient).setOwner(user.getProfileDocument());
>>>>>>> 30bfc2ee51b0a302c786bdd07035222fe4ff19dd
}
if (affectedPatient == null) { |
| Solution content |
|---|
// assign ownership to group (if provided) or to the user, and set access rights
if (groupName != null) {
this.permissionManager.getPatientAccess(affectedPatient).setOwner(group.getReference());
this.permissionManager.getPatientAccess(affectedPatient).addCollaborator(user.getProfileDocument(),
this.permissionManager.resolveAccessLevel("manage"));
} else {
this.permissionManager.getPatientAccess(affectedPatient).setOwner(user.getProfileDocument());
}
if (affectedPatient == null) { |
| File |
|---|
| DefaultReceivePatientData.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |