Merge remote-tracking branch 'origin/master'

Evolveum · Jun 14, 2019 · ca907c0 · ca907c0
2 parents f6a6a76 + 997c47d
commit ca907c0
Show file tree

Hide file tree

Showing 25 changed files with 1,695 additions and 1,450 deletions.
diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusTasksTabPanel.java b/...i/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusTasksTabPanel.java
@@ -31,6 +31,7 @@
 import com.evolveum.midpoint.web.component.prism.ObjectWrapper;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.server.PageTasks;
+import com.evolveum.midpoint.web.page.admin.server.TaskDtoTablePanel;
 import com.evolveum.midpoint.web.page.admin.server.dto.TaskDto;
 import com.evolveum.midpoint.web.page.admin.server.dto.TaskDtoProvider;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.FocusType;
@@ -88,10 +89,10 @@ public boolean isVisible() {
 	private List<IColumn<TaskDto, String>> initTaskColumns() {
 		List<IColumn<TaskDto, String>> columns = new ArrayList<>();
 
-		columns.add(PageTasks.createTaskNameColumn(this, "pageAdminFocus.task.name"));
-		columns.add(PageTasks.createTaskCategoryColumn(this, "pageAdminFocus.task.category"));
-		columns.add(PageTasks.createTaskExecutionStatusColumn(this, "pageAdminFocus.task.execution"));
-		columns.add(PageTasks.createTaskResultStatusColumn(this, "pageAdminFocus.task.status"));
+		columns.add(TaskDtoTablePanel.createTaskNameColumn(this, "pageAdminFocus.task.name"));
+		columns.add(TaskDtoTablePanel.createTaskCategoryColumn(this, "pageAdminFocus.task.category"));
+		columns.add(TaskDtoTablePanel.createTaskExecutionStatusColumn(this, "pageAdminFocus.task.execution"));
+		columns.add(TaskDtoTablePanel.createTaskResultStatusColumn(this, "pageAdminFocus.task.status"));
 		return columns;
 	}
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.html
@@ -22,7 +22,7 @@
 	    <div wicket:id="refreshPanel" class="pull-right"/>
 	    <br/>       <!-- fixme -->
 	    <form wicket:id="mainForm" class="form-inline">
-	        <div wicket:id="taskTable"/>
+	        <div wicket:id="taskTablePanel"/>
 
 	        <h3><wicket:message key="pageTasks.nodes"/></h3>
 	        <div wicket:id="nodeTable"/>
@@ -36,33 +36,6 @@ <h3><wicket:message key="pageTasks.nodes"/></h3>
         <a class="btn btn-default" wicket:id="synchronizeWorkflowRequests"/>
         <a class="btn btn-default" wicket:id="refreshTasks"/>
     </div>
-
-
-    <wicket:fragment wicket:id="tableHeader">
-        <form wicket:id="searchForm" class="form-inline pull-right search-form">
-            <div class="checkbox">
-                <label>
-                    <input type="checkbox" wicket:id="showSubtasks"/>
-                    <wicket:message key="pageTasks.subtasks"/>
-                </label>
-            </div>
-            <div class="form-group">
-                <label class="sr-only"><wicket:message key="pageTasks.state"/></label>
-                <select class="form-control input-sm" wicket:id="state"/>
-            </div>
-            <div class="form-group">
-                <label class="sr-only"><wicket:message key="pageTasks.category"/></label>
-                <select class="form-control input-sm" wicket:id="category"/>
-            </div>
-
-            <span class="btn-group">
-                <a class="btn btn-danger btn-sm" wicket:message="title:PageBase.button.tooltip.clearSearch"
-                   wicket:id="searchClear">
-                    <i class="fa fa-remove"/>
-                </a>
-            </span>
-        </form>
-    </wicket:fragment>
 </wicket:extend>
 </body>
 </html>