Rename default to showDefaults

pymedusa · Aug 24, 2018 · 97097f4 · 97097f4
1 parent 0265d81
commit 97097f4
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/medusa/server/api/v2/config.py b/medusa/server/api/v2/config.py
@@ -296,14 +296,14 @@ def data_main():
         section_data['subtitles']['enabled'] = bool(app.USE_SUBTITLES)
         section_data['recentShows'] = app.SHOWS_RECENT
 
-        section_data['default'] = {}
-        section_data['default']['status'] = app.STATUS_DEFAULT
-        section_data['default']['statusAfter'] = app.STATUS_DEFAULT_AFTER
-        section_data['default']['quality'] = app.QUALITY_DEFAULT
-        section_data['default']['subtitles'] = bool(app.SUBTITLES_DEFAULT)
-        section_data['default']['seasonFolders'] = bool(app.SEASON_FOLDERS_DEFAULT)
-        section_data['default']['anime'] = bool(app.ANIME_DEFAULT)
-        section_data['default']['scene'] = bool(app.SCENE_DEFAULT)
+        section_data['showDefaults'] = {}
+        section_data['showDefaults']['status'] = app.STATUS_DEFAULT
+        section_data['showDefaults']['statusAfter'] = app.STATUS_DEFAULT_AFTER
+        section_data['showDefaults']['quality'] = app.QUALITY_DEFAULT
+        section_data['showDefaults']['subtitles'] = bool(app.SUBTITLES_DEFAULT)
+        section_data['showDefaults']['seasonFolders'] = bool(app.SEASON_FOLDERS_DEFAULT)
+        section_data['showDefaults']['anime'] = bool(app.ANIME_DEFAULT)
+        section_data['showDefaults']['scene'] = bool(app.SCENE_DEFAULT)
 
         section_data['news'] = NonEmptyDict()
         section_data['news']['lastRead'] = app.NEWS_LAST_READ

diff --git a/tests/apiv2/test_config.py b/tests/apiv2/test_config.py
@@ -78,14 +78,14 @@ def config_main(monkeypatch, app_config):
     config_data['subtitles']['enabled'] = bool(app.USE_SUBTITLES)
     config_data['recentShows'] = app.SHOWS_RECENT
 
-    config_data['default'] = {}
-    config_data['default']['status'] = app.STATUS_DEFAULT
-    config_data['default']['statusAfter'] = app.STATUS_DEFAULT_AFTER
-    config_data['default']['quality'] = app.QUALITY_DEFAULT
-    config_data['default']['subtitles'] = bool(app.SUBTITLES_DEFAULT)
-    config_data['default']['seasonFolders'] = bool(app.SEASON_FOLDERS_DEFAULT)
-    config_data['default']['anime'] = bool(app.ANIME_DEFAULT)
-    config_data['default']['scene'] = bool(app.SCENE_DEFAULT)
+    config_data['showDefaults'] = {}
+    config_data['showDefaults']['status'] = app.STATUS_DEFAULT
+    config_data['showDefaults']['statusAfter'] = app.STATUS_DEFAULT_AFTER
+    config_data['showDefaults']['quality'] = app.QUALITY_DEFAULT
+    config_data['showDefaults']['subtitles'] = bool(app.SUBTITLES_DEFAULT)
+    config_data['showDefaults']['seasonFolders'] = bool(app.SEASON_FOLDERS_DEFAULT)
+    config_data['showDefaults']['anime'] = bool(app.ANIME_DEFAULT)
+    config_data['showDefaults']['scene'] = bool(app.SCENE_DEFAULT)
 
     config_data['news'] = NonEmptyDict()
     config_data['news']['lastRead'] = app.NEWS_LAST_READ

diff --git a/themes-default/slim/src/components/add-show-options.vue b/themes-default/slim/src/components/add-show-options.vue
@@ -178,7 +178,7 @@ export default {
     },
     computed: {
         ...mapState({
-            defaultConfig: state => state.config.default,
+            defaultConfig: state => state.config.showDefaults,
             namingForceFolders: state => state.config.namingForceFolders,
             subtitlesEnabled: state => state.config.subtitles.enabled,
             episodeStatuses: state => state.statuses

diff --git a/themes-default/slim/src/store/modules/config.js b/themes-default/slim/src/store/modules/config.js
@@ -252,7 +252,7 @@ const state = {
     anonRedirect: null,
     logDir: null,
     recentShows: [],
-    default: {
+    showDefaults: {
         status: null,
         statusAfter: null,
         quality: null,