zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev-1.6' into development

Browse source
This commit is contained in:
anhefti 2024-03-13 15:52:29 +01:00
commit 9d423649c4
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/ch/ethz/seb/sebserver/gui/table/EntityTable.java
View file

@ -244,6 +244,7 @@ public class EntityTable<ROW extends ModelIdAware> {
this.pageSize,
this.sortColumn,
this.sortOrder);
updateFilterUserAttrs();
}
public String getName() {
@ -330,8 +331,9 @@ public class EntityTable<ROW extends ModelIdAware> {
public void applyFilter() {
try {
updateFilterUserAttrs();
this.selectPage(1);
if (updateFilterUserAttrs()) {
this.selectPage(1);
}
} catch (final Exception e) {
log.error("Unexpected error while trying to apply filter: ", e);
@ -813,16 +815,27 @@ public class EntityTable<ROW extends ModelIdAware> {
}
}
private void updateFilterUserAttrs() {
private boolean updateFilterUserAttrs() {
if (this.filter != null) {
try {
this.pageService
.getCurrentUser()
.putAttribute(this.filterAttrName, this.filter.getFilterAttributes());
final CurrentUser currentUser = this.pageService.getCurrentUser();
final String newFilterAttributes = this.filter.getFilterAttributes();
final String oldFilterAttributes = currentUser.getAttribute(this.filterAttrName);
if(Objects.equals(newFilterAttributes, oldFilterAttributes)) {
return false;
}
if (multiselection != null) {
multiselection.clear();
}
currentUser.putAttribute(this.filterAttrName, newFilterAttributes);
return true;
} catch (final Exception e) {
log.error("Failed to put filter attributes to current user attributes", e);
return true;
}
}
return false;
}
private void initFilterFromUserAttrs() {
@ -864,7 +877,7 @@ public class EntityTable<ROW extends ModelIdAware> {
if (this.multiselection != null) {
Arrays.stream(this.table.getItems())
.forEach(item -> {
final int index = this.table.indexOf(item);
final int index = this.table.indexOf(item);
if (this.multiselection.contains(getModelId(item))) {
if (!this.table.isSelected(index)) {
this.table.select(index);