Merge branch 'master' into feature/groovy-sandbox

Evolveum · Apr 1, 2019 · d12edcf · d12edcf
2 parents e504f49 + 8d5b6b2
commit d12edcf
Show file tree

Hide file tree

Showing 85 changed files with 1,297 additions and 947 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.html b/.../src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.html
@@ -22,7 +22,7 @@
             <label>
                 <wicket:message key="roleMemberPanel.type"/>
             </label>
-            <select class="form-control input-sm" wicket:id="type"/>
+            <div wicket:id="type"/>
         </div>
     </div>
 </wicket:extend>

diff --git a/.../src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java b/.../src/main/java/com/evolveum/midpoint/gui/api/component/MultiTypesMemberPopupTabPanel.java
@@ -22,13 +22,15 @@
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.form.DropDownChoice;
 import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
+import org.apache.wicket.model.Model;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
@@ -59,20 +61,19 @@ protected void onInitialize(){
         typePanel.setOutputMarkupId(true);
         add(typePanel);
 
-        DropDownChoice<ObjectTypes> typeSelect = new DropDownChoice<>(ID_TYPE, new LoadableModel<ObjectTypes>() {
+        DropDownChoicePanel<ObjectTypes> typeSelect = new DropDownChoicePanel<ObjectTypes>(ID_TYPE, new LoadableModel<ObjectTypes>() {
             @Override
             protected ObjectTypes load() {
                 return defaultObjectType;
             }
-        },
-                getSupportedTypesList(), new EnumChoiceRenderer<>(this));
-        typeSelect.add(new OnChangeAjaxBehavior() {
+        }, Model.ofList(getSupportedTypesList()), new EnumChoiceRenderer<>(this));
+        typeSelect.getBaseFormComponent().add(new OnChangeAjaxBehavior() {
 
             private static final long serialVersionUID = 1L;
 
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
-                defaultObjectType = typeSelect.getModelObject();
+                defaultObjectType = typeSelect.getModel().getObject();
                 MultiTypesMemberPopupTabPanel.this.addOrReplace(initObjectListPanel());
                 target.add(MultiTypesMemberPopupTabPanel.this);
             }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
@@ -155,7 +155,7 @@ protected void configure(HttpSecurity http) throws Exception {
         }
 
         http.headers().disable();
-        http.headers().frameOptions().deny();
+        http.headers().frameOptions().sameOrigin();
 
         if (Arrays.stream(environment.getActiveProfiles()).anyMatch(p -> p.equalsIgnoreCase("cas"))) {
             http.addFilterAt(casFilter(), CasAuthenticationFilter.class);

diff --git a/.../com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanelChainedModel.html b/.../com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanelChainedModel.html
diff --git a/.../com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanelChainedModel.java b/.../com/evolveum/midpoint/web/component/assignment/ConstructionDetailsPanelChainedModel.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
@@ -119,7 +119,7 @@ protected Item<T> newRowItem(String id, int index, IModel<T> rowModel) {
 
 		box.add(createHeader(ID_HEADER));
 		WebMarkupContainer footer = createFooter(ID_FOOTER);
-		footer.add(new VisibleBehaviour(() -> isFooterVisible(provider.size(), pageSize)));
+		footer.add(new VisibleBehaviour(() -> !hideFooterIfSinglePage() ||  provider.size() > pageSize));
 		box.add(footer);
 	}
 
@@ -136,8 +136,8 @@ protected Item<T> customizeNewRowItem(Item<T> item, IModel<T> model) {
 		return item;
 	}
 
-	protected boolean isFooterVisible(long providerSize, int pageSize){
-		return true;
+	protected boolean hideFooterIfSinglePage(){
+		return false;
 	}
 
 	@Override

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
@@ -167,8 +167,8 @@ public Date getObject() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			protected boolean isFooterVisible(long providerSize, int pageSize){
-				return WorkItemsPanel.this.isFooterVisible(providerSize, pageSize);
+			protected boolean hideFooterIfSinglePage(){
+				return WorkItemsPanel.this.hideFooterIfSinglePage();
 			}
 		};
 		workItemsTable.setAdditionalBoxCssClasses("without-box-header-top-border");
@@ -350,7 +350,7 @@ public void populateItem(Item<ICellPopulator<WorkItemDto>> item, String componen
 		};
 	}
 
-	protected boolean isFooterVisible(long providerSize, int pageSize){
-		return true;
+	protected boolean hideFooterIfSinglePage(){
+		return false;
 	}
 }