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

fixed sort in User Activity Logs for User column

Browse source
This commit is contained in:
anhefti 2021-02-01 09:20:32 +01:00
parent 30e901f20e
commit 87951bdaaa
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java
View file

@ -196,6 +196,7 @@ public class UserActivityLogs implements TemplateComposer {
UserActivityLog.ATTR_USER_NAME, UserActivityLog.ATTR_USER_NAME,
USER_TEXT_KEY, USER_TEXT_KEY,
UserActivityLog::getUsername) UserActivityLog::getUsername)
.sortable()
.withFilter(this.userNameFilter)) .withFilter(this.userNameFilter))
.withColumn(new ColumnDefinition<UserActivityLog>( .withColumn(new ColumnDefinition<UserActivityLog>(

4
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/PaginationServiceImpl.java
View file

@ -306,8 +306,8 @@ public class PaginationServiceImpl implements PaginationService {
// User Activity Log Table // User Activity Log Table
final Map<String, String> userActivityLogTableMap = new HashMap<>(); final Map<String, String> userActivityLogTableMap = new HashMap<>();
userActivityLogTableMap.put( userActivityLogTableMap.put(
Domain.USER_ACTIVITY_LOG.ATTR_USER_UUID, Domain.USER.ATTR_USERNAME,
UserActivityLogRecordDynamicSqlSupport.userUuid.name()); UserRecordDynamicSqlSupport.username.name());
userActivityLogTableMap.put( userActivityLogTableMap.put(
Domain.USER_ACTIVITY_LOG.ATTR_ACTIVITY_TYPE, Domain.USER_ACTIVITY_LOG.ATTR_ACTIVITY_TYPE,
UserActivityLogRecordDynamicSqlSupport.activityType.name()); UserActivityLogRecordDynamicSqlSupport.activityType.name());