From 6e0c8a0fee76923c9760f94d610da6c213677ae6 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 22 Apr 2013 11:38:38 -0400
Subject: [PATCH] #182 - Eliminate duplicates in the selection list for max
 rating in user screen

---
 dashboard-ui/edituser.html             | 11 +++++++++--
 dashboard-ui/scripts/edituserpage.js   | 27 +++-----------------------
 dashboard-ui/scripts/librarybrowser.js |  2 +-
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/dashboard-ui/edituser.html b/dashboard-ui/edituser.html
index 516fc20fdf..a528c9b5c3 100644
--- a/dashboard-ui/edituser.html
+++ b/dashboard-ui/edituser.html
@@ -12,7 +12,7 @@
                     <a href="#" data-role="button" class="ui-btn-active">Profile</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('userimage.html', true);">Image</a>
                     <a href="#" data-role="button" onclick="Dashboard.navigate('updatepassword.html', true);">Password</a>
-                    <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);" class="lnkMediaLibrary" style="display:none;">Media Library</a>
+                    <a href="#" data-role="button" onclick="Dashboard.navigate('library.html', true);" class="lnkMediaLibrary" style="display: none;">Media Library</a>
                 </div>
                 <form id="editUserProfileForm">
                     <ul data-role="listview" class="ulForm">
@@ -22,7 +22,14 @@
                         </li>
                         <li id="fldMaxParentalRating" style="display: none;">
                             <label for="selectMaxParentalRating">Max parental rating:</label>
-                            <select name="selectMaxParentalRating" id="selectMaxParentalRating"></select>
+                            <select name="selectMaxParentalRating" id="selectMaxParentalRating">
+                                <option value="">None</option>
+                                <option value="G">G</option>
+                                <option value="PG">PG</option>
+                                <option value="PG-13">PG-13</option>
+                                <option value="R">R</option>
+                                <option value="NC-17">NC-17</option>
+                            </select>
                         </li>
                         <li id="fldIsAdmin" style="display: none;">
                             <input type="checkbox" id="chkIsAdmin" name="chkIsAdmin" />
diff --git a/dashboard-ui/scripts/edituserpage.js b/dashboard-ui/scripts/edituserpage.js
index cf523669ae..941cb39f78 100644
--- a/dashboard-ui/scripts/edituserpage.js
+++ b/dashboard-ui/scripts/edituserpage.js
@@ -32,7 +32,7 @@
         $('#selectMaxParentalRating', page).html(html).selectmenu("refresh");
     }
     
-    function loadUser(page, user, loggedInUser, parentalRatingsPromise, allCulturesPromise) {
+    function loadUser(page, user, loggedInUser, allCulturesPromise) {
 
         if (!loggedInUser.Configuration.IsAdministrator || user.Id == loggedInUser.Id) {
 
@@ -47,26 +47,7 @@
 
         $('#txtUserName', page).val(user.Name);
 
-        parentalRatingsPromise.done(function (allParentalRatings) {
-            
-            populateRatings(allParentalRatings, page);
-
-            var ratingValue = "";
-
-            if (user.Configuration.MaxParentalRating) {
-
-                for (var i = 0, length = allParentalRatings.length; i < length; i++) {
-
-                    var rating = allParentalRatings[i];
-
-                    if (user.Configuration.MaxParentalRating >= rating.Value) {
-                        ratingValue = rating.Value;
-                    }
-                }
-            }
-
-            $('#selectMaxParentalRating', page).val(ratingValue).selectmenu("refresh");
-        });
+        $('#selectMaxParentalRating', page).val(user.Configuration.MaxParentalRating).selectmenu("refresh");
 
         allCulturesPromise.done(function (allCultures) {
             
@@ -198,13 +179,11 @@
 
         var promise2 = Dashboard.getCurrentUser();
 
-        var parentalRatingsPromise = ApiClient.getParentalRatings();
-
         var allCulturesPromise = ApiClient.getCultures();
 
         $.when(promise1, promise2).done(function (response1, response2) {
 
-            loadUser(page, response1[0] || response1, response2[0], parentalRatingsPromise, allCulturesPromise);
+            loadUser(page, response1[0] || response1, response2[0], allCulturesPromise);
 
         });
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 9129e3ef07..0842af6a2f 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -936,7 +936,7 @@
                     tag: item.ImageTags.Disc
                 });
             }
-            else if (item.MediaType == "Audio") {
+            else if (item.MediaType == "Audio" || item.Type == "MusicAlbum") {
                 url = "css/images/items/detail/audio.png";
                 useBackgroundColor = true;
                 maxwidth = 150;