Merge pull request automatic-ripping-machine#512 from newhinton/v2_master

Fix tablesorter using wrong column for sorting

Author: 1337-server

arm/ui/routes.py

@@ -490,7 +490,7 @@ def history():
     if os.path.isfile(cfg['DBFILE']):
         # after roughly 175 entries firefox readermode will break
         # jobs = Job.query.filter_by().limit(175).all()
-        jobs = Job.query.order_by().paginate(page, 100, False)
+        jobs = Job.query.order_by(Job.start_time.desc()).paginate(page, 100, False)
     else:
         app.logger.error('ERROR: /history database file doesnt exist')
         jobs = {}

arm/ui/templates/history.html

@@ -83,6 +83,10 @@
             content: "Logfile:\A";
         }
     }
+
+    .hidden {
+        display: none;
+    }
 </style>
 <div class="container content">
     <div class="row">
@@ -138,6 +142,7 @@
                                     job.title|truncate(50, True) if job.title is not none else 'Title unknown' }}</a>
                                 </th>
                                 <td>{{ job.start_time.strftime(date_format) if job.start_time is not none }}</td>
+                                <td class="hidden">{{ job.start_time if job.start_time is not none }}</td>
                                 <td>{{ job.job_length }}</td>
                                 <td class="{{ job.status }}"><img src="static/img/{{ job.status }}.png" height="30px"
                                                                   width="30px" alt="{{ job.status }}"
@@ -163,8 +168,8 @@
         $(document).ready(function () {
             // call the tablesorter plugin
             $("table").tablesorter({
-                // sort on the first column and third column, order asc
-                sortList: [[1, 1]]
+                // sort on the third column (startime, no format)
+                sortList: [[2, 1]]
             });
         });
         activeTab("history");