Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IVYPORTAL-17458 Quick Search function keeps working although it is deactivated #979

Merged
merged 2 commits into from
Sep 5, 2024
Merged

IVYPORTAL-17458 Quick Search function keeps working although it is deactivated #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53eb0e2
feature/IVYPORTAL-17458-Quick-Search-function-keeps-working-although-…
lmluat-axonivy Aug 22, 2024
737cb0c
feature/IVYPORTAL-17458-Quick-Search-function-keeps-working-although-…
lmluat-axonivy Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/CaseDashboardWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.util.stream.Collectors;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.primefaces.PrimeFaces;
import org.primefaces.model.SortMeta;
Expand Down Expand Up @@ -248,6 +249,11 @@ public void loadUserFilter() {

@Override
public void setQuickSearchKeyword() {
this.dataModel.getCriteria().setQuickSearchKeyword(this.getQuickSearchKeyword());
if (BooleanUtils.isTrue(enableQuickSearch)) {
this.dataModel.getCriteria().setQuickSearchKeyword(this.getQuickSearchKeyword());
}
else {
this.setQuickSearchKeyword(StringUtils.EMPTY);
}
}
}
9 changes: 9 additions & 0 deletions ...Portal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/CompactProcessDashboardWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import java.util.List;
import java.util.Map;

import org.apache.commons.lang.BooleanUtils;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;

Expand Down Expand Up @@ -176,4 +178,11 @@ public boolean isEnableQuickSearch() {
public void setEnableQuickSearch(boolean enableQuickSearch) {
this.enableQuickSearch = enableQuickSearch;
}

@Override
public void setQuickSearchKeyword(String quickSearchKeyword) {
if (BooleanUtils.isTrue(this.enableQuickSearch)) {
super.setQuickSearchKeyword(quickSearchKeyword);
}
}
}
9 changes: 7 additions & 2 deletions AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/TaskDashboardWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.util.stream.Collectors;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.primefaces.PrimeFaces;
import org.primefaces.model.SortMeta;
Expand Down Expand Up @@ -209,8 +210,12 @@ public void setRowsPerPage(int rowsPerPage) {

@Override
public void setQuickSearchKeyword() {
this.dataModel.getCriteria().setQuickSearchKeyword(this.getQuickSearchKeyword());
}
if (BooleanUtils.isTrue(this.enableQuickSearch)) {
this.dataModel.getCriteria().setQuickSearchKeyword(this.getQuickSearchKeyword());
}
else {
this.setQuickSearchKeyword(StringUtils.EMPTY);
}}

public List<DashboardFilter> getFilters() {
return this.dataModel.getCriteria().getFilters();
Expand Down
2 changes: 1 addition & 1 deletion AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<c:set var="widgetContentId" value="#{cc.clientId}:widget-content" />
<p:inputText id="quick-search-input-#{index}" value="#{widget.quickSearchKeyword}"
placeholder="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/globalSearch')}"
onkeydown="handleKeyDown(event)" disabled="#{!isReadOnlyMode and widget.type eq 'PROCESS'}">
onkeydown="handleKeyDown(event)" disabled="#{!isReadOnlyMode}">
<p:ajax delay="800" listener="#{widget.updateQuickSearchKeyword()}"
onstart="return shouldTriggerAjax(event)"
event="keydown" process="@this"
Expand Down
Loading