Merge remote-tracking branch 'origin/master'

Evolveum · Apr 15, 2020 · 80661cc · 80661cc
2 parents 2665232 + dac53f1
commit 80661cc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 135 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItems.java
@@ -64,7 +64,8 @@ protected void onInitialize(){
     }
 
     private void initLayout() {
-        CaseWorkItemsPanel workItemsPanel = new CaseWorkItemsPanel(ID_CASE_WORK_ITEMS_TABLE, CaseWorkItemsPanel.View.FULL_LIST) {
+        CaseWorkItemsPanel workItemsPanel = new CaseWorkItemsPanel(ID_CASE_WORK_ITEMS_TABLE, CaseWorkItemsPanel.View.FULL_LIST,
+                pageParameters) {
             private static final long serialVersionUID = 1L;
 
             @Override

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/WorkItemPanel.html
diff --git a/...ingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/AboutPageTest.java b/...ingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/AboutPageTest.java
@@ -19,7 +19,7 @@
  */
 public class AboutPageTest extends AbstractSchrodingerTest {
 
-    private static final String VERSION_EXPECTED = "4.1-SNAPSHOT"; // Static value, should be changed each version change.
+    private static final String VERSION_EXPECTED = "4.2-SNAPSHOT"; // Static value, should be changed each version change.
     private static final String HIBERNATE_DIALECT_EXPECTED = "org.hibernate.dialect.H2Dialect";
     private static final String CONNID_VERSION_EXPECTED = "1.5.0.10"; // Static value, should be changed each version change.
     private static final String REINDEX_REPO_TASK_CATEGORY_EXPECTED = "Utility";