Skip to content

Commit

Permalink
Fix MID-8919 incorrect save comment operation
Browse files Browse the repository at this point in the history
  • Loading branch information
tchrapovic committed Sep 5, 2023
1 parent d5637c8 commit c258234
Showing 1 changed file with 19 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
description = PageAdminCertification.AUTH_CERTIFICATION_ALL_DESCRIPTION),
@AuthorizationAction(actionUri = PageAdminCertification.AUTH_MY_CERTIFICATION_DECISIONS,
label = PageAdminCertification.AUTH_MY_CERTIFICATION_DECISIONS_LABEL,
description = PageAdminCertification.AUTH_MY_CERTIFICATION_DECISIONS_DESCRIPTION)})
description = PageAdminCertification.AUTH_MY_CERTIFICATION_DECISIONS_DESCRIPTION) })

public class PageCertDecisions extends PageAdminCertification {

Expand All @@ -107,7 +107,7 @@ public PageCertDecisions() {
}

@Override
protected void onInitialize(){
protected void onInitialize() {
super.onInitialize();
initLayout();
}
Expand Down Expand Up @@ -335,19 +335,19 @@ public void populateItem(Item<ICellPopulator<CertWorkItemDto>> item, String comp
};
columns.add(column);

column = new PropertyColumn<CertWorkItemDto, String>(createStringResource("PageCertDecisions.table.deadline"),
column = new PropertyColumn<CertWorkItemDto, String>(createStringResource("PageCertDecisions.table.deadline"),
SearchingUtils.CURRENT_REVIEW_DEADLINE, CertWorkItemDto.F_DEADLINE_AS_STRING) {
private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;

@Override
public void populateItem(Item<ICellPopulator<CertWorkItemDto>> item, String componentId, final IModel<CertWorkItemDto> rowModel) {
super.populateItem(item, componentId, rowModel);
XMLGregorianCalendar deadline = rowModel.getObject().getCertCase().getCurrentStageDeadline();
if (deadline != null) {
item.add(AttributeModifier.replace("title", WebComponentUtil.formatDate(deadline)));
item.add(new TooltipBehavior());
}
@Override
public void populateItem(Item<ICellPopulator<CertWorkItemDto>> item, String componentId, final IModel<CertWorkItemDto> rowModel) {
super.populateItem(item, componentId, rowModel);
XMLGregorianCalendar deadline = rowModel.getObject().getCertCase().getCurrentStageDeadline();
if (deadline != null) {
item.add(AttributeModifier.replace("title", WebComponentUtil.formatDate(deadline)));
item.add(new TooltipBehavior());
}
}
};
columns.add(column);

Expand All @@ -360,7 +360,7 @@ public void populateItem(Item<ICellPopulator<CertWorkItemDto>> item, String comp

@Override
public void populateItem(Item<ICellPopulator<CertWorkItemDto>> cellItem, String componentId,
IModel<CertWorkItemDto> rowModel) {
IModel<CertWorkItemDto> rowModel) {

cellItem.add(new MultiButtonPanel<CertWorkItemDto>(componentId, rowModel, responses + 1) {

Expand Down Expand Up @@ -402,7 +402,7 @@ public void onBlur(AjaxRequestTarget target, IModel model) {
};
columns.add(column);

columns.add(new InlineMenuHeaderColumn(createInlineMenu(availableResponses)));
columns.add(new InlineMenuHeaderColumn<>(createInlineMenu(availableResponses)));

return columns;
}
Expand Down Expand Up @@ -519,7 +519,9 @@ private void recordActionPerformed(AjaxRequestTarget target, CertWorkItemDto wor
showResult(result);
}
// resetCertWorkItemCountModel();
target.add(this);
if (response != null) {
target.add(this);
}
}

private void searchFilterPerformed(AjaxRequestTarget target) {
Expand All @@ -537,14 +539,14 @@ private void searchFilterPerformed(AjaxRequestTarget target) {
target.add((Component) getDecisionsTable());
}

private CertDecisionsStorage getCertDecisionsStorage(){
private CertDecisionsStorage getCertDecisionsStorage() {
return getSessionStorage().getCertDecisions();
}

private static class SearchFragment extends Fragment {

public SearchFragment(String id, String markupId, MarkupContainer markupProvider,
IModel<Boolean> model) {
IModel<Boolean> model) {
super(id, markupId, markupProvider, model);

initLayout();
Expand Down

0 comments on commit c258234

Please sign in to comment.