From 6783ced897645c3a5316b001fb9cfbe55d39f2b7 Mon Sep 17 00:00:00 2001
From: Evan Harris <eharris@puremagic.com>
Date: Tue, 10 Sep 2019 21:05:36 -0500
Subject: [PATCH] Removed inability to change roles for admin user

---
 .../org/airsonic/player/controller/UserSettingsController.java  | 1 -
 airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java
index 02038197..52f06124 100644
--- a/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java
+++ b/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java
@@ -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());
diff --git a/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
index 75771d98..4b6f2eee 100644
--- a/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
+++ b/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
@@ -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>