From c1df27dbadf90e5f9d6171e2aa77a0a609f3c911 Mon Sep 17 00:00:00 2001
From: Alexis Tyler <xo@wvvw.me>
Date: Thu, 19 Nov 2015 12:14:36 +1030
Subject: [PATCH] fix status page not sorting correctly
---
gui/slick/js/core.js | 17 +++++++++++++++++
gui/slick/js/core.min.js | Bin 58424 -> 58761 bytes
gui/slick/js/new/status.js | 9 ---------
gui/slick/views/status.mako | 4 ++--
sickbeard/webserve.py | 3 ++-
5 files changed, 21 insertions(+), 12 deletions(-)
delete mode 100644 gui/slick/js/new/status.js
diff --git a/gui/slick/js/core.js b/gui/slick/js/core.js
index 2fb725650..376e8a63d 100644
--- a/gui/slick/js/core.js
+++ b/gui/slick/js/core.js
@@ -2236,6 +2236,23 @@ var SICKRAGE = {
},
postProcess: function() {
$('#episodeDir').fileBrowser({ title: 'Select Unprocessed Episode Folder', key: 'postprocessPath' });
+ },
+ status: function() {
+ $("#schedulerStatusTable").tablesorter({
+ widgets: ['saveSort', 'zebra'],
+ textExtraction: {
+ 5: function(node) { return $(node).data('seconds'); },
+ 6: function(node) { return $(node).data('seconds'); }
+ },
+ headers: {
+ 5: { sorter: 'digit' },
+ 6: { sorter: 'digit' }
+ }
+ });
+ $("#queueStatusTable").tablesorter({
+ widgets: ['saveSort', 'zebra'],
+ sortList: [[3,0], [4,0], [2,1]]
+ });
}
},
manage: {
diff --git a/gui/slick/js/core.min.js b/gui/slick/js/core.min.js
index 760b08a88b139929b632e36e4cbb084ab59dc2be..f903506d2b0ab222b3add749dd85ad68fcb12026 100644
GIT binary patch
delta 236
zcmdmSg1PfF^M>rx+B(H0i6y1QR%xYq$t9Wjc^aD4DjG`4#mO0|DWy57MZsX{ki?{%
z)XBD&r6zl?6%>xuDM_s;ajhsRN(Ae%sy3ax@qr|7N@7W(hEj2Aa(-S)@npUWauFyZ
zN}9E`IvJ^nDXB%pR@J6f)y4TmC8<SLN-3G?nI%fKI%XI`wY8c$Am<d8rk18+af)25
h4#*In%;FNO=xAddgIJwt6EJC{V;CE|Ipg#N2>`w-SDXL<
delta 14
WcmeA?&Aj6T^M>rxoA;bKD**sGh6mvQ
diff --git a/gui/slick/js/new/status.js b/gui/slick/js/new/status.js
deleted file mode 100644
index 3c3c461cd..000000000
--- a/gui/slick/js/new/status.js
+++ /dev/null
@@ -1,9 +0,0 @@
-$(document).ready(function() {
- $("#schedulerStatusTable").tablesorter({
- widgets: ['saveSort', 'zebra']
- });
- $("#queueStatusTable").tablesorter({
- widgets: ['saveSort', 'zebra'],
- sortList: [[3,0], [4,0], [2,1]]
- });
-});
diff --git a/gui/slick/views/status.mako b/gui/slick/views/status.mako
index 9162b62ae..35ae7ec41 100644
--- a/gui/slick/views/status.mako
+++ b/gui/slick/views/status.mako
@@ -95,10 +95,10 @@
<td align="right"></td>
% endif
<% cycleTime = (service.cycleTime.microseconds + (service.cycleTime.seconds + service.cycleTime.days * 24 * 3600) * 10**6) / 10**6 %>
- <td align="right">${helpers.pretty_time_delta(cycleTime)}</td>
+ <td align="right" data-seconds="${cycleTime}">${helpers.pretty_time_delta(cycleTime)}</td>
% if service.enable:
<% timeLeft = (service.timeLeft().microseconds + (service.timeLeft().seconds + service.timeLeft().days * 24 * 3600) * 10**6) / 10**6 %>
- <td align="right">${helpers.pretty_time_delta(timeLeft)}</td>
+ <td align="right" data-seconds="${timeLeft}">${helpers.pretty_time_delta(timeLeft)}</td>
% else:
<td></td>
% endif
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index c35ab1448..9f07ec905 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -1077,7 +1077,8 @@ class Home(WebRoot):
rootDir[subject] = helpers.getDiskSpaceUsage(subject)
t = PageTemplate(rh=self, filename="status.mako")
- return t.render(title='Status', header='Status', topmenu='system', tvdirFree=tvdirFree, rootDir=rootDir)
+ return t.render(title='Status', header='Status', topmenu='system', tvdirFree=tvdirFree, rootDir=rootDir,
+ controller="home", action="status")
def shutdown(self, pid=None):
if not Shutdown.stop(pid):
--
GitLab