best guess for #17, need to test

eiskaltdcpp · Mar 30, 2015 · cf4528a · cf4528a
1 parent 9e605b5
commit cf4528a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/app/js/services/rpc.js b/app/js/services/rpc.js
@@ -136,7 +136,19 @@ angular.module('EiskaltRPC', []).factory('EiskaltRPC', function($http, $q) {
 			return jsonrpc('queue.listtargets', {separator: '┴'}, true);
 		},
 		ListQueue: function() {
-			return jsonrpc('queue.list');
+            const priorityOrder = ['Paused', 'Lowest', 'Low', 'Normal', 'High', 'Highest'];
+            var deferred = $q.defer();
+            var promise = deferred.promise;
+            jsonrpc('queue.list').success(function(queue) {
+                var result = [];
+                angular.forEach(queue, function(value) {
+                    value.PriorityOrder = priorityOrder.indexOf(value.Priority);
+                    this.push(value);
+                }, result);
+                deferred.resolve(result);
+            });
+            promise.success = promise.then;
+            return promise;
 		},
 		ClearSearchResults: function(huburl) {
 			return jsonrpc('search.clear', {huburl: huburl});

diff --git a/app/partials/queue.html b/app/partials/queue.html
@@ -9,7 +9,7 @@
             </tr>
         </thead>
         <tbody>
-            <tr ng-repeat="(key, item) in queue" ng-controller="QueueItemCtrl">
+            <tr ng-repeat="item in queue | orderBy:['PriorityOrder','Filename']" ng-controller="QueueItemCtrl">
                 <td>
                     {{ item.Filename }}
                     <div collapse="!collapsed">