fixed searchController and ui (#613)

imixs · Jan 9, 2025 · 69341d9 · 69341d9
1 parent 24031d0
commit 69341d9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist.xhtml b/imixs-office-workflow-app/src/main/webapp/pages/workitems/worklist.xhtml
@@ -83,19 +83,17 @@
 										value="#{message['worklist.sortorder']}: " />
 									<h:selectOneMenu style="background:#fff;"
 										value="#{searchController.searchFilter.item['sortorder']}">
-										<f:selectItem itemValue=""
+										<f:selectItem itemValue="0"
 											itemLabel="#{message['worklist.sortorder_relevance']}" />
 										<f:selectItem itemValue="3"
 											itemLabel="#{message['worklist.sortorder_lastupdate']}" />
-
 										<f:selectItem itemValue="1"
 											itemLabel="#{message['worklist.sortorder_newest']}" />
 										<f:selectItem itemValue="2"
 											itemLabel="#{message['worklist.sortorder_oldest']}" />
 
-
 										<f:ajax event="change" render="@form"
-											listener="#{searchController.refreshSearch}"
+											listener="#{viewHandler.init()}"
 											onevent="imixsOfficeMain.layoutAjaxEvent" />
 									</h:selectOneMenu>
 									<span>

diff --git a/...-office-workflow-util/src/main/java/org/imixs/workflow/office/views/SearchController.java b/...-office-workflow-util/src/main/java/org/imixs/workflow/office/views/SearchController.java
@@ -290,10 +290,18 @@ public ItemCollection getSpace() {
     public void reset() {
         defaultQuery = null;
         title = null;
+
+        String processref = "";
+        if (searchFilter != null) {
+            // restore the old processref
+            processref = searchFilter.getItemValueString("processref");
+        }
+
         searchFilter = new ItemCollection();
         searchFilter.replaceItemValue("type", "workitem");
         // set default user mode
         searchFilter.replaceItemValue("usermode", "owner");
+        searchFilter.replaceItemValue("processref", processref);
         this.setPageIndex(0);
         super.reset();
     }
@@ -329,6 +337,7 @@ public String resetSearch() {
      */
     public String refreshSearch() {
         String phrase = searchFilter.getItemValueString("phrase");
+        String processref = searchFilter.getItemValueString("processref");
 
         try {
             phrase = URLEncoder.encode(phrase, "UTF-8");
@@ -337,6 +346,9 @@ public String refreshSearch() {
             e.printStackTrace();
         }
         String action = "/pages/workitems/worklist.xhtml?faces-redirect=true&phrase=" + phrase;
+        if (!processref.isEmpty()) {
+            action = action + "&processref=" + processref;
+        }
         this.setPageIndex(0);
         return action;
     }