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

Evolveum · Jul 18, 2014 · ef641e2 · ef641e2
2 parents 7f4996b + 9588a4d
commit ef641e2
Show file tree

Hide file tree

Showing 31 changed files with 936 additions and 140 deletions.
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java b/...-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
@@ -19,6 +19,7 @@
 import com.evolveum.midpoint.model.api.ModelInteractionService;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.model.api.TaskService;
+import com.evolveum.midpoint.model.api.WorkflowService;
 import com.evolveum.midpoint.prism.query.ObjectPaging;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.prism.query.OrderDirection;
@@ -29,7 +30,6 @@
 import com.evolveum.midpoint.web.page.PageBase;
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
-import com.evolveum.midpoint.wf.api.WorkflowManager;
 import org.apache.commons.lang.Validate;
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder;
@@ -89,9 +89,9 @@ protected ModelInteractionService getModelInteractionService() {
         return application.getModelInteractionService();
     }
 
-    protected WorkflowManager getWorkflowService() {
+    protected WorkflowService getWorkflowService() {
         MidPointApplication application = (MidPointApplication) MidPointApplication.get();
-        return application.getWorkflowManager();
+        return application.getWorkflowService();
     }
 
     public List<T> getAvailableData() {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.java
@@ -24,6 +24,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectFactory;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OperationResultType;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.Validate;
 
 import java.io.PrintWriter;
@@ -34,8 +35,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.xml.bind.JAXBException;
-
 /**
  * @author lazyman
  */
@@ -104,8 +103,10 @@ public OpResult(OperationResult result) {
         	OperationResultType resultType = result.createOperationResultType();
         	ObjectFactory of = new ObjectFactory();
 			xml = getPrismContext().serializeAtomicValue(of.createOperationResult(resultType), PrismContext.LANG_XML);
-		} catch (SchemaException ex) {
-			error("Can't create xml: " + ex);
+		} catch (SchemaException|RuntimeException ex) {
+            String m = "Can't create xml: " + ex;
+			error(m);
+            xml = "<?xml version='1.0'?><message>" + StringEscapeUtils.escapeXml(m) + "</message>";
         }
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
@@ -24,6 +24,7 @@
 import com.evolveum.midpoint.model.api.ModelInteractionService;
 import com.evolveum.midpoint.model.api.ModelService;
 import com.evolveum.midpoint.model.api.TaskService;
+import com.evolveum.midpoint.model.api.WorkflowService;
 import com.evolveum.midpoint.prism.Objectable;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
@@ -68,6 +69,8 @@ public abstract class PageBase extends PageTemplate {
     private ModelDiagnosticService modelDiagnosticService;
     @SpringBean(name = "taskManager")
     private TaskManager taskManager;
+    @SpringBean(name = "modelController")
+    private WorkflowService workflowService;
     @SpringBean(name = "workflowManager")
     private WorkflowManager workflowManager;
     @SpringBean(name = "midpointConfiguration")
@@ -102,6 +105,10 @@ protected TaskManager getTaskManager() {
         return taskManager;
     }
 
+    protected WorkflowService getWorkflowService() {
+        return workflowService;
+    }
+
     protected WorkflowManager getWorkflowManager() {
         return workflowManager;
     }

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.html
@@ -16,9 +16,29 @@
   -->
 
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+<head>
+    <!-- TODO - clean this up to some CSS file + unite fonts and style with the rest of the page -->
+    <wicket:head>
+        <style>
+            div.wicket-aa {
+                font-family: "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
+                font-size: 12px;
+                background-color: white;
+                border-width: 1px;
+                border-color: #cccccc;
+                border-style: solid;
+                padding: 2px;
+                margin: 1px 0 0 0;
+                text-align:left;
+            }
+            div.wicket-aa ul { list-style:none; padding: 2px; margin:0; }
+            div.wicket-aa ul li.selected { background-color: #FFFF00; padding: 2px; margin:0; }
+        </style>
+    </wicket:head>
+</head>
 <body>
 <wicket:extend>
-    <form class="form-horizontal" wicket:id="mainForm">
+    <form class="clearfix form-horizontal" wicket:id="mainForm">
         <div class="form-group">
             <label class="col-lg-2 control-label"><wicket:message key="PageAccounts.resource"/></label>
 
@@ -68,17 +88,36 @@ <h3><wicket:message key="PageAccounts.summary"/></h3>
             </tr>
             </tbody>
         </table>
+    </form>
+
+    <h3><wicket:message key="PageAccounts.shadows"/></h3>
+
+    <form class="clearfix form-inline pull-right search-form" wicket:id="searchForm" >
+        <div class="form-group">
+            <label class="sr-only"><wicket:message key="PageAccounts.accounts.kind" /></label>
+            <select class="form-control input-sm" wicket:id="kindSearch" />
+        </div>
+
+        <div class="form-group">
+            <label class="sr-only"><wicket:message key="PageAccounts.accounts.intent" /></label>
+            <select class="form-control input-sm" wicket:id="intentSearch" />
+        </div>
 
-        <h3><wicket:message key="PageAccounts.shadows"/></h3>
+        <div class="form-group">
+            <label class="sr-only"><wicket:message key="PageAccounts.accounts.objectClass" /></label>
+            <input class="form-control input-sm" wicket:id="objectClassSearch" size="45"/>
+        </div>
+
+        <div wicket:id="basicSearch" />
+    </form>
+
+    <form class="clearfix form-horizontal" wicket:id="accountForm">
         <div wicket:id="accountsContainer">
             <div wicket:id="accounts"/>
         </div>
 
-        <wicket:remove>
-            <!-- todo improve this, it's just a left-over from old gui -->
-        </wicket:remove>
-
         <hr/>
+
         <div class="main-button-bar">
             <a class="btn btn-primary" wicket:id="clearExport">
                 <wicket:message key="PageAccounts.button.clearExportFolder"/></a>
@@ -89,6 +128,7 @@ <h3><wicket:message key="PageAccounts.shadows"/></h3>
             </span>
         </div>
     </form>
+
 </wicket:extend>
 </body>
 </html>