Removed inability to change roles for admin user

master
Evan Harris 5 years ago
parent 6f590f7740
commit 6783ced897
No known key found for this signature in database
GPG Key ID: FF3BD4DA59FF9EDC
  1. 1
      airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java
  2. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp

@ -95,7 +95,6 @@ public class UserSettingsController {
} else {
command = (UserSettingsCommand) model.asMap().get("command");
}
command.setAdmin(User.USERNAME_ADMIN.equals(command.getUsername()));
command.setUsers(securityService.getAllUsers());
command.setTranscodingSupported(transcodingService.isDownsamplingSupported(null));
command.setTranscodeDirectory(transcodingService.getTranscodeDirectory().getPath());

@ -62,7 +62,7 @@
<p/>
<form:form method="post" action="userSettings.view" modelAttribute="command">
<table style="${command.admin ? 'display:none' : ''}">
<table>
<tr style="${command.currentUser ? 'display:none' : ''}">
<td><form:checkbox path="adminRole" id="admin" cssClass="checkbox"/></td>
<td><label for="admin"><fmt:message key="usersettings.admin"/></label></td>

Loading…
Cancel
Save