Merge remote-tracking branch 'origin/master'

Evolveum · Apr 26, 2016 · 1449467 · 1449467
2 parents b6b5ac5 + cbef010
commit 1449467
Show file tree

Hide file tree

Showing 28 changed files with 492 additions and 912 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusBrowserPanel.html
@@ -25,5 +25,7 @@
 	</div>
 
 	<div wicket:id="table"></div>
-	<a class="btn btn-sm btn-primary"  wicket:id="addButton"/>
+	<div class="center">
+		<a class="btn btn-sm btn-primary"  wicket:id="addButton"/>
+	</div>
 </wicket:panel>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
@@ -64,6 +64,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 
 /**
@@ -88,7 +89,7 @@ public abstract class ObjectListPanel<T extends ObjectType> extends BasePanel<T>
 	private Collection<SelectorOptions<GetOperationOptions>> options;
 
 	private int pageSize = 10;
-	
+
 	private boolean multiselect;
 
 	private TableId tableId = TableId.TABLE_USERS;
@@ -117,9 +118,8 @@ public ObjectListPanel(String id, Class<T> type, Collection<SelectorOptions<GetO
 		this.options = options;
 		initLayout();
 	}
-
-	ObjectListPanel(String id, Class<T> type, boolean multiselect,
-			PageBase parentPage) {
+
+	ObjectListPanel(String id, Class<T> type, boolean multiselect, PageBase parentPage) {
 		super(id);
 		this.type = type;
 		this.parentPage = parentPage;
@@ -130,7 +130,7 @@ public ObjectListPanel(String id, Class<T> type, Collection<SelectorOptions<GetO
 	public boolean isMultiselect() {
 		return multiselect;
 	}
-	
+
 	public void setProvider(BaseSortableDataProvider<SelectableBean<T>> provider) {
 		this.provider = provider;
 	}
@@ -143,7 +143,6 @@ public void setTableId(TableId tableId) {
 		this.tableId = tableId;
 	}
 
-
 	public List<T> getSelectedObjects() {
 		BaseSortableDataProvider<SelectableBean<T>> dataProvider = getDataProvider();
 		if (dataProvider instanceof ObjectDataProvider2) {
@@ -164,7 +163,7 @@ private void initLayout() {
 
 			@Override
 			public Search load() {
-				String storageKey = getStorageKey();//storageMap.get(parentPage.getClass());
+				String storageKey = getStorageKey();// storageMap.get(parentPage.getClass());
 				Search search = null;
 				if (StringUtils.isNotEmpty(storageKey)) {
 					PageStorage storage = getSession().getSessionStorage().getPageStorageMap()
@@ -193,7 +192,7 @@ protected BaseSortableDataProvider<SelectableBean<T>> getProvider() {
 				parentPage, type) {
 			@Override
 			protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) {
-				String storageKey = getStorageKey();//storageMap.get(type);
+				String storageKey = getStorageKey();// storageMap.get(type);
 				if (StringUtils.isNotEmpty(storageKey)) {
 					PageStorage storage = getSession().getSessionStorage().getPageStorageMap()
 							.get(storageKey);
@@ -207,13 +206,21 @@ protected void saveProviderPaging(ObjectQuery query, ObjectPaging paging) {
 			public SelectableBean<T> createDataObjectWrapper(T obj) {
 				SelectableBean<T> bean = super.createDataObjectWrapper(obj);
 				List<InlineMenuItem> inlineMenu = createInlineMenu();
-				if (inlineMenu != null){
+				if (inlineMenu != null) {
 					bean.getMenuItems().addAll(inlineMenu);
 				}
 				return bean;
 			}
 		};
-		if (options != null) {
+		if (options == null){
+			if (ResourceType.class.equals(type)) {
+				options = SelectorOptions.createCollection(GetOperationOptions.createNoFetch());
+			}
+		} else {
+			if (ResourceType.class.equals(type)) {
+				GetOperationOptions root = SelectorOptions.findRootOptions(options);
+				root.setNoFetch(Boolean.TRUE);
+			}
 			objProvider.setOptions(options);
 		}
 		provider = objProvider;
@@ -233,15 +240,15 @@ private BoxedTablePanel<SelectableBean<T>> createTable() {
 			protected WebMarkupContainer createHeader(String headerId) {
 				return initSearch(headerId);
 			}
-			
+
 			@Override
 			protected String getBoxCssClasses() {
 				return ObjectListPanel.this.getBoxCssClasses();
 			}
 
 			@Override
 			protected WebMarkupContainer createButtonToolbar(String id) {
-				WebMarkupContainer bar =  ObjectListPanel.this.createTableButtonToolbar(id);
+				WebMarkupContainer bar = ObjectListPanel.this.createTableButtonToolbar(id);
 
 				return bar != null ? bar : super.createButtonToolbar(id);
 			}
@@ -264,7 +271,7 @@ protected String getBoxCssClasses() {
 
 	/**
 	 * there's no way to do it properly...
-     */
+	 */
 	@Deprecated
 	protected WebMarkupContainer createTableButtonToolbar(String id) {
 		return null;
@@ -281,8 +288,8 @@ private BaseSortableDataProvider<SelectableBean<T>> getDataProvider() {
 	protected BoxedTablePanel<SelectableBean<T>> getTable() {
 		return (BoxedTablePanel<SelectableBean<T>>) get(createComponentPath(ID_MAIN_FORM, ID_TABLE));
 	}
-	
-	private String getStorageKey(){
+
+	private String getStorageKey() {
 		return storageMap.get(parentPage.getClass());
 	}
 
@@ -307,32 +314,31 @@ private void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
 		target.add(parentPage.getFeedbackPanel());
 
 	}
-	
+
 	public void refreshTable(Class<T> newType, AjaxRequestTarget target) {
 		BaseSortableDataProvider<SelectableBean<T>> provider = getDataProvider();
 		provider.setQuery(getQuery());
-		if (newType !=null && provider instanceof ObjectDataProvider2){
+		if (newType != null && provider instanceof ObjectDataProvider2) {
 			((ObjectDataProvider2) provider).setType(newType);
 		}
-		
-		if (newType != null && !this.type.equals(newType)){
+
+		if (newType != null && !this.type.equals(newType)) {
 			this.type = newType;
 			searchModel.reset();
 		} else {
 			saveSearchModel();
 		}
-
-
+
 		BoxedTablePanel table = getTable();
-		
-		((WebMarkupContainer)table.get("box")).addOrReplace(initSearch("header"));
+
+		((WebMarkupContainer) table.get("box")).addOrReplace(initSearch("header"));
 		table.setCurrentPage(null);
 		target.add((Component) table);
 		target.add(parentPage.getFeedbackPanel());
 
 	}
-	
-	private SearchFormPanel initSearch(String headerId){
+
+	private SearchFormPanel initSearch(String headerId) {
 		SearchFormPanel searchPanel = new SearchFormPanel(headerId, searchModel) {
 
 			private static final long serialVersionUID = 1L;
@@ -346,8 +352,8 @@ protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
 
 		return searchPanel;
 	}
-	
-	private void saveSearchModel(){
+
+	private void saveSearchModel() {
 		String storageKey = getStorageKey();
 		if (StringUtils.isNotEmpty(storageKey)) {
 			PageStorage storage = getSession().getSessionStorage().getPageStorageMap().get(storageKey);
@@ -365,7 +371,7 @@ private void saveSearchModel(){
 	public void clearCache() {
 		BaseSortableDataProvider provider = getDataProvider();
 		provider.clearCache();
-		if (provider instanceof ObjectDataProvider2){
+		if (provider instanceof ObjectDataProvider2) {
 			((ObjectDataProvider2) provider).clearSelectedObjects();
 		}
 	}
@@ -379,13 +385,13 @@ public ObjectQuery getQuery() {
 	protected ObjectQuery createContentQuery() {
 		Search search = searchModel.getObject();
 		ObjectQuery query = search.createObjectQuery(parentPage.getPrismContext());
-        query = addFilterToContentQuery(query);
+		query = addFilterToContentQuery(query);
 		return query;
 	}
 
-    protected ObjectQuery addFilterToContentQuery(ObjectQuery query){
-        return query;
-    }
+	protected ObjectQuery addFilterToContentQuery(ObjectQuery query) {
+		return query;
+	}
 
 	public StringResourceModel createStringResource(String resourceKey, Object... objects) {
 		return PageBase.createStringResourceStatic(this, resourceKey, objects);
@@ -396,6 +402,7 @@ public StringResourceModel createStringResource(String resourceKey, Object... ob
 	protected abstract IColumn<SelectableBean<T>, String> createNameColumn();
 
 	protected abstract List<IColumn<SelectableBean<T>, String>> createColumns();
+
 	protected abstract List<InlineMenuItem> createInlineMenu();
 
 	protected List<IColumn<SelectableBean<T>, String>> initColumns() {
@@ -418,11 +425,8 @@ protected List<IColumn<SelectableBean<T>, String>> initColumns() {
 		return columns;
 	}
 
-
 	public void addPerformed(AjaxRequestTarget target, List<T> selected) {
 		parentPage.hideMainPopup(target);
 	}
 
-
-
 }
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/TypedAssignablePanel.java
@@ -162,12 +162,19 @@ private Label  createCountLabel(String id, ObjectListPanel panel){
 	protected void onClick(AjaxRequestTarget target, T focus) {
 		parentPage.hideMainPopup(target);
 	}
+
+	private void refreshCounts(AjaxRequestTarget target) {
+		addOrReplace(createCountContainer());
+		target.add(get(ID_COUNT_CONTAINER));
+	}
 
 	private PopupObjectListPanel<T> createObjectListPanel(String id, final String countId, final QName type) {
 		PopupObjectListPanel<T> listPanel = new PopupObjectListPanel<T>(id, qnameToCompileTimeClass(type), true, parentPage) {
 			@Override
 			protected void onUpdateCheckbox(AjaxRequestTarget target) {
-				target.add(getParent().getParent().addOrReplace(createCountContainer()));
+				refreshCounts(target);
+//				TypedAssignablePanel.this.get(ID_COUNT_CONTAINER)
+//				target.add(getParent().getParent().addOrReplace(createCountContainer()));
 			}
 
 		};

diff --git a/...nt/web/component/input/PasswordPanel.html → ...api/component/password/PasswordPanel.html b/...nt/web/component/input/PasswordPanel.html → ...api/component/password/PasswordPanel.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2016 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/...nt/web/component/input/PasswordPanel.java → ...api/component/password/PasswordPanel.java b/...nt/web/component/input/PasswordPanel.java → ...api/component/password/PasswordPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-2016 Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.evolveum.midpoint.web.component.input;
+package com.evolveum.midpoint.gui.api.component.password;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,6 +45,7 @@
  * @author lazyman
  */
 public class PasswordPanel extends InputPanel {
+	private static final long serialVersionUID = 1L;
 
 	private static final String ID_LINK_CONTAINER = "linkContainer";
 	private static final String ID_PASSWORD_SET = "passwordSet";

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java
@@ -17,12 +17,12 @@
 package com.evolveum.midpoint.web.component.assignment;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.gui.api.component.password.PasswordPanel;
 import com.evolveum.midpoint.prism.PrismPropertyDefinition;
 import com.evolveum.midpoint.prism.xml.XsdTypeMapper;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.util.DOMUtil;
 import com.evolveum.midpoint.web.component.input.DatePanel;
-import com.evolveum.midpoint.web.component.input.PasswordPanel;
 import com.evolveum.midpoint.web.component.input.TextPanel;
 import com.evolveum.midpoint.web.component.input.TriStateComboPanel;
 import com.evolveum.midpoint.web.component.prism.InputPanel;

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
@@ -316,7 +316,7 @@ private void addSelectedAssignablePerformed(AjaxRequestTarget target, List<Objec
 		getPageBase().hideMainPopup(target);
 		if (newAssignments.isEmpty()) {
 			warn(getString("AssignmentTablePanel.message.noAssignmentSelected"));
-			// target.add(getPageBase().getFeedbackPanel());
+			target.add(getPageBase().getFeedbackPanel());
 			return;
 		}
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.html
@@ -17,6 +17,7 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
+
     <div class="box boxed-table" wicket:id="box">
         <div class="box-header" wicket:id="header"/>
         <div wicket:id="tableContainer" class="box-body no-padding">