diff --git a/src/main/java/com/sasiedzi/event/domain/Event.java b/src/main/java/com/sasiedzi/event/domain/Event.java index 9d132a2..12aea3b 100644 --- a/src/main/java/com/sasiedzi/event/domain/Event.java +++ b/src/main/java/com/sasiedzi/event/domain/Event.java @@ -50,7 +50,7 @@ public class Event implements Serializable { private Set registrations = new HashSet<>(); @OneToMany(fetch = FetchType.LAZY, mappedBy = "event") - @JsonIgnoreProperties(value = { "event", "transactionItems" }, allowSetters = true) + @JsonIgnoreProperties(value = { "event" }, allowSetters = true) private Set transactions = new HashSet<>(); // jhipster-needle-entity-add-field - JHipster will add fields here diff --git a/src/main/webapp/app/core/jhi-footer/jhi-footer.vue b/src/main/webapp/app/core/jhi-footer/jhi-footer.vue index 8f9fa19..5ee6020 100644 --- a/src/main/webapp/app/core/jhi-footer/jhi-footer.vue +++ b/src/main/webapp/app/core/jhi-footer/jhi-footer.vue @@ -1,6 +1,6 @@ diff --git a/src/main/webapp/app/entities/event/event-details.vue b/src/main/webapp/app/entities/event/event-details.vue index 20aa997..d1736a6 100644 --- a/src/main/webapp/app/entities/event/event-details.vue +++ b/src/main/webapp/app/entities/event/event-details.vue @@ -167,7 +167,8 @@ v-if="(event.editable && hasAnyAuthority(['ROLE_COUNTER'])) || hasAnyAuthority(['ROLE_ADMIN'])" @click="settle()" > - Rozlicz wydarzenie + Rozlicz wydarzeniePrzelicz ponownie zobowiązania