Merge branch 'master' into checkbox

src/controllers/dashboard/users/useredit.js

@@ -104,6 +104,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize'], function ($, loading,
         $('#chkEnableSharing', page).checked = user.Policy.EnablePublicSharing;
         $('#txtRemoteClientBitrateLimit', page).val(user.Policy.RemoteClientBitrateLimit / 1e6 || '');
         $('#txtLoginAttemptsBeforeLockout', page).val(user.Policy.LoginAttemptsBeforeLockout || '0');
+        $('#selectSyncPlayAccess').val(user.Policy.SyncPlayAccess);
         loading.hide();
     }
 
@@ -145,6 +146,7 @@ define(['jQuery', 'loading', 'libraryMenu', 'globalize'], function ($, loading,
         }).map(function (c) {
             return c.getAttribute('data-id');
         });
+        user.Policy.SyncPlayAccess = page.querySelector('#selectSyncPlayAccess').value;
         ApiClient.updateUser(user).then(function () {
             ApiClient.updateUserPolicy(user.Id, user.Policy).then(function () {
                 onSaveComplete(page, user);