Skip to content

Commit cbe3655

Browse files
committed
Fixed NPE in AEFI list component and guarded against no rights to view AEFI in immunization data view.
1 parent 8ed0e2f commit cbe3655

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

sormas-ui/src/main/java/de/symeda/sormas/ui/adverseeventsfollowingimmunization/aefilink/AefiListComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public AefiListComponent(AefiListCriteria aefiListCriteria, Consumer<Runnable> a
4141
.navigateToAefi("immunization/" + aefiListCriteria.getImmunization().getUuid() + "/adverseevent/create"),
4242
UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_CREATE);
4343

44-
if (totalVaccinations == 0) {
44+
if (totalVaccinations == 0 && createButton != null) {
4545
createButton.setEnabled(false);
4646
}
4747
}

sormas-ui/src/main/java/de/symeda/sormas/ui/immunization/ImmunizationDataView.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
import de.symeda.sormas.api.feature.FeatureType;
99
import de.symeda.sormas.api.immunization.ImmunizationDto;
1010
import de.symeda.sormas.api.immunization.MeansOfImmunization;
11+
import de.symeda.sormas.api.user.UserRight;
1112
import de.symeda.sormas.ui.ControllerProvider;
13+
import de.symeda.sormas.ui.UiUtil;
1214
import de.symeda.sormas.ui.adverseeventsfollowingimmunization.aefilink.AefiListComponent;
1315
import de.symeda.sormas.ui.immunization.components.form.ImmunizationDataForm;
1416
import de.symeda.sormas.ui.sormastosormas.SormasToSormasListComponent;
@@ -58,10 +60,11 @@ protected void initView(String params) {
5860
ImmunizationDto immunization = FacadeProvider.getImmunizationFacade().getImmunizationByUuid(getReference().getUuid());
5961

6062
if (FacadeProvider.getFeatureConfigurationFacade().isFeatureEnabled(FeatureType.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_MANAGEMENT)
61-
&& (immunization.getMeansOfImmunization() == MeansOfImmunization.VACCINATION
63+
&& UiUtil.permitted(UserRight.ADVERSE_EVENTS_FOLLOWING_IMMUNIZATION_VIEW)
64+
&& (immunization.getMeansOfImmunization() == MeansOfImmunization.VACCINATION
6265
|| immunization.getMeansOfImmunization() == MeansOfImmunization.VACCINATION_RECOVERY)) {
63-
AefiListCriteria aefiListCriteria = new AefiListCriteria.Builder(getReference()).build();
6466

67+
AefiListCriteria aefiListCriteria = new AefiListCriteria.Builder(getReference()).build();
6568
AefiListComponent aefiListComponent =
6669
new AefiListComponent(aefiListCriteria, this::showUnsavedChangesPopup, isEditAllowed(), immunization.getVaccinations().size());
6770
CssStyles.style(aefiListComponent, CssStyles.VIEW_SECTION);

0 commit comments

Comments
 (0)