diff --git a/libreplan-business/src/main/java/org/libreplan/business/logs/entities/IssueLog.java b/libreplan-business/src/main/java/org/libreplan/business/logs/entities/IssueLog.java index 29daeb4b4..bc42efd9a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/logs/entities/IssueLog.java +++ b/libreplan-business/src/main/java/org/libreplan/business/logs/entities/IssueLog.java @@ -35,7 +35,7 @@ import org.libreplan.business.users.entities.User; public class IssueLog extends ProjectLog { private IssueTypeEnum type = IssueTypeEnum.getDefault(); - private String status; + private String status = "LOW"; private LowMediumHighEnum priority = LowMediumHighEnum.getDefault(); private LowMediumHighEnum severity = LowMediumHighEnum.getDefault(); private Date dateRaised; 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 cbb31ece5..18ba2cf8f 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 @@ -288,10 +288,19 @@ public class IssueLogCRUDController extends BaseCRUDController { return result; } - public void updateStatus() { + public void updateStatusList(boolean ifNew) { ListModelList model = new ListModelList(getIssueStatusEnum()); status.setModel(model); - status.setSelectedItem(status.getItemAtIndex(0)); + if(ifNew) + status.setSelectedItem(status.getItemAtIndex(0)); + else { + for(int i = 0; i < status.getItems().size(); i++) { + if (status.getModel().getElementAt(i).toString().equals(getIssueLog().getStatus())) { + status.setSelectedItem(status.getItemAtIndex(i)); + break; + } + } + } } /** @@ -414,11 +423,13 @@ public class IssueLogCRUDController extends BaseCRUDController { @Override protected void initCreate() { issueLogModel.initCreate(); + updateStatusList(true); } @Override protected void initEdit(IssueLog entity) { issueLogModel.initEdit(entity); + updateStatusList(false); } @Override @@ -432,6 +443,7 @@ public class IssueLogCRUDController extends BaseCRUDController { throw new WrongValueException(bdUserIssueLog, _("please select an author")); } + getIssueLog().setStatus(status.getSelectedItem().getLabel()); issueLogModel.confirmSave(); } diff --git a/libreplan-webapp/src/main/webapp/logs/_editIssueLog.zul b/libreplan-webapp/src/main/webapp/logs/_editIssueLog.zul index 7126cc8c5..9b423eae9 100644 --- a/libreplan-webapp/src/main/webapp/logs/_editIssueLog.zul +++ b/libreplan-webapp/src/main/webapp/logs/_editIssueLog.zul @@ -54,17 +54,17 @@ model="@{issueLogController.issueTypeEnum}" selectedItem="@{issueLogController.issueLog.type}" itemRenderer="@{issueLogController.issueTypeRenderer}" - onSelect="issueLogController.updateStatus()"/> + onSelect="issueLogController.updateStatusList(true)"/>