Entity log doesn't show entities were created by user with tenant. Co…

…mments added jmix-framework#976
warhammster · Oct 5, 2022 · 594a262 · 594a262
1 parent 59a2d45
commit 594a262
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/jmix-audit/audit/src/main/java/io/jmix/audit/impl/EntityLogImpl.java b/jmix-audit/audit/src/main/java/io/jmix/audit/impl/EntityLogImpl.java
@@ -256,7 +256,7 @@ protected EntityLogAttr getAttrToSave(EntityLogAttr entityLogAttr, EntityLogItem
     protected void saveItem(EntityLogItem item) {
         String storeName = metadata.getClass(item.getEntity()).getStore().getName();
 
-        entityEventManager.publishEntitySavingEvent(item, true);
+        entityEventManager.publishEntitySavingEvent(item, true);//workaround for jmix-framework/jmix#1069
         if (item.getDbGeneratedIdEntity() == null) {
             if (Stores.isMain(storeName)) {
                 entityManager.persist(item);

diff --git a/jmix-cuba/cuba/src/main/java/com/haulmont/cuba/core/app/scheduling/RunnerBean.java b/jmix-cuba/cuba/src/main/java/com/haulmont/cuba/core/app/scheduling/RunnerBean.java
@@ -171,7 +171,7 @@ protected ScheduledExecution registerExecutionStart(ScheduledTask task, long now
             execution.setServer(serverInfo.getServerId());
 
 
-            entityEventManager.publishEntitySavingEvent(execution, true);
+            entityEventManager.publishEntitySavingEvent(execution, true);//workaround for jmix-framework/jmix#1069
             em.persist(execution);
             tx.commit();
 

diff --git a/jmix-email/email/src/main/java/io/jmix/email/impl/EmailDataProviderImpl.java b/jmix-email/email/src/main/java/io/jmix/email/impl/EmailDataProviderImpl.java
@@ -262,7 +262,7 @@ protected void persistSendingMessage(SendingMessage message, MessagePersistingCo
             message.setContentText(null);
         }
 
-        entityEventManager.publishEntitySavingEvent(message, true);
+        entityEventManager.publishEntitySavingEvent(message, true);//workaround for jmix-framework/jmix#1069
         entityManager.persist(message);
 
         message.getAttachments().forEach(attachment -> {
@@ -272,7 +272,7 @@ protected void persistSendingMessage(SendingMessage message, MessagePersistingCo
                 attachment.setContent(null);
             }
 
-            entityEventManager.publishEntitySavingEvent(attachment, true);
+            entityEventManager.publishEntitySavingEvent(attachment, true);//workaround for jmix-framework/jmix#1069
             entityManager.persist(attachment);
         });
     }

diff --git a/jmix-reports/reports/src/main/java/io/jmix/reports/impl/ReportsPersistenceImpl.java b/jmix-reports/reports/src/main/java/io/jmix/reports/impl/ReportsPersistenceImpl.java
@@ -132,7 +132,7 @@ protected Report saveReport(Report report) {
                     report.setGroup(group);
                 }
             } else {
-                entityEventManager.publishEntitySavingEvent(group, true);
+                entityEventManager.publishEntitySavingEvent(group, true);//workaround for jmix-framework/jmix#1069
                 em.persist(group);
             }
         }
@@ -148,7 +148,7 @@ protected Report saveReport(Report report) {
 
             if (existingReport != null) {
                 report.setVersion(existingReport.getVersion());
-                entityEventManager.publishEntitySavingEvent(report, false);
+                entityEventManager.publishEntitySavingEvent(report, false);//workaround for jmix-framework/jmix#1069
                 report = em.merge(report);
                 if (existingReport.getTemplates() != null) {
                     existingTemplates = existingReport.getTemplates();
@@ -161,7 +161,7 @@ protected Report saveReport(Report report) {
                 report.setTemplates(null);
             } else {
                 report.setVersion(0);
-                entityEventManager.publishEntitySavingEvent(report, true);
+                entityEventManager.publishEntitySavingEvent(report, true);//workaround for jmix-framework/jmix#1069
                 report = em.merge(report);
             }
 
@@ -186,7 +186,7 @@ protected Report saveReport(Report report) {
                     }
 
                     loadedTemplate.setReport(report);
-                    entityEventManager.publishEntitySavingEvent(loadedTemplate, entityStates.isNew(loadedTemplate));
+                    entityEventManager.publishEntitySavingEvent(loadedTemplate, entityStates.isNew(loadedTemplate));//workaround for jmix-framework/jmix#1069
                     savedTemplates.add(em.merge(loadedTemplate));
                 }
             }

diff --git a/jmix-ui/ui-data/src/main/java/io/jmix/uidata/UserSettingServiceImpl.java b/jmix-ui/ui-data/src/main/java/io/jmix/uidata/UserSettingServiceImpl.java
@@ -101,7 +101,7 @@ public void saveSetting(String name, @Nullable String value) {
                 us.setUsername(authentication.getUser().getUsername());
                 us.setName(name);
                 us.setValue(value);
-                entityEventManager.publishEntitySavingEvent(us, true);
+                entityEventManager.publishEntitySavingEvent(us, true);//workaround for jmix-framework/jmix#1069
                 entityManager.persist(us);
             } else {
                 us.setValue(value);
@@ -173,7 +173,7 @@ public void copySettings(UserDetails fromUser, UserDetails toUser) {
                 } catch (Exception e) {
                     newSetting.setValue(currSetting.getValue());
                 }
-                entityEventManager.publishEntitySavingEvent(newSetting, true);
+                entityEventManager.publishEntitySavingEvent(newSetting, true);//workaround for jmix-framework/jmix#1069
                 entityManager.persist(newSetting);
             }
         });
@@ -235,7 +235,7 @@ protected Map<UUID, UiTablePresentation> copyPresentations(UserDetails fromUser,
                 newPresentation.setName(presentation.getName());
                 newPresentation.setSettings(presentation.getSettings());
                 presentationMap.put(presentation.getId(), newPresentation);
-                entityEventManager.publishEntitySavingEvent(newPresentation, true);
+                entityEventManager.publishEntitySavingEvent(newPresentation, true);//workaround for jmix-framework/jmix#1069
                 entityManager.persist(newPresentation);
             }
             return presentationMap;