Removed inability to change roles for admin user
This commit is contained in:
@@ -95,7 +95,6 @@ public class UserSettingsController {
|
|||||||
} else {
|
} else {
|
||||||
command = (UserSettingsCommand) model.asMap().get("command");
|
command = (UserSettingsCommand) model.asMap().get("command");
|
||||||
}
|
}
|
||||||
command.setAdmin(User.USERNAME_ADMIN.equals(command.getUsername()));
|
|
||||||
command.setUsers(securityService.getAllUsers());
|
command.setUsers(securityService.getAllUsers());
|
||||||
command.setTranscodingSupported(transcodingService.isDownsamplingSupported(null));
|
command.setTranscodingSupported(transcodingService.isDownsamplingSupported(null));
|
||||||
command.setTranscodeDirectory(transcodingService.getTranscodeDirectory().getPath());
|
command.setTranscodeDirectory(transcodingService.getTranscodeDirectory().getPath());
|
||||||
|
|||||||
@@ -62,7 +62,7 @@
|
|||||||
<p/>
|
<p/>
|
||||||
|
|
||||||
<form:form method="post" action="userSettings.view" modelAttribute="command">
|
<form:form method="post" action="userSettings.view" modelAttribute="command">
|
||||||
<table style="${command.admin ? 'display:none' : ''}">
|
<table>
|
||||||
<tr style="${command.currentUser ? 'display:none' : ''}">
|
<tr style="${command.currentUser ? 'display:none' : ''}">
|
||||||
<td><form:checkbox path="adminRole" id="admin" cssClass="checkbox"/></td>
|
<td><form:checkbox path="adminRole" id="admin" cssClass="checkbox"/></td>
|
||||||
<td><label for="admin"><fmt:message key="usersettings.admin"/></label></td>
|
<td><label for="admin"><fmt:message key="usersettings.admin"/></label></td>
|
||||||
|
|||||||
Reference in New Issue
Block a user