From c48e01f9f32c65966c605449bfd7f17571c2cc52 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 23 Jun 2017 16:58:14 +0000 Subject: [PATCH] CCM NG/ccm-cms: Some bugfixes for the AssignedTaskTable git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4803 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/cms/ui/workflow/AssignedTaskTable.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskTable.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskTable.java index 52dcdd732..38611ab67 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskTable.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/workflow/AssignedTaskTable.java @@ -102,17 +102,18 @@ public final class AssignedTaskTable extends Table { final int column) { // SF patch [ 1587168 ] Show locking user final BoxPanel panel = new BoxPanel(); - final User lockingUser = (User) value; - if (lockingUser != null) { + final String lockingUserName = (String) value; + if (lockingUserName != null) { final StringBuilder sb = new StringBuilder("Locked by
"); final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final Shiro shiro = cdiUtil.findBean(Shiro.class); - if (lockingUser.equals(shiro.getUser())) { + if (shiro.getUser().isPresent() + && lockingUserName.equals(shiro.getUser().get().getName())) { sb.append("you"); panel.add(new ControlLink(new Label( gz("cms.ui.workflow.task.unlock")))); } else { - sb.append(lockingUser.getName()); + sb.append(lockingUserName); panel.add(new ControlLink(new Label( gz("cms.ui.workflow.task.takeover")))); }