RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some small bugs are fixed

Browse source
This commit is contained in:
Misha 2015-12-01 14:30:31 +02:00
parent 40dc2bd0d9
commit a66ba52b40
3 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libreplan-business/src/main/java/org/libreplan/business/logs/entities/IssueLog.java
View file

@ -35,7 +35,7 @@ import org.libreplan.business.users.entities.User;
public class IssueLog extends ProjectLog { public class IssueLog extends ProjectLog {
private IssueTypeEnum type = IssueTypeEnum.getDefault(); private IssueTypeEnum type = IssueTypeEnum.getDefault();
private String status; private String status = "LOW";
private LowMediumHighEnum priority = LowMediumHighEnum.getDefault(); private LowMediumHighEnum priority = LowMediumHighEnum.getDefault();
private LowMediumHighEnum severity = LowMediumHighEnum.getDefault(); private LowMediumHighEnum severity = LowMediumHighEnum.getDefault();
private Date dateRaised; private Date dateRaised;

16
libreplan-webapp/src/main/java/org/libreplan/web/logs/IssueLogCRUDController.java
View file

@ -288,10 +288,19 @@ public class IssueLogCRUDController extends BaseCRUDController<IssueLog> {
return result; return result;
} }
public void updateStatus() { public void updateStatusList(boolean ifNew) {
ListModelList model = new ListModelList(getIssueStatusEnum()); ListModelList model = new ListModelList(getIssueStatusEnum());
status.setModel(model); 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<IssueLog> {
@Override @Override
protected void initCreate() { protected void initCreate() {
issueLogModel.initCreate(); issueLogModel.initCreate();
updateStatusList(true);
} }
@Override @Override
protected void initEdit(IssueLog entity) { protected void initEdit(IssueLog entity) {
issueLogModel.initEdit(entity); issueLogModel.initEdit(entity);
updateStatusList(false);
} }
@Override @Override
@ -432,6 +443,7 @@ public class IssueLogCRUDController extends BaseCRUDController<IssueLog> {
throw new WrongValueException(bdUserIssueLog, throw new WrongValueException(bdUserIssueLog,
_("please select an author")); _("please select an author"));
} }
getIssueLog().setStatus(status.getSelectedItem().getLabel());
issueLogModel.confirmSave(); issueLogModel.confirmSave();
} }

12
libreplan-webapp/src/main/webapp/logs/_editIssueLog.zul
View file

@ -54,17 +54,17 @@
model="@{issueLogController.issueTypeEnum}" model="@{issueLogController.issueTypeEnum}"
selectedItem="@{issueLogController.issueLog.type}" selectedItem="@{issueLogController.issueLog.type}"
itemRenderer="@{issueLogController.issueTypeRenderer}" itemRenderer="@{issueLogController.issueTypeRenderer}"
onSelect="issueLogController.updateStatus()"/> onSelect="issueLogController.updateStatusList(true)"/>
<label value="${i18n:_('Status')}" /> <label value="${i18n:_('Status')}" />
<listbox id="listIssueLogStatus" mold="select" rows="1" width="230px" > <listbox id="listIssueLogStatus" mold="select" rows="1" width="230px">
<listitem label="LOW" value="LOW" selected="true"></listitem>
<listitem label="MEDIUM" value="MEDIUM"></listitem>
<listitem label="HIGH" value="HIGH"></listitem>
</listbox> </listbox>
<!--model="@{issueLogController.issueStatusEnum}" <!--model="@{issueLogController.issueStatusEnum}"
selectedItem="@{issueLogController.issueLog.status}" selectedItem="@{issueLogController.issueLog.status}"
itemRenderer="@{issueLogController.issueStatusRenderer}" --> itemRenderer="@{issueLogController.issueStatusRenderer}" <listitem label="LOW" value="LOW" selected="true"></listitem>
<listitem label="MEDIUM" value="MEDIUM"></listitem>
<listitem label="HIGH" value="HIGH"></listitem>-->
</row> </row>
</rows> </rows>
</grid> </grid>