Merge remote-tracking branch 'origin/master'

Evolveum · Apr 21, 2016 · e87fda0 · e87fda0
2 parents 68785dd + 2983f47
commit e87fda0
Show file tree

Hide file tree

Showing 22 changed files with 1,405 additions and 2,152 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -95,8 +95,10 @@ private void initLayout(final MainObjectListPanel mainObjectListPanel) {
 
                 @Override
                 public void onClick(AjaxRequestTarget target) {
-                    Table table = mainObjectListPanel.getTable();
-                    target.add((Component) table);
+                	mainObjectListPanel.clearCache();
+                	mainObjectListPanel.refreshTable(mainObjectListPanel.getType(), target);
+
+                    target.add((Component) mainObjectListPanel.getTable());
                 }
             };
             add(refreshIcon);

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
@@ -72,9 +72,7 @@
 public abstract class ObjectListPanel<T extends ObjectType> extends BasePanel<T> {
 	private static final long serialVersionUID = 1L;
 
-	// private static final String ID_SEARCH_FORM = "searchForm";
 	private static final String ID_MAIN_FORM = "mainForm";
-	private static final String ID_BUTTON_CANCEL = "cancelButton";
 
 	private static final String ID_TABLE = "table";
 
@@ -108,8 +106,6 @@ public Class<T> getType() {
 		storageMap.put(PageReports.class, SessionStorage.KEY_REPORTS);
 		storageMap.put(PageRoles.class, SessionStorage.KEY_ROLES);
 		storageMap.put(PageServices.class, SessionStorage.KEY_SERVICES);
-		// storageMap.put(ObjectType.class, SessionStorage.KEY_CONFIGURATION);
-		// storageMap.put(FocusType.class, SessionStorage.KEY_ROLE_MEMBERS);
 
 	}
 
@@ -187,7 +183,6 @@ public Search load() {
 		BoxedTablePanel<SelectableBean<T>> table = createTable();
 		mainForm.add(table);
 
-		// saveSearch();
 	}
 
 	protected BaseSortableDataProvider<SelectableBean<T>> getProvider() {
@@ -237,23 +232,6 @@ private BoxedTablePanel<SelectableBean<T>> createTable() {
 			@Override
 			protected WebMarkupContainer createHeader(String headerId) {
 				return initSearch(headerId);
-//				SearchFormPanel searchPanel = new SearchFormPanel(headerId, searchModel) {
-//
-//					private static final long serialVersionUID = 1L;
-//
-//					@Override
-//					protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
-//						ObjectListPanel.this.searchPerformed(query, target);
-//					}
-//
-//				};
-////				searchPanel.add(new VisibleEnableBehaviour() {
-////					@Override
-////					public boolean isVisible() {
-////						return !type.equals(ObjectType.class);
-////					}
-////				});
-//				return searchPanel;
 			}
 
 			@Override
@@ -269,7 +247,7 @@ protected WebMarkupContainer createButtonToolbar(String id) {
 			}
 		};
 		table.setOutputMarkupId(true);
-		String storageKey = getStorageKey();//storageMap.get(type);
+		String storageKey = getStorageKey();
 		if (StringUtils.isNotEmpty(storageKey)) {
 			PageStorage storage = getSession().getSessionStorage().getPageStorageMap().get(storageKey);
 			if (storage != null) {
@@ -365,12 +343,7 @@ protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
 			}
 
 		};
-//		searchPanel.add(new VisibleEnableBehaviour() {
-//			@Override
-//			public boolean isVisible() {
-//				return !type.equals(ObjectType.class);
-//			}
-//		});
+
 		return searchPanel;
 	}
 
@@ -390,7 +363,11 @@ private void saveSearchModel(){
 	}
 
 	public void clearCache() {
-		getDataProvider().clearCache();
+		BaseSortableDataProvider provider = getDataProvider();
+		provider.clearCache();
+		if (provider instanceof ObjectDataProvider2){
+			((ObjectDataProvider2) provider).clearSelectedObjects();
+		}
 	}
 
 	public ObjectQuery getQuery() {
@@ -416,8 +393,6 @@ public StringResourceModel createStringResource(String resourceKey, Object... ob
 	protected abstract List<IColumn<SelectableBean<T>, String>> createColumns();
 	protected abstract List<InlineMenuItem> createInlineMenu();
 
-	// protected abstract void saveSearch(ObjectPaging paging);
-
 	protected List<IColumn<SelectableBean<T>, String>> initColumns() {
 		List<IColumn<SelectableBean<T>, String>> columns = new ArrayList<IColumn<SelectableBean<T>, String>>();
 
@@ -438,12 +413,6 @@ protected List<IColumn<SelectableBean<T>, String>> initColumns() {
 		return columns;
 	}
 
-	private void clearSearchPerformed(AjaxRequestTarget target) {
-		BaseSortableDataProvider<SelectableBean<T>> provider = getDataProvider();
-		provider.setQuery(null);
-
-		target.add(getTable());
-	}
 
 	public void addPerformed(AjaxRequestTarget target, List<T> selected) {
 		parentPage.hideMainPopup(target);

diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java b/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java
@@ -30,11 +30,10 @@
 
 public class DropdownButtonPanel extends BasePanel<DropdownButtonDto>{
 
-	private static final String ID_BUTTON = "button";
+	private static final long serialVersionUID = 1L;
 	private static final String ID_INFO = "info";
 	private static final String ID_ICON = "icon";
 	private static final String ID_LABEL = "label";
-	private static final String ID_MENU = "menu";
 
 	private static String ID_MENU_ITEM = "menuItem";
     private static String ID_MENU_ITEM_BODY = "menuItemBody";

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java
@@ -171,6 +171,33 @@ public static String runTask(TaskType taskToRun, Task operationalTask, Operation
 
     }
 
+    public static void runTask(Collection<TaskType> tasksToRun, Task operationalTask, OperationResult parentResult, PageBase pageBase){
+//    	try {
+
+    		for (TaskType taskToRun : tasksToRun){
+    			runTask(tasksToRun, operationalTask, parentResult, pageBase);
+    		}
+
+//    		}
+//			ObjectDelta<TaskType> delta = ObjectDelta.createAddDelta(taskToRun.asPrismObject());
+//			pageBase.getPrismContext().adopt(delta);
+//			pageBase.getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null,
+//					operationalTask, parentResult);
+//			parentResult.recordInProgress();
+//			parentResult.setBackgroundTaskOid(delta.getOid());
+//			pageBase.showResult(parentResult);
+//	    	return delta.getOid();
+//		} catch (ObjectAlreadyExistsException | ObjectNotFoundException | SchemaException
+//				| ExpressionEvaluationException | CommunicationException | ConfigurationException
+//				| PolicyViolationException | SecurityViolationException e) {
+//			// TODO Auto-generated catch block
+////			error(pageBase.getString("pageUsers.message.nothingSelected") + e.getMessage());
+//			parentResult.recordFatalError("Couldn't run task " + e.getMessage(), e);
+//			LoggingUtils.logException(LOGGER, "Couldn't run task " + e.getMessage(), e);
+//			return null;
+//		}
+
+    }
 
     public static <T extends ObjectType> PrismObject<T> loadObject(Class<T> type, String oid,
                                                                    PageBase page, Task task, OperationResult result) {

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider2.java
@@ -70,6 +70,10 @@ public ObjectDataProvider2(Component component, Class<T> type) {
         this.type = type;
     }
 
+    public void clearSelectedObjects(){
+    	selected.clear();
+    }
+
     public List<T> getSelectedData() {
     	preprocessSelectedDataInternal();
     	for (Serializable s : super.getAvailableData()){
@@ -174,9 +178,7 @@ public W createDataObjectWrapper(T obj) {
     			selectable.setSelected(true);
     		}
     	}
-//    	if (selected.contains(obj)){
-//    		selectable.setSelected(true);
-//    	}
+
         return (W) selectable;
     }
 

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.java b/...i/src/main/java/com/evolveum/midpoint/web/component/data/column/CheckBoxHeaderColumn.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.

diff --git a/...src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuHeaderColumn.java b/...src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuHeaderColumn.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.

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/RoleMainPanel.java
@@ -19,6 +19,7 @@
 
 import org.apache.wicket.extensions.markup.html.tabs.ITab;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.model.Model;
 
 import com.evolveum.midpoint.gui.api.component.tabs.PanelTab;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
@@ -65,7 +66,7 @@ public WebMarkupContainer createPanel(String panelId) {
 			private static final long serialVersionUID = 1L;
 			@Override
 			public WebMarkupContainer createPanel(String panelId) {
-				return new RoleMemberPanel<UserType>(panelId, getObject().getOid(), getDetailsPage());
+				return new RoleMemberPanel(panelId, new Model<RoleType>(getObject().asObjectable()), getDetailsPage());
 			}
 
 			@Override

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java
@@ -70,9 +70,9 @@ protected void onEvent(final AjaxRequestTarget target) {
                                     }
                                 }
                             );
-//                            return new OrgChildrenPanel(panelId, new Model(oid), PageOrgTree.this);
-                            return createTreePanel(panelId, new Model(oid), getPageBase());
-//                            return new TreeTablePanel(panelId, new Model(oid), AbstractOrgTabPanel.this);
+                            Panel panel = createTreePanel(panelId, new Model(oid), getPageBase());
+                            panel.setOutputMarkupId(true);
+                            return panel;
                         }
 
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
@@ -16,24 +16,8 @@
   ~ limitations under the License.
   -->
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
-<!--     <div wicket:id="confirmDeletePopup" /> -->
-<!--     <div wicket:id="movePopup" /> -->
-<!--     <div wicket:id="addDeletePopup" /> -->
 
-    <!-- todo fix styles for all header with cog, it must be unified somehow !!!! [lazyman] -->
-<!--     <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"/> -->
-<!-- 	                <select class="form-control input-sm" wicket:id="searchByType"/> -->
-<!-- 	            </div> -->
-<!--                 <div wicket:id="basicSearch"/> -->
-<!--             </form> -->
-<!--         </div> -->
-        <div > <!-- class="col-md-4" -->
-<!--             <div class="box box-default"> -->
-<!--                 <div class="box-body"> -->
+        <div >
                     <div wicket:id="treeHeader" class="row" style="margin: 0; border-bottom: 1px solid #ddd;">
                         <div class="col-xs-9" style="padding-left: 5px;"> <!-- class="col-xs-9" style="padding-left: 5px;" -->
                             <div class="tree-table-header">
@@ -46,44 +30,7 @@
                     <div wicket:id="treeContainer" class="org-tree-container">
                         <div wicket:id="tree"/>
                     </div>
-<!--                 </div> -->
-<!--             </div> -->
-        </div>
-<!--         <div class="col-md-8"> -->
-<!--             <div class="box box-success"> -->
-<!--                 <div class="box-body"> -->
-<!--                     <form class="clearfix form-horizontal" wicket:id="form"> -->
-<!-- <!--                         <div wicket:id="childOrgContainer"> --> 
-<!-- <!--                             <div class="tree-table-header"> --> 
-<!-- <!--                                 <wicket:message key="TreeTablePanel.childOrg"/> --> 
-<!-- <!--                             </div> --> 
-<!-- <!--                             <div wicket:id="childUnitTable" about="childUnitTable"/> --> 
-<!-- <!--                         </div> --> 
-
-<!--                         <div wicket:id="managerContainer"> -->
-<!--                         <div class="tree-table-header"> -->
-<!--                                 <wicket:message key="TreeTablePanel.managers"/> -->
-<!--                             </div> -->
-<!--                             <div class="col-md-12" wicket:id="managerTable"> -->
-<!--                             <div class="pull-right"> -->
-<!--                             	<div wicket:id="editManager" class="fa fa-edit"></div> -->
-<!--                             	<div wicket:id="removeManager" class="fa fa-trash-o"></div> -->
-<!--                             	</div> -->
-<!--                             	<div wicket:id="managerSummary" ></div> -->
-
-<!--                             </div> -->
-<!--                         </div> -->
 
-<!--                         <div wicket:id="memberContainer"> -->
-<!--                             <div class="tree-table-header"> -->
-<!--                                 <wicket:message key="TreeTablePanel.members"/> -->
-<!--                             </div> -->
-<!--                             <div wicket:id="memberTable"/> -->
-<!--                         </div> -->
+        </div>
 
-<!--                     </form> -->
-<!--                 </div> -->
-<!--             </div> -->
-<!--         </div> -->
-<!--     </div> -->
 </wicket:panel>