diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java index 73949288e..a7151a613 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java @@ -81,6 +81,7 @@ public class IssueLogCRUDController extends BaseCRUDController { initializeOrderComponent(); initializeUserComponent(); bdProjectIssueLog.setDisabled(!LogsController.getProjectNameVisibility()); + bdUserIssueLog.setDisabled(true); } /** diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogModel.java index 757d6ae6b..22e24f26f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogModel.java @@ -39,6 +39,7 @@ import org.libreplan.business.users.daos.IUserDAO; import org.libreplan.business.users.entities.User; import org.libreplan.web.common.IntegrationEntityModel; import org.libreplan.web.common.concurrentdetection.OnConcurrentModification; +import org.libreplan.web.security.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; @@ -102,6 +103,11 @@ public class IssueLogModel extends IntegrationEntityModel implements if (codeGenerated) { issueLog.setCodeAutogenerated(codeGenerated); setDefaultCode(); + try { + issueLog.setCreatedBy(userDAO.findByLoginName(SecurityUtils.getSessionUserLoginName())); + } catch (InstanceNotFoundException e) { + e.printStackTrace(); + } } } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java index bbdf3af82..f727abc9f 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogCRUDController.java @@ -78,6 +78,7 @@ public class RiskLogCRUDController extends BaseCRUDController { initializeOrderComponent(); initializeUserComponent(); bdProjectRiskLog.setDisabled(!LogsController.getProjectNameVisibility()); + bdUserRiskLog.setDisabled(true); } /** diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogModel.java index fd9f51842..c48a3e47c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/logs/RiskLogModel.java @@ -34,11 +34,11 @@ import org.libreplan.business.logs.daos.IRiskLogDAO; import org.libreplan.business.logs.entities.RiskLog; import org.libreplan.business.orders.daos.IOrderDAO; import org.libreplan.business.orders.entities.Order; -import org.libreplan.business.scenarios.IScenarioManager; import org.libreplan.business.users.daos.IUserDAO; import org.libreplan.business.users.entities.User; import org.libreplan.web.common.IntegrationEntityModel; import org.libreplan.web.common.concurrentdetection.OnConcurrentModification; +import org.libreplan.web.security.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; @@ -102,6 +102,11 @@ public class RiskLogModel extends IntegrationEntityModel implements if (codeGenerated) { riskLog.setCodeAutogenerated(codeGenerated); setDefaultCode(); + try { + riskLog.setCreatedBy(userDAO.findByLoginName(SecurityUtils.getSessionUserLoginName())); + } catch (InstanceNotFoundException e) { + e.printStackTrace(); + } } }