Release 1.5.16

src/web/routes/settings/background-tasks-page.js

@@ -91,8 +91,8 @@ function buildQueuePageViewModel(data, message, currentUser) {
   const tasks = (data && data.tasks) || [];
   const summary = (data && data.summary) || { counts: {}, total: 0, activeCount: 0 };
   const canManage = hasAnyPermission(currentUser, ['background-tasks.allow']);
-  const sort = String(data && data.sort || '').trim();
-  const direction = normalizeSortDirection(data && data.direction);
+  const sort = String(data && data.sort || '').trim() || 'started';
+  const direction = normalizeSortDirection(data && data.direction || 'desc');
   const queryState = {
     page: parsePageNumber(data && data.page),
     sourceType: '',
@@ -130,7 +130,7 @@ function buildQueuePageViewModel(data, message, currentUser) {
       return task && task.createdAt;
     }
     if (sort === 'started') {
-      return task && task.startedAt;
+      return task && (task.startedAt || '0001-01-01T00:00:00.000Z');
     }
     if (sort === 'finished') {
       return task && task.finishedAt;

src/web/routes/settings/rbac/edit.js

@@ -1,6 +1,6 @@
 const { renderView } = require('../../../view');
 
-module.exports = function renderRbacEditPage(role, message, currentUser, permissionGroups, users) {
+module.exports = function renderRbacEditPage(role, message, currentUser, permissionGroups, users, pagination) {
   return renderView('settings/rbac/edit', {
     title: 'Edit role',
     active: 'rbac',
@@ -9,6 +9,8 @@ module.exports = function renderRbacEditPage(role, message, currentUser, permiss
     role: role,
     permissionGroups: permissionGroups || [],
     users: users || [],
+    pagination: pagination || null,
+    roleEditBasePath: '/rbac/' + Number(role && role.id) + '/edit',
     scripts: ['js/rbac-permissions.js']
   });
 };