Fixed clicking-through op results when there are more of them (index …

…out of bound exception).
Evolveum · Nov 13, 2017 · 1f0c83a · 1f0c83a
1 parent 1424c87
commit 1f0c83a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/FeedbackListView.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/FeedbackListView.java
@@ -22,7 +22,7 @@
 import org.apache.wicket.feedback.FeedbackMessagesModel;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.model.Model;
 
 import com.evolveum.midpoint.gui.api.component.result.OpResult;
 import com.evolveum.midpoint.gui.api.component.result.OperationResultPanel;
@@ -48,8 +48,8 @@ protected void populateItem(final ListItem<FeedbackMessage> item) {
 		final FeedbackMessage message = item.getModelObject();
 
 		if (message.getMessage() instanceof OpResult) {
-			OperationResultPanel panel = new OperationResultPanel("message",
-					new PropertyModel<OpResult>(item.getModel(), "message"), getPage()) {
+			final OpResult opResult = (OpResult) message.getMessage();
+			OperationResultPanel panel = new OperationResultPanel("message", Model.of(opResult), getPage()) {
 
 				private static final long serialVersionUID = 1L;
 
@@ -60,7 +60,7 @@ public void close(AjaxRequestTarget target) {
 				}
 
 				protected void onAfterRender() {
-					((OpResult) message.getMessage()).setAlreadyShown(true);
+					opResult.setAlreadyShown(true);
 					super.onAfterRender();
 				};
 			};
@@ -69,13 +69,13 @@ protected void onAfterRender() {
 				private static final long serialVersionUID = 1L;
 
 				public boolean isVisible() {
-					return !((OpResult) item.getModelObject().getMessage()).isAlreadyShown();
+					return !opResult.isAlreadyShown();
 				};
 			});
 
 			panel.setOutputMarkupId(true);
 			item.add(panel);
-		} else if (!(message.getMessage() instanceof OpResult)) {
+		} else {
 
 			message.markRendered();
 			ValidationErrorPanel validationPanel = new ValidationErrorPanel("message", item.getModel()) {