Fixing orgtree search (MID-2472)

Evolveum · Oct 29, 2015 · 20ac128 · 20ac128
1 parent d84497e
commit 20ac128
Show file tree

Hide file tree

Showing 7 changed files with 355 additions and 397 deletions.
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java b/...-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
@@ -223,7 +223,7 @@ public long size() {
             addCachedSize(cache, new CachedSize(size, System.currentTimeMillis()));
         }
 
-        LOGGER.trace("end::size()");
+        LOGGER.trace("end::size(): {}", size);
         return size;
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
@@ -116,9 +116,16 @@ public Iterator<W> internalIterator(long first, long count) {
             }
             query.setPaging(paging);
 
-            LOGGER.trace("Query {} with {}", type.getSimpleName(), query.debugDump());
+            if (LOGGER.isTraceEnabled()) {
+            	LOGGER.trace("Query {} with {}", type.getSimpleName(), query.debugDump());
+            }
 
             List<PrismObject<T>> list = getModel().searchObjects(type, query, options, task, result);
+
+            if (LOGGER.isTraceEnabled()) {
+            	LOGGER.trace("Query {} resulted in {} objects", type.getSimpleName(), list.size());
+            }
+
             for (PrismObject<T> object : list) {
                 getAvailableData().add(createDataObjectWrapper(object));
             }
@@ -170,7 +177,7 @@ protected int internalSize() {
             throw new RestartResponseException(PageError.class);
         }
 
-        LOGGER.trace("end::internalSize()");
+        LOGGER.trace("end::internalSize(): {}", count);
         return count;
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2015 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,6 +21,9 @@
     <div class="row">
         <div class="col-md-12 clearfix">
             <form class="form-inline pull-right search-form" wicket:id="searchForm">
+            	<div class="form-group">
+	                <select class="form-control input-sm" wicket:id="searchScope"/>
+	            </div>
                 <div wicket:id="basicSearch"/>
             </form>
         </div>