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

Evolveum · Jul 12, 2017 · 4ee7c0d · 4ee7c0d
2 parents ba6edbe + b800a23
commit 4ee7c0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.html b/...n-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableConfigurationPanel.html
@@ -34,18 +34,15 @@
         <h3 class="popover-title"><wicket:message key="PageSizePopover.title"/></h3>
         <div class="popover-content">
             <form wicket:id="form">
-             	<div class="row">
-       	 			<span wicket:id="inputFeedback" class="text-danger"/>
-   				</div>
+                <span wicket:id="inputFeedback" class="text-danger"/>
                 <div class="input-group">
-                    <input wicket:id="input" type="text" size="1" style="display: inline-block; width: auto;"
+                    <input wicket:id="input" type="text" size="3" style="display: inline-block; width: auto;"
                            class="form-control input-sm">
-
-                    <span class="input-group-btn">
+                    <div class="input-group-btn" style="width: auto;">
                         <button wicket:id="button" type="button" class="btn btn-sm btn-success">
                             <i class="fa fa-check"></i>
                         </button>
-                    </span>
+                    </div>
                 </div>
             </form>
         </div>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
@@ -58,6 +58,7 @@ public class SearchFactory {
                 new ItemPath(FocusType.F_ACTIVATION, ActivationType.F_ADMINISTRATIVE_STATUS),
                 new ItemPath(FocusType.F_ACTIVATION, ActivationType.F_EFFECTIVE_STATUS)));
         SEARCHABLE_OBJECTS.put(UserType.class, Arrays.asList(
+                new ItemPath(UserType.F_TITLE),
                 new ItemPath(UserType.F_GIVEN_NAME),
                 new ItemPath(UserType.F_FAMILY_NAME),
                 new ItemPath(UserType.F_FULL_NAME),