Release 1.5.3

src/web/routes/signage/templates/add.js

@@ -50,6 +50,6 @@ module.exports = function renderTemplateFormPage(template, mode, message, canvas
     currentUser: currentUser || null,
     template: current,
     canvasSizes: canvasSizes || [],
-    scripts: ['js/templates/template-designer-utils.js', 'js/templates/template-designer.js']
+    scripts: ['js/lib/modal.js', 'js/templates/template-designer-utils.js', 'js/templates/template-designer.js']
   });
 };

src/web/routes/signage/templates/list.js

@@ -6,7 +6,9 @@ module.exports = function renderTemplatesPage(data, message, currentUser) {
     name: template.name,
     canvas_size_width: template.canvas_size_width,
     canvas_size_height: template.canvas_size_height,
-    regionCount: (data.templateRegions || []).filter((region) => region.template_id === template.id).length
+    regionCount: template.region_count !== undefined
+      ? Number(template.region_count) || 0
+      : (data.templateRegions || []).filter((region) => region.template_id === template.id).length
   }));
 
   return renderView('templates/list', {
@@ -14,6 +16,7 @@ module.exports = function renderTemplatesPage(data, message, currentUser) {
     active: 'templates',
     message: message,
     currentUser: currentUser || null,
-    templates: templates
+    templates: templates,
+    pagination: data.pagination || null
   });
 };

src/web/routes/signage/templates/routes.js

@@ -2,12 +2,19 @@ module.exports = function registerTemplatesRoutes(app, deps) {
   const pages = deps.pages;
   const common = deps.common;
   const pool = deps.pool;
+  const { buildPagination } = require('../../../lib/pagination');
   const requirePermission = deps.requirePermission;
 
+  const LIST_PAGE_SIZE = 10;
+
   app.get('/templates', requirePermission('templates.read'), async function (req, res, next) {
     try {
-      const data = await common.fetchTemplatesData(pool);
-      res.send(pages.renderTemplatesPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+      const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+      const data = await common.fetchTemplatesPage(pool, page, LIST_PAGE_SIZE);
+      res.send(pages.renderTemplatesPage({
+        templates: data.templates || [],
+        pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'templates', 'Template pages')
+      }, req.query.message ? String(req.query.message) : '', req.currentUser));
     } catch (error) {
       next(error);
     }