From 0bfda28bec28a816e28902031f778a0a114b26fa Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 5 Jun 2016 15:44:55 -0400
Subject: [PATCH] update collection grouping setting

---
 dashboard-ui/librarydisplay.html             | 5 +++++
 dashboard-ui/mypreferencesdisplay.html       | 5 -----
 dashboard-ui/scripts/librarydisplay.js       | 2 ++
 dashboard-ui/scripts/mypreferencesdisplay.js | 2 --
 dashboard-ui/scripts/site.js                 | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dashboard-ui/librarydisplay.html b/dashboard-ui/librarydisplay.html
index bae5bc95f2..992410eb77 100644
--- a/dashboard-ui/librarydisplay.html
+++ b/dashboard-ui/librarydisplay.html
@@ -8,6 +8,11 @@
                     <div class="fieldDescription paperCheckboxFieldDescription">${OptionDisplayFolderViewHelp}</div>
                 </div>
                 <br />
+                <div>
+                    <paper-checkbox class="chkGroupMoviesIntoCollections">${LabelGroupMoviesIntoCollections}</paper-checkbox>
+                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelGroupMoviesIntoCollectionsHelp}</div>
+                </div>
+                <br />
                 <br />
                 <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
 
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index 36e9034165..0fa2bd05ee 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -90,11 +90,6 @@
                     <div>
                         <paper-checkbox class="chkDisplayUnairedEpisodes">${LabelUnairedMissingEpisodesWithinSeasons}</paper-checkbox>
                     </div>
-                    <br />
-                    <div>
-                        <paper-checkbox class="chkGroupMoviesIntoCollections">${LabelGroupMoviesIntoCollections}</paper-checkbox>
-                        <div class="fieldDescription paperCheckboxFieldDescription">${LabelGroupMoviesIntoCollectionsHelp}</div>
-                    </div>
                 </div>
             </div>
             <button is="emby-button" type="submit" class="raised submit block btnSave hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
diff --git a/dashboard-ui/scripts/librarydisplay.js b/dashboard-ui/scripts/librarydisplay.js
index b568fcb136..0f992e3f85 100644
--- a/dashboard-ui/scripts/librarydisplay.js
+++ b/dashboard-ui/scripts/librarydisplay.js
@@ -33,6 +33,7 @@
             ApiClient.getServerConfiguration().then(function (config) {
 
                 config.EnableFolderView = form.querySelector('.chkFolderView').checked;
+                config.EnableGroupingIntoCollections = form.querySelector('.chkGroupMoviesIntoCollections').checked;
                 ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
             });
 
@@ -43,6 +44,7 @@
         function loadData() {
             ApiClient.getServerConfiguration().then(function (config) {
                 view.querySelector('.chkFolderView').checked = config.EnableFolderView;
+                view.querySelector('.chkGroupMoviesIntoCollections').checked = config.EnableGroupingIntoCollections;
             });
         }
 
diff --git a/dashboard-ui/scripts/mypreferencesdisplay.js b/dashboard-ui/scripts/mypreferencesdisplay.js
index 1efd446362..302ef90dbb 100644
--- a/dashboard-ui/scripts/mypreferencesdisplay.js
+++ b/dashboard-ui/scripts/mypreferencesdisplay.js
@@ -4,7 +4,6 @@
 
         page.querySelector('.chkDisplayMissingEpisodes').checked = user.Configuration.DisplayMissingEpisodes || false;
         page.querySelector('.chkDisplayUnairedEpisodes').checked = user.Configuration.DisplayUnairedEpisodes || false;
-        page.querySelector('.chkGroupMoviesIntoCollections').checked = user.Configuration.GroupMoviesIntoBoxSets || false;
 
         $('#selectThemeSong', page).val(appStorage.getItem('enableThemeSongs-' + user.Id) || '');
         $('#selectBackdrop', page).val(appStorage.getItem('enableBackdrops-' + user.Id) || '');
@@ -18,7 +17,6 @@
 
         user.Configuration.DisplayMissingEpisodes = page.querySelector('.chkDisplayMissingEpisodes').checked;
         user.Configuration.DisplayUnairedEpisodes = page.querySelector('.chkDisplayUnairedEpisodes').checked;
-        user.Configuration.GroupMoviesIntoBoxSets = page.querySelector('.chkGroupMoviesIntoCollections').checked;
 
         userSettings.language(page.querySelector('#selectLanguage').value);
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 20cfbfbd34..120240abf6 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -717,7 +717,7 @@ var Dashboard = {
             divider: true,
             name: Globalize.translate('TabLibrary'),
             href: "library.html",
-            pageIds: ['mediaLibraryPage', 'libraryPathMappingPage', 'librarySettingsPage'],
+            pageIds: ['mediaLibraryPage', 'libraryPathMappingPage', 'librarySettingsPage', 'libraryDisplayPage'],
             icon: 'folder',
             color: '#009688'
         }, {