From b79262f6dbb613338b96dbbc8adcef2fb8256df2 Mon Sep 17 00:00:00 2001
From: miigotu <miigotu@gmail.com>
Date: Thu, 3 Dec 2015 04:40:02 -0800
Subject: [PATCH] Fix submenu is undefined mako error
---
gui/slick/views/layouts/main.mako | 4 +---
sickbeard/webserve.py | 3 ++-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/gui/slick/views/layouts/main.mako b/gui/slick/views/layouts/main.mako
index 9da450864..a839a7706 100644
--- a/gui/slick/views/layouts/main.mako
+++ b/gui/slick/views/layouts/main.mako
@@ -234,8 +234,7 @@
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>
-
- % if not submenu is UNDEFINED:
+ % if submenu:
<div id="SubMenu" class="hidden-print">
<span>
<% first = True %>
@@ -261,7 +260,6 @@
</span>
</div>
% endif
-
% if sickbeard.BRANCH and sickbeard.BRANCH != 'master' and not sickbeard.DEVELOPER and srLogin:
<div class="alert alert-danger upgrade-notification hidden-print" role="alert">
<span>You're using the ${sickbeard.BRANCH} branch. Please use 'master' unless specifically asked</span>
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 5a6f33333..cdfe0e10c 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -143,6 +143,7 @@ class PageTemplate(MakoTemplate):
self.arguments['title'] = "FixME"
self.arguments['header'] = "FixME"
self.arguments['topmenu'] = "FixME"
+ self.arguments['submenu'] = []
self.arguments['controller'] = "FixME"
self.arguments['action'] = "FixME"
@@ -999,7 +1000,7 @@ class Home(WebRoot):
size = 0
for r in rows:
NotifyList = {'emails':'', 'prowlAPIs':''}
- if (r['notify_list'] and len(r['notify_list']) > 0):
+ if r['notify_list'] and len(r['notify_list']) > 0:
# First, handle legacy format (emails only)
if not r['notify_list'][0] == '{':
NotifyList['emails'] = r['notify_list']
--
GitLab