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

Evolveum · Sep 7, 2018 · 278274b · 278274b
2 parents e9f9f1f + 0b1d980
commit 278274b
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 32 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -53,6 +53,7 @@
             <artifactId>admin-gui</artifactId>
             <version>3.9-SNAPSHOT</version>
             <type>war</type>
+            <classifier>executable</classifier>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.tools</groupId>

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -104,35 +104,6 @@
                 </includes>
             </testResource>
         </testResources>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <configuration>
-                    <fork>true</fork>
-                    <skip>false</skip>
-                    <jvmArguments>-Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments><!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                        <configuration>
-                            <layoutFactory implementation="com.evolveum.midpoint.tools.layout.MidPointWarLayoutFactory"/>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.evolveum.midpoint</groupId>
-                        <artifactId>midpoint-war-layout</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
     </build>
 
     <dependencies>
@@ -911,13 +882,52 @@
             <version>3.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
+
     <profiles>
         <profile>
-            <id>tomcat</id>
+            <id>executable</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.springframework.boot</groupId>
+                        <artifactId>spring-boot-maven-plugin</artifactId>
+                        <version>${spring.boot.version}</version>
+                        <configuration>
+                            <fork>true</fork>
+                            <skip>false</skip>
+                            <jvmArguments>-Dserver.port=${server.port} -Dmidpoint.home=${midpoint.home} -Dmidpoint.schrodinger=${midpoint.schrodinger} -Djavax.net.ssl.trustStore=${javax.net.ssl.trustStore} -Djavax.net.ssl.trustStoreType=${javax.net.ssl.trustStoreType}</jvmArguments><!-- TODO question: CAN this argument be active by default, or should be there a different profile defined for this? -->
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>repackage</goal>
+                                </goals>
+                                <configuration>
+                                    <classifier>executable</classifier>
+                                    <layoutFactory implementation="com.evolveum.midpoint.tools.layout.MidPointWarLayoutFactory"/>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.evolveum.midpoint</groupId>
+                                <artifactId>midpoint-war-layout</artifactId>
+                                <version>${project.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
 
+        <profile>
+            <id>tomcat</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <dependencies>
                 <dependency>
                     <artifactId>jaxb-impl</artifactId>
@@ -934,8 +944,8 @@
                     <scope>runtime</scope>
                 </dependency>
             </dependencies>
-
         </profile>
+
         <profile>
             <!-- can be used for development e.g. in Intellij Idea -->
             <id>ide</id>

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
@@ -77,6 +77,7 @@ protected ObjectQuery createMemberQuery(boolean indirect, Collection<QName> rela
 			else {
 				ObjectReferenceType ref = MemberOperationsHelper.createReference(getModelObject(), getSelectedRelation());
 				return QueryBuilder.queryFor(searchType.getClassDefinition(), getPageBase().getPrismContext())
+						.type(searchType.getClassDefinition())
 						.isDirectChildOf(ref.asReferenceValue()).build();
 			}
 		}
@@ -85,6 +86,7 @@ protected ObjectQuery createMemberQuery(boolean indirect, Collection<QName> rela
 
 		ObjectReferenceType ref = MemberOperationsHelper.createReference(getModelObject(), getSelectedRelation());
 		ObjectQuery query = QueryBuilder.queryFor(searchType.getClassDefinition(), getPageBase().getPrismContext())
+				.type(searchType.getClassDefinition())
 				.isChildOf(ref.asReferenceValue()).build();
 
 		if (LOGGER.isTraceEnabled()) {

diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
@@ -729,7 +729,7 @@ body .treeview-menu > li > span:hover {
 }
 
 .navbar-ajax {
-	display: inline-block;
+	float: left;
 
 	& #ajax_busy {
 		margin-top: 12px;