Server: correctly sort tags by name asc

diff --git a/server/models/video.js b/server/models/video.js
index af05a861fbcaf4fc3c743b9edd6263fa8f010ef3..04478c8d74202965ec4e227493d2f9c4b6f3dc1b 100644 (file)
--- a/server/models/video.js
+++ b/server/models/video.js
@@ -320,7 +320,7 @@ function listForApi (start, count, sort, callback) {
     offset: start,
     limit: count,
     distinct: true, // For the count, a video can have many tags
-    order: [ modelUtils.getSort(sort) ],
+    order: [ modelUtils.getSort(sort), [ this.sequelize.models.Tag, 'name', 'ASC' ] ],
     include: [
       {
         model: this.sequelize.models.Author,
@@ -440,7 +440,7 @@ function searchAndPopulateAuthorAndPodAndTags (value, field, start, count, sort,
     offset: start,
     limit: count,
     distinct: true, // For the count, a video can have many tags
-    order: [ modelUtils.getSort(sort) ]
+    order: [ modelUtils.getSort(sort), [ this.sequelize.models.Tag, 'name', 'ASC' ] ]
   }
 
   // Make an exact search with the magnet