From 8e85f9d0f0fc5ea01eaf30f0699369e26d07371d Mon Sep 17 00:00:00 2001
From: Nic Wolfe <nic@wolfeden.ca>
Date: Sat, 26 Feb 2011 16:16:07 -0700
Subject: [PATCH] Fix add show default season folder setting
---
data/interfaces/default/home_addExistingShow.tmpl | 1 +
data/interfaces/default/home_newShow.tmpl | 1 +
data/interfaces/default/inc_addShowOptions.tmpl | 1 -
data/js/addShowOptions.js | 2 +-
sickbeard/webserve.py | 5 ++++-
5 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/data/interfaces/default/home_addExistingShow.tmpl b/data/interfaces/default/home_addExistingShow.tmpl
index c64ab1013..2621fc272 100644
--- a/data/interfaces/default/home_addExistingShow.tmpl
+++ b/data/interfaces/default/home_addExistingShow.tmpl
@@ -15,6 +15,7 @@
<script type="text/javascript" src="$sbRoot/js/addExistingShow.js"></script>
<script type="text/javascript" src="$sbRoot/js/rootDirs.js"></script>
+<script type="text/javascript" src="$sbRoot/js/addShowOptions.js"></script>
<script>
\$(document).ready(function(){
diff --git a/data/interfaces/default/home_newShow.tmpl b/data/interfaces/default/home_newShow.tmpl
index 951f45d0d..11f32a508 100644
--- a/data/interfaces/default/home_newShow.tmpl
+++ b/data/interfaces/default/home_newShow.tmpl
@@ -15,6 +15,7 @@
<script type="text/javascript" src="$sbRoot/js/formwizard.js"></script>
<script type="text/javascript" src="$sbRoot/js/qualityChooser.js"></script>
<script type="text/javascript" src="$sbRoot/js/newShow.js"></script>
+<script type="text/javascript" src="$sbRoot/js/addShowOptions.js"></script>
<div id="displayText">aoeu</div>
<br />
diff --git a/data/interfaces/default/inc_addShowOptions.tmpl b/data/interfaces/default/inc_addShowOptions.tmpl
index f12f1bd9d..ec896ad4a 100644
--- a/data/interfaces/default/inc_addShowOptions.tmpl
+++ b/data/interfaces/default/inc_addShowOptions.tmpl
@@ -1,6 +1,5 @@
#import sickbeard
#from sickbeard.common import *
- <script type="text/javascript" src="$sbRoot/js/addShowOptions.js"></script>
<div class="field-pair">
<label for="statusSelect" class="nocheck clearfix">
<span class="component-title">
diff --git a/data/js/addShowOptions.js b/data/js/addShowOptions.js
index 6a3243f32..b2aa856de 100644
--- a/data/js/addShowOptions.js
+++ b/data/js/addShowOptions.js
@@ -9,7 +9,7 @@ $(document).ready(function(){
$.get(sbRoot+'/config/general/saveAddShowDefaults', {defaultStatus: $('#statusSelect').val(),
anyQualities: anyQualArray.join(','),
bestQualities: bestQualArray.join(','),
- defaultSeasonFolders: $('#seasonFolders').val()} );
+ defaultSeasonFolders: $('#seasonFolders').attr('checked')} );
$(this).attr('disabled', true);
$.pnotify({
pnotify_title: 'Saved Defaults',
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index ca516b94e..7726882d5 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -512,11 +512,14 @@ class ConfigGeneral:
sickbeard.STATUS_DEFAULT = int(defaultStatus)
sickbeard.QUALITY_DEFAULT = int(newQuality)
- if defaultSeasonFolders == "on":
+
+ if defaultSeasonFolders == "true":
defaultSeasonFolders = 1
else:
defaultSeasonFolders = 0
+
sickbeard.SEASON_FOLDERS_DEFAULT = int(defaultSeasonFolders)
+
@cherrypy.expose
def saveGeneral(self, log_dir=None, web_port=None, web_log=None, web_ipv6=None,
--
GitLab