Release v2.5.4

src/web/routes/signage/dashboard/index.js

@@ -2,7 +2,17 @@
 
 const { renderView } = require('../../../view');
 
+function normalizeBaseUrl(value) {
+  return String(value || '').trim().replace(/\/$/, '');
+}
+
 module.exports = function renderDashboardPage(data, message, currentUser) {
+  const primaryPlayerUrl = Array.isArray(data.screens)
+    ? String((data.screens.find(function (screen) {
+      return screen && String(screen.public_base_url || '').trim();
+    }) || {}).public_base_url || '').trim()
+    : '';
+
   return renderView('dashboard/index', {
     title: 'Dashboard',
     active: 'dashboard',
@@ -13,6 +23,7 @@ module.exports = function renderDashboardPage(data, message, currentUser) {
     clients: data.clients || [],
     slides: data.slides || [],
     connectedClientsCount: Number(data.connectedClientsCount || 0),
+    primaryPlayerUrl: normalizeBaseUrl(primaryPlayerUrl) || null,
     scripts: ['js/dashboard/dashboard-page.js']
   });
 };

src/web/routes/signage/slides/form-view-model.js

@@ -53,7 +53,7 @@ function buildSlideFormViewModel(data, slide, message, currentUser, isEdit) {
       existingContent: viewSlide && viewSlide.content ? viewSlide.content : {}
     },
     assetVersion: assetVersion,
-    slideEditorScripts: getRegionEditorScripts(assetVersion),
+    slideEditorScripts: ['vendor/qrcode-generator/qrcode.js?v=' + assetVersion].concat(getRegionEditorScripts(assetVersion)),
     currentUser: currentUser || null
   };
 }

src/web/routes/signage/templates/form-view-model.js

@@ -63,7 +63,7 @@ function buildTemplateFormViewModel(template, message, canvasSizes, currentUser,
     deleteUrl: isEdit && current.id ? '/templates/' + current.id + '/delete' : '',
     canvasSizes: canvasSizes || [],
     animationPresets: animationPresets,
-    scripts: ['js/lib/modal.js?v=' + assetVersion, 'js/templates/animation-presets.js?v=' + assetVersion].concat(getRegionEditorScripts(assetVersion), ['js/templates/template-designer-utils.js?v=' + assetVersion, 'js/templates/template-designer.js?v=' + assetVersion])
+    scripts: ['js/lib/modal.js?v=' + assetVersion, 'js/templates/animation-presets.js?v=' + assetVersion, 'vendor/qrcode-generator/qrcode.js?v=' + assetVersion].concat(getRegionEditorScripts(assetVersion), ['js/templates/template-designer-utils.js?v=' + assetVersion, 'js/templates/template-designer.js?v=' + assetVersion])
   };
 }