add library access to new user page

dashboard-ui/scripts/usernew.js

@@ -1,16 +1,101 @@
 (function ($, window, document) {
 
+    function loadMediaFolders(page, user, mediaFolders) {
+
+        var html = '';
+
+        html += '<fieldset data-role="controlgroup">';
+
+        html += '<legend>' + Globalize.translate('HeaderMediaFolders') + '</legend>';
+
+        for (var i = 0, length = mediaFolders.length; i < length; i++) {
+
+            var folder = mediaFolders[i];
+
+            var id = 'mediaFolder' + i;
+
+            var checkedAttribute = user.Configuration.BlockedMediaFolders.indexOf(folder.Id) == -1 && user.Configuration.BlockedMediaFolders.indexOf(folder.Name) == -1 ? ' checked="checked"' : '';
+
+            html += '<input class="chkMediaFolder" data-foldername="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />';
+            html += '<label for="' + id + '">' + folder.Name + '</label>';
+        }
+
+        html += '</fieldset>';
+
+        $('.mediaFolderAccess', page).html(html).trigger('create');
+    }
+
+    function loadChannels(page, user, channels) {
+
+        var html = '';
+
+        html += '<fieldset data-role="controlgroup">';
+
+        html += '<legend>' + Globalize.translate('HeaderChannels') + '</legend>';
+
+        for (var i = 0, length = channels.length; i < length; i++) {
+
+            var folder = channels[i];
+
+            var id = 'channels' + i;
+
+            var checkedAttribute = user.Configuration.BlockedChannels.indexOf(folder.Id) == -1 ? ' checked="checked"' : '';
+
+            html += '<input class="chkChannel" data-foldername="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />';
+            html += '<label for="' + id + '">' + folder.Name + '</label>';
+        }
+
+        html += '</fieldset>';
+
+        $('.channelAccess', page).show().html(html).trigger('create');
+
+        if (channels.length) {
+            $('.channelAccessContainer', page).show();
+        } else {
+            $('.channelAccessContainer', page).hide();
+        }
+    }
+
     function loadUser(page, user) {
 
         $('#txtUserName', page).val(user.Name);
+
+        Dashboard.showLoadingMsg();
+
+        var promise4 = ApiClient.getJSON(ApiClient.getUrl("Library/MediaFolders", { IsHidden: false }));
+
+        var promise5 = ApiClient.getJSON(ApiClient.getUrl("Channels"));
+
+        $.when(promise4, promise5).done(function (response4, response5) {
+
+            loadMediaFolders(page, user, response4[0].Items);
+            loadChannels(page, user, response5[0].Items);
+
+            Dashboard.hideLoadingMsg();
+        });
     }
 
-    function saveUser(user, page) {
+    function saveUser(page) {
 
-        user.Name = $('#txtUserName', page).val();
+        var name = $('#txtUserName', page).val();
 
-        ApiClient.createUser(user).done(function (newUser) {
+        ApiClient.createUser(name).done(function (user) {
-            Dashboard.navigate("useredit.html?userId=" + newUser.Id);
+
+            user.Configuration.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () {
+
+                return this.getAttribute('data-foldername');
+
+            }).get();
+
+            user.Configuration.BlockedChannels = $('.chkChannel:not(:checked)', page).map(function () {
+
+                return this.getAttribute('data-foldername');
+
+            }).get();
+
+            ApiClient.updateUser(user).done(function () {
+                Dashboard.navigate("useredit.html?userId=" + user.Id);
+            });
         });
     }
 
@@ -24,7 +109,7 @@
 
             Dashboard.showLoadingMsg();
 
-            saveUser(getUser(), page);
+            saveUser(page);
 
             // Disable default form submission
             return false;
@@ -33,7 +118,12 @@
 
     function getUser() {
 
-        return {};
+        return {
+            Configuration: {
+                BlockedMediaFolders: [],
+                BlockedChannels: []
+            }
+        };
     }
 
     function loadData(page) {

dashboard-ui/scripts/wizarduserpage.js

@@ -51,9 +51,7 @@
 
             } else {
 
-                user = { Name: $('#txtUsername', form).val() };
+                ApiClient.createUser($('#txtUsername', form).val()).done(onSaveComplete);
-
-                ApiClient.createUser(user).done(onSaveComplete);
             }
 
         });

dashboard-ui/thirdparty/apiclient/mediabrowser.apiclient.js

@@ -2603,20 +2603,17 @@
          * Creates a user
          * @param {Object} user
          */
-        self.createUser = function (user) {
+        self.createUser = function (name) {
 
-            if (!user) {
+            var url = self.getUrl("Users/New");
-                throw new Error("null user");
-            }
-
-            var url = self.getUrl("Users");
 
             return self.ajax({
                 type: "POST",
                 url: url,
-                data: JSON.stringify(user),
+                data: {
-                dataType: "json",
+                    Name: name
-                contentType: "application/json"
+                },
+                dataType: "json"
             });
         };
 

dashboard-ui/userlibraryaccess.html

@@ -23,7 +23,7 @@
                     </div>
                     <br />
 
-                    <div class="channelAccessContainer">
+                    <div class="channelAccessContainer" style="display:none;">
                         <div class="channelAccess">
                         </div>
                         <div class="fieldDescription">${ChannelAccessHelp}</div>

dashboard-ui/usernew.html

@@ -16,13 +16,35 @@
                             <input id="txtUserName" required="required" type="text" />
                         </li>
                     </ul>
+
+                    <div data-role="collapsible">
+                        <h2>${HeaderLibraryAccess}</h2>
+                        <div>
+                            <br />
+                            <div class="mediaFolderAccess">
+                            </div>
+                            <div class="fieldDescription">${LibraryAccessHelp}</div>
+                            <br />
+                        </div>
+                    </div>
+                    <div data-role="collapsible" class="channelAccessContainer" style="display:none;">
+                        <h2>${HeaderChannelAccess}</h2>
+                        <div>
+                            <br />
+                            <div class="channelAccess">
+                            </div>
+                            <div class="fieldDescription">${ChannelAccessHelp}</div>
+                            <br />
+                        </div>
+                    </div>
+
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <button type="submit" data-theme="b" data-icon="check" data-mini="true">
+                            <button type="submit" data-theme="b" data-icon="check">
                                 ${ButtonSave}
                             </button>
-                            <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
+                            <button type="button" onclick="history.back();" data-icon="delete">
                                 ${ButtonCancel}
                             </button>
                         </li>