Fixed disappearing of cert decision when entering a comment.

Evolveum · May 16, 2017 · ee49c91 · ee49c91
1 parent 0bcade5
commit ee49c91
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/.../java/com/evolveum/midpoint/web/component/data/column/DirectlyEditablePropertyColumn.java b/.../java/com/evolveum/midpoint/web/component/data/column/DirectlyEditablePropertyColumn.java
@@ -46,8 +46,8 @@ public void populateItem(Item<ICellPopulator<T>> cellItem, String componentId,
     }
 
     protected InputPanel createInputPanel(String componentId, final IModel<T> model) {
-        TextPanel textPanel = new TextPanel(componentId, new PropertyModel(model, getPropertyExpression()));
-        TextField textField = (TextField) textPanel.getBaseFormComponent();     // UGLY HACK
+        TextPanel<?> textPanel = new TextPanel<String>(componentId, new PropertyModel<>(model, getPropertyExpression()));
+        TextField<?> textField = (TextField<?>) textPanel.getBaseFormComponent();     // UGLY HACK
         textField.add(new AjaxFormComponentUpdatingBehavior("blur") {
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
@@ -58,6 +58,6 @@ protected void onUpdate(AjaxRequestTarget target) {
     }
 
     public void onBlur(AjaxRequestTarget target, IModel<T> model) {
-        // doing nothing; may be overriden in subclasses
+        // doing nothing; may be overridden in subclasses
     }
 }
diff --git a/.../src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java b/.../src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
@@ -54,7 +54,7 @@ public enum WhichObject {
         OBJECT, TARGET
     }
 
-    IColumn createTypeColumn(final WhichObject which, final PageBase page) {
+    <T extends CertCaseOrWorkItemDto> IColumn<T, String> createTypeColumn(final WhichObject which, final PageBase page) {
         IColumn column;
         column = new IconColumn<CertCaseOrWorkItemDto>(page.createStringResource("")) {
             @Override
@@ -82,7 +82,7 @@ public void populateItem(Item<ICellPopulator<CertCaseOrWorkItemDto>> item, Strin
         return column;
     }
 
-    IColumn createObjectNameColumn(final PageBase page, final String headerKey) {
+    <T extends CertCaseOrWorkItemDto> IColumn<T, String> createObjectNameColumn(final PageBase page, final String headerKey) {
         IColumn column;
         column = new LinkColumn<CertCaseOrWorkItemDto>(page.createStringResource(headerKey),
                 SearchingUtils.OBJECT_NAME, CertCaseOrWorkItemDto.F_OBJECT_NAME) {
@@ -96,7 +96,7 @@ public void onClick(AjaxRequestTarget target, IModel<CertCaseOrWorkItemDto> rowM
         return column;
     }
 
-    IColumn createTargetNameColumn(final PageBase page, final String headerKey) {
+    <T extends CertCaseOrWorkItemDto> IColumn<T, String> createTargetNameColumn(final PageBase page, final String headerKey) {
         IColumn column;
         column = new LinkColumn<CertCaseOrWorkItemDto>(page.createStringResource(headerKey),
                 SearchingUtils.TARGET_NAME, CertCaseOrWorkItemDto.F_TARGET_NAME) {
@@ -110,12 +110,11 @@ public void onClick(AjaxRequestTarget target, IModel<CertCaseOrWorkItemDto> rowM
         return column;
     }
 
-    IColumn createConflictingNameColumn(final PageBase page, final String headerKey) {
-        return new PropertyColumn<CertCaseOrWorkItemDto, String>(page.createStringResource(headerKey),
-                CertCaseOrWorkItemDto.F_CONFLICTING_TARGETS);
+    <T extends CertCaseOrWorkItemDto> IColumn<T, String> createConflictingNameColumn(final PageBase page, final String headerKey) {
+        return new PropertyColumn<>(page.createStringResource(headerKey), CertCaseOrWorkItemDto.F_CONFLICTING_TARGETS);
     }
 
-    public IColumn createDetailedInfoColumn(final PageBase page) {
+    <T extends CertCaseOrWorkItemDto> IColumn<T, String> createDetailedInfoColumn(final PageBase page) {
         IColumn column;
         column = new IconColumn<CertCaseOrWorkItemDto>(page.createStringResource("")) {
 

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDecisions.java
@@ -144,7 +144,7 @@ private void initLayout() {
         add(mainForm);
         CertWorkItemDtoProvider provider = createProvider();
         int itemsPerPage = (int) getItemsPerPage(UserProfileStorage.TableId.PAGE_CERT_DECISIONS_PANEL);
-        BoxedTablePanel table = new BoxedTablePanel(ID_DECISIONS_TABLE, provider, initColumns(),
+        BoxedTablePanel<CertWorkItemDto> table = new BoxedTablePanel<CertWorkItemDto>(ID_DECISIONS_TABLE, provider, initColumns(),
                 UserProfileStorage.TableId.PAGE_CERT_DECISIONS_PANEL, itemsPerPage) {
 
             @Override
@@ -174,7 +174,7 @@ protected WebMarkupContainer createHeader(String headerId) {
     private List<IColumn<CertWorkItemDto, String>> initColumns() {
         List<IColumn<CertWorkItemDto, String>> columns = new ArrayList<>();
 
-        IColumn column;
+        IColumn<CertWorkItemDto, String> column;
 
         column = new CheckBoxHeaderColumn<>();
         columns.add(column);
@@ -356,7 +356,7 @@ public void clickPerformed(int id, AjaxRequestTarget target,
         };
         columns.add(column);
 
-        column = new DirectlyEditablePropertyColumn(
+        column = new DirectlyEditablePropertyColumn<CertWorkItemDto>(
                 createStringResource("PageCertDecisions.table.comment"),
                 CertWorkItemDto.F_COMMENT) {
             @Override
@@ -458,6 +458,9 @@ private void recordActionPerformed(AjaxRequestTarget target, CertWorkItemDto wor
         OperationResult result = new OperationResult(OPERATION_RECORD_ACTION);
         try {
             Task task = createSimpleTask(OPERATION_RECORD_ACTION);
+            if (response == null) {
+                response = workItemDto.getResponse();
+            }
             // TODO work item ID
             getCertificationService().recordDecision(
                     workItemDto.getCampaignRef().getOid(),