Merge remote-tracking branch 'origin/master' into feature/form-evolution

Evolveum · Jun 26, 2018 · f8b0424 · f8b0424
2 parents bcc5acc + e8a5eed
commit f8b0424
Show file tree

Hide file tree

Showing 14 changed files with 278 additions and 295 deletions.
diff --git a/dist/src/main/bin/ninja.sh b/dist/src/main/bin/ninja.sh
@@ -37,15 +37,17 @@ cd "$PRGDIR/.." >/dev/null
 
 cd "$SCRIPT_PATH/.."
 
-if [ ! -d var ] ; then
-	echo "ERROR: midpoint.home directory desn't exist"
-	exit 1
-else
-	MIDPOINT_HOME=$(cd "$SCRIPT_PATH../var"; pwd)
+# honor MIDPOINT_HOME variable if it exists!
+if [ -z "$MIDPOINT_HOME" ]; then
+	if [ ! -d var ] ; then
+		echo "ERROR: midpoint.home directory desn't exist"
+		exit 1
+	else
+		MIDPOINT_HOME=$(cd "$SCRIPT_PATH../var"; pwd)
+	fi
+
+	[ -z "$MIDPOINT_HOME" ] && MIDPOINT_HOME=`cd "$SCRIPT_PATH../var" >/dev/null; pwd`
 fi
-
-[ -z "$MIDPOINT_HOME" ] && MIDPOINT_HOME=`cd "$SCRIPT_PATH../var" >/dev/null; pwd`
-
 #cd "$SCRIPT_PATH../lib"
 
 if [ ! -f lib/ninja.jar ] ; then

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/api/component/AbstractAssignmentPopupTabPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/api/component/AbstractAssignmentPopupTabPanel.java
@@ -28,6 +28,7 @@
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.security.SecurityUtils;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -40,15 +41,13 @@
 /**
  * Created by honchar.
  */
-public abstract class AbstractAssignmentPopupTabPanel<O extends ObjectType> extends BasePanel {
+public abstract class AbstractAssignmentPopupTabPanel<O extends ObjectType> extends BasePanel<O> {
 
     private static final long serialVersionUID = 1L;
 
     private static final String ID_OBJECT_LIST_PANEL = "objectListPanel";
 
     private static final String DOT_CLASS = AbstractAssignmentPopupTabPanel.class.getName();
-    private static final Trace LOGGER = TraceManager.getTrace(AbstractAssignmentPopupTabPanel.class);
-    private static final String OPERATION_LOAD_ASSIGNABLE_ROLES = DOT_CLASS + "loadAssignableRoles";
 
     private ObjectTypes type;
     protected List<O> selectedObjects;
@@ -90,31 +89,7 @@ protected IModel<Boolean> getCheckBoxEnableModel(IModel<SelectableBean<O>> rowMo
 
             @Override
             protected ObjectQuery addFilterToContentQuery(ObjectQuery query) {
-                if (type.equals(RoleType.COMPLEX_TYPE)) {
-                    LOGGER.debug("Loading roles which the current user has right to assign");
-                    Task task = AbstractAssignmentPopupTabPanel.this.getPageBase().createSimpleTask(OPERATION_LOAD_ASSIGNABLE_ROLES);
-                    OperationResult result = task.getResult();
-                    ObjectFilter filter = null;
-                    try {
-                        ModelInteractionService mis = AbstractAssignmentPopupTabPanel.this.getPageBase().getModelInteractionService();
-                        RoleSelectionSpecification roleSpec =
-                                mis.getAssignableRoleSpecification(SecurityUtils.getPrincipalUser().getUser().asPrismObject(), task, result);
-                        filter = roleSpec.getFilter();
-                    } catch (Exception ex) {
-                        LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load available roles", ex);
-                        result.recordFatalError("Couldn't load available roles", ex);
-                    } finally {
-                        result.recomputeStatus();
-                    }
-                    if (!result.isSuccess() && !result.isHandledError()) {
-                        AbstractAssignmentPopupTabPanel.this.getPageBase().showResult(result);
-                    }
-                    if (query == null){
-                        query = new ObjectQuery();
-                    }
-                    query.addFilter(filter);
-                }
-                return query;
+                return AbstractAssignmentPopupTabPanel.this.addFilterToContentQuery(query);
             }
 
         };
@@ -129,9 +104,7 @@ public boolean isVisible(){
         return listPanel;
     }
 
-    protected PopupObjectListPanel getObjectListPanel(){
-        return (PopupObjectListPanel)get(ID_OBJECT_LIST_PANEL);
-    }
+    protected abstract void initParametersPanel();
 
     protected List getSelectedObjectsList(){
         PopupObjectListPanel objectListPanel = getObjectListPanel();
@@ -141,15 +114,23 @@ protected List getSelectedObjectsList(){
         return objectListPanel.getSelectedObjects();
     }
 
+    protected PopupObjectListPanel getObjectListPanel(){
+        return (PopupObjectListPanel)get(ID_OBJECT_LIST_PANEL);
+    }
+
+    protected void onSelectionPerformed(AjaxRequestTarget target){}
+
     protected IModel<Boolean> getObjectSelectCheckBoxEnableModel(IModel<SelectableBean<O>> rowModel){
         return Model.of(true);
     }
 
-    protected boolean isObjectListPanelVisible(){
-        return true;
+    protected ObjectQuery addFilterToContentQuery(ObjectQuery query){
+        return query;
     }
 
-    protected abstract void initParametersPanel();
+    protected abstract List<AssignmentType> getSelectedAssignmentsList();
 
-    protected void onSelectionPerformed(AjaxRequestTarget target){}
+    protected boolean isObjectListPanelVisible(){
+        return true;
+    }
 }