diff --git a/libreplan-business/src/main/java/org/libreplan/business/logs/entities/RiskLog.java b/libreplan-business/src/main/java/org/libreplan/business/logs/entities/RiskLog.java index 2aa98d8de..f4d387a28 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/logs/entities/RiskLog.java +++ b/libreplan-business/src/main/java/org/libreplan/business/logs/entities/RiskLog.java @@ -48,7 +48,11 @@ public class RiskLog extends ProjectLog { private RiskScoreStatesEnum score = RiskScoreStatesEnum.getDefault(); public static RiskLog create() { - return create(new RiskLog()); + return create(new RiskLog(new Date())); + } + + private RiskLog(Date date) { + this.dateCreated = date; } /** 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 8ec76547c..c964ac07c 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 @@ -77,6 +77,7 @@ public class IssueLogCRUDController extends BaseCRUDController { showListWindow(); initializeOrderComponent(); initializeUserComponent(); + bdProjectIssueLog.setDisabled(!LogsController.getProjectNameVisibility()); } @@ -376,10 +377,12 @@ public class IssueLogCRUDController extends BaseCRUDController { } public Order getOrder() { - if (LogsController.getProjectNameVisibility() == false) - return LogsController.getOrder(); + if (LogsController.getProjectNameVisibility() == false){ + this.getIssueLog().setOrder(LogsController.getOrder()); + return getIssueLog().getOrder(); + } else - return issueLogModel.getIssueLog().getOrder(); + return getIssueLog().getOrder(); } @Override 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 3bffccda8..17bfd41ca 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 @@ -429,4 +429,4 @@ public class RiskLogCRUDController extends BaseCRUDController { } -} \ No newline at end of file +} diff --git a/libreplan-webapp/src/main/webapp/logs/_listIssueLog.zul b/libreplan-webapp/src/main/webapp/logs/_listIssueLog.zul index c531653ea..10c9ff2f9 100644 --- a/libreplan-webapp/src/main/webapp/logs/_listIssueLog.zul +++ b/libreplan-webapp/src/main/webapp/logs/_listIssueLog.zul @@ -29,7 +29,7 @@ - + diff --git a/libreplan-webapp/src/main/webapp/logs/_listRiskLog.zul b/libreplan-webapp/src/main/webapp/logs/_listRiskLog.zul index d744d89d7..0b06fc260 100644 --- a/libreplan-webapp/src/main/webapp/logs/_listRiskLog.zul +++ b/libreplan-webapp/src/main/webapp/logs/_listRiskLog.zul @@ -25,17 +25,17 @@ - + - - - - - + + + + + - + diff --git a/libreplan-webapp/src/main/webapp/logs/_logs.zul b/libreplan-webapp/src/main/webapp/logs/_logs.zul index fd332bbd9..248e43038 100644 --- a/libreplan-webapp/src/main/webapp/logs/_logs.zul +++ b/libreplan-webapp/src/main/webapp/logs/_logs.zul @@ -36,13 +36,13 @@ -
+
+ onClick = "logsController.setupIssueLogController();"/> + onClick = "logsController.setupRiskLogController();"/>