Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Oct 4, 2019 · 4ca6e59 · 4ca6e59
2 parents 42e567a + 6f5c101
commit 4ca6e59
Show file tree

Hide file tree

Showing 51 changed files with 720 additions and 1,683 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.html
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/WorkItemsPanel.java
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.html b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.html
@@ -20,7 +20,7 @@
     <div wicket:id="actionButtons">
         <div class="btn btn-danger" wicket:id="workItemRejectButton"/>
         <div class="btn btn-success" wicket:id="workItemApproveButton"/>
-        <div class="btn btn-primary" wicket:id="workItemDelegateButton"/>
+        <div class="btn btn-primary" wicket:id="workItemForwardButton"/>
         <div class="btn btn-primary" wicket:id="workItemClaimButton"/>
     </div>
 </wicket:panel>