Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java
===================================================================
diff -u -r88da40288a02be7961fe7f2e5b6c1c6c78655d59 -rb216b300f6be12c2caad6e951764228fb923203a
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java (.../UserSearchController.java) (revision 88da40288a02be7961fe7f2e5b6c1c6c78655d59)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java (.../UserSearchController.java) (revision b216b300f6be12c2caad6e951764228fb923203a)
@@ -23,14 +23,14 @@
package org.lamsfoundation.lams.admin.web.controller;
-import java.io.IOException;
-import java.util.List;
-
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-
-import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.lamsfoundation.lams.usermanagement.Role;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
@@ -45,9 +45,8 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.util.HtmlUtils;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.io.IOException;
+import java.util.List;
/**
* @author jliew
@@ -73,8 +72,8 @@
return "error";
}
- boolean loginAsEnable = Configuration.getAsBoolean(ConfigurationKeys.LOGIN_AS_ENABLE)
- && (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.SYSADMIN));
+ boolean loginAsEnable =
+ Configuration.getAsBoolean(ConfigurationKeys.LOGIN_AS_ENABLE) && request.isUserInRole(Role.SYSADMIN);
request.setAttribute("loginAsEnable", loginAsEnable);
return "usersearchlist";
Index: lams_build/conf/standalone.xml
===================================================================
diff -u -r665bafc925d571fea2e089e161a7d164d73c96bd -rb216b300f6be12c2caad6e951764228fb923203a
--- lams_build/conf/standalone.xml (.../standalone.xml) (revision 665bafc925d571fea2e089e161a7d164d73c96bd)
+++ lams_build/conf/standalone.xml (.../standalone.xml) (revision b216b300f6be12c2caad6e951764228fb923203a)
@@ -614,7 +614,7 @@
-
+