Merge pull request #757 from PicPeak/fix/hero-logo-global-inherit-756

fix(branding): make 'Show logo in hero' a true global toggle with per-event override (#756)

backend/migrations/core/152_hero_logo_visible_inherit.js

@@ -0,0 +1,52 @@
+/**
+ * Migration 152: make events.hero_logo_visible NULL-able so NULL means
+ * "inherit the global branding_logo_display_hero setting" (#756).
+ *
+ * Before: hero_logo_visible was `boolean NOT NULL DEFAULT true`, and every
+ * event got a concrete true/false snapshotted at creation. The global
+ * "Show logo in hero section" toggle (branding_logo_display_hero) was only a
+ * creation-time default and never affected existing galleries — so disabling
+ * it did nothing to already-published galleries.
+ *
+ * After: NULL = inherit. gallery read-resolution falls back to the global
+ * setting when the per-event value is NULL, so the global toggle controls
+ * every gallery that hasn't been deliberately overridden per-event.
+ *
+ * Data backfill: NULL out the DEFAULTED `true` rows so they start inheriting
+ * the global. A deliberate per-gallery hide (`false`) is kept — we can't tell a
+ * defaulted-true from a chosen-true, but `false` is almost always a conscious
+ * "hide it here", and nulling it could silently re-show a hidden logo.
+ */
+exports.up = async function (knex) {
+  if (!(await knex.schema.hasColumn('events', 'hero_logo_visible'))) return;
+
+  const client = (knex.client.config.client || '').toLowerCase();
+  if (client === 'pg' || client === 'postgresql') {
+    await knex.raw('ALTER TABLE events ALTER COLUMN hero_logo_visible DROP DEFAULT');
+    await knex.raw('ALTER TABLE events ALTER COLUMN hero_logo_visible DROP NOT NULL');
+  } else {
+    // SQLite (and others): knex recreates the table without the NOT NULL/default.
+    await knex.schema.alterTable('events', (t) => {
+      t.boolean('hero_logo_visible').nullable().alter();
+    });
+  }
+
+  // Existing defaulted-`true` galleries now inherit the global toggle.
+  await knex('events').where('hero_logo_visible', true).update({ hero_logo_visible: null });
+};
+
+exports.down = async function (knex) {
+  if (!(await knex.schema.hasColumn('events', 'hero_logo_visible'))) return;
+  // Re-materialise NULLs as the old default (true) before restoring NOT NULL.
+  await knex('events').whereNull('hero_logo_visible').update({ hero_logo_visible: true });
+
+  const client = (knex.client.config.client || '').toLowerCase();
+  if (client === 'pg' || client === 'postgresql') {
+    await knex.raw('ALTER TABLE events ALTER COLUMN hero_logo_visible SET DEFAULT true');
+    await knex.raw('ALTER TABLE events ALTER COLUMN hero_logo_visible SET NOT NULL');
+  } else {
+    await knex.schema.alterTable('events', (t) => {
+      t.boolean('hero_logo_visible').notNullable().defaultTo(true).alter();
+    });
+  }
+};

backend/migrations/core/153_hero_logo_size_inherit.js

@@ -0,0 +1,51 @@
+/**
+ * Migration 153: make events.hero_logo_size NULL-able so NULL means "inherit
+ * the global branding_logo_size" (#756 follow-up — the size counterpart of 152).
+ *
+ * Before: hero_logo_size was `varchar NOT NULL DEFAULT 'medium'`, snapshotted
+ * from the global branding_logo_size at creation. The two gallery render paths
+ * then disagreed — GalleryLayout read the global size live, while the
+ * hero-header path used the per-event snapshot — so a hero logo could render at
+ * different sizes on different layouts, and changing the global size didn't
+ * update hero-header galleries.
+ *
+ * After: NULL = inherit. gallery read-resolution falls back to
+ * branding_logo_size when the per-event value is NULL, and both render paths
+ * consume that resolved size.
+ *
+ * Data backfill: NULL out ALL existing hero_logo_size so every gallery inherits
+ * the global size going forward. Unlike a boolean we can't tell a defaulted
+ * value from a chosen one — but nulling is the safe choice here: it restores the
+ * live-global behaviour GalleryLayout already had, and the per-event size can be
+ * re-set from the event's edit page.
+ */
+exports.up = async function (knex) {
+  if (!(await knex.schema.hasColumn('events', 'hero_logo_size'))) return;
+
+  const client = (knex.client.config.client || '').toLowerCase();
+  if (client === 'pg' || client === 'postgresql') {
+    await knex.raw('ALTER TABLE events ALTER COLUMN hero_logo_size DROP DEFAULT');
+    await knex.raw('ALTER TABLE events ALTER COLUMN hero_logo_size DROP NOT NULL');
+  } else {
+    await knex.schema.alterTable('events', (t) => {
+      t.string('hero_logo_size', 20).nullable().alter();
+    });
+  }
+
+  await knex('events').update({ hero_logo_size: null });
+};
+
+exports.down = async function (knex) {
+  if (!(await knex.schema.hasColumn('events', 'hero_logo_size'))) return;
+  await knex('events').whereNull('hero_logo_size').update({ hero_logo_size: 'medium' });
+
+  const client = (knex.client.config.client || '').toLowerCase();
+  if (client === 'pg' || client === 'postgresql') {
+    await knex.raw("ALTER TABLE events ALTER COLUMN hero_logo_size SET DEFAULT 'medium'");
+    await knex.raw('ALTER TABLE events ALTER COLUMN hero_logo_size SET NOT NULL');
+  } else {
+    await knex.schema.alterTable('events', (t) => {
+      t.string('hero_logo_size', 20).notNullable().defaultTo('medium').alter();
+    });
+  }
+};

backend/src/routes/adminEvents/crud.js

@@ -95,7 +95,7 @@ module.exports = (router) => {
     body('css_template_id').optional({ nullable: true, checkFalsy: true }).isInt(),
     // Hero logo settings
     body('hero_logo_visible').optional().isBoolean(),
-    body('hero_logo_size').optional().isIn(['small', 'medium', 'large', 'xlarge']),
+    body('hero_logo_size').optional({ nullable: true }).isIn(['small', 'medium', 'large', 'xlarge']),
     body('hero_logo_position').optional().isIn(['top', 'center', 'bottom']),
     // Header style settings (decoupled from layout)
     body('header_style').optional().isIn(['hero', 'standard', 'banner', 'minimal', 'none']),
@@ -339,8 +339,16 @@ module.exports = (router) => {
 
       // Get branding defaults for hero logo settings (Feature 7: Branding Inheritance)
       const brandingDefaults = await getBrandingDefaults();
-      const effectiveHeroLogoVisible = req.body.hero_logo_visible !== undefined ? hero_logo_visible : brandingDefaults.hero_logo_visible;
-      const effectiveHeroLogoSize = req.body.hero_logo_size || brandingDefaults.hero_logo_size;
+      // hero_logo_visible: store NULL ("inherit") unless the admin explicitly
+      // set it, so the global branding_logo_display_hero toggle keeps
+      // controlling this gallery afterwards (#756). Only an explicit per-event
+      // choice overrides the global.
+      const effectiveHeroLogoVisible = req.body.hero_logo_visible !== undefined
+        ? formatBoolean(hero_logo_visible)
+        : null;
+      // NULL = inherit the global branding_logo_size (#756), resolved at read
+      // time. Only an explicit per-event size overrides it.
+      const effectiveHeroLogoSize = req.body.hero_logo_size || null;
       const effectiveHeroLogoPosition = req.body.hero_logo_position || brandingDefaults.hero_logo_position;
 
       // Inherit "Detect dev tools" from the global Image Security setting unless
@@ -425,7 +433,8 @@ module.exports = (router) => {
         allow_presigned_download: formatBoolean(allow_presigned_download === true || allow_presigned_download === 'true'),
         require_password: formatBoolean(requirePassword),
         css_template_id: css_template_id || null,
-        hero_logo_visible: formatBoolean(effectiveHeroLogoVisible),
+        // Already formatBoolean-coerced above, or null = inherit global (#756).
+        hero_logo_visible: effectiveHeroLogoVisible,
         hero_logo_size: effectiveHeroLogoSize,
         hero_logo_position: effectiveHeroLogoPosition,
         header_style: effectiveHeaderStyle || 'standard',
@@ -1216,7 +1225,7 @@ module.exports = (router) => {
     body('css_template_id').optional({ nullable: true, checkFalsy: true }).isInt(),
     // Hero logo settings
     body('hero_logo_visible').optional().isBoolean(),
-    body('hero_logo_size').optional().isIn(['small', 'medium', 'large', 'xlarge']),
+    body('hero_logo_size').optional({ nullable: true }).isIn(['small', 'medium', 'large', 'xlarge']),
     body('hero_logo_position').optional().isIn(['top', 'center', 'bottom']),
     // Header style settings (decoupled from layout)
     body('header_style').optional().isIn(['hero', 'standard', 'banner', 'minimal', 'none']),
@@ -1424,9 +1433,13 @@ module.exports = (router) => {
         updates.expires_at = null;
       }
 
-      // Format hero logo settings if provided
+      // Format hero logo settings if provided. null = inherit the global
+      // branding_logo_display_hero toggle (#756); only an explicit true/false
+      // is a per-event override.
       if (Object.prototype.hasOwnProperty.call(updates, 'hero_logo_visible')) {
-        updates.hero_logo_visible = formatBoolean(updates.hero_logo_visible);
+        updates.hero_logo_visible = updates.hero_logo_visible === null
+          ? null
+          : formatBoolean(updates.hero_logo_visible);
       }
 
       // Per-event opt-in for hero-photo OG share image (#474). Coerce so

backend/src/routes/gallery.js

@@ -2,9 +2,21 @@ const express = require('express');
 const jwt = require('jsonwebtoken');
 const { db } = require('../database/db');
 const { formatBoolean } = require('../utils/dbCompat');
+const { getAppSetting } = require('../utils/appSettings');
 const archiver = require('archiver');
 const path = require('path');
 const router = express.Router();
+
+// #756: a NULL per-event hero_logo_visible means "inherit the global
+// branding_logo_display_hero toggle". Only an explicit true/false is a
+// per-gallery override. `globalDefault` is branding_logo_display_hero
+// (defaults true when unset).
+function resolveHeroLogoVisible(perEvent, globalDefault) {
+  if (perEvent === null || perEvent === undefined) {
+    return globalDefault !== false;
+  }
+  return perEvent !== false && perEvent !== 0 && perEvent !== '0';
+}
 const watermarkService = require('../services/watermarkService');
 const watermarkGeneratorService = require('../services/watermarkGeneratorService');
 const { verifyGalleryAccess, denySlideshowToken, isAdminPreview } = require('../middleware/gallery');
@@ -182,6 +194,8 @@ router.get('/:slug/info', async (req, res) => {
     }
     
     const requiresPassword = !(event.require_password === false || event.require_password === 0 || event.require_password === '0');
+    const globalHeroLogoVisible = await getAppSetting('branding_logo_display_hero', true);
+    const globalLogoSize = await getAppSetting('branding_logo_size', 'medium');
 
     res.json({
       event_name: event.event_name,
@@ -199,8 +213,9 @@ router.get('/:slug/info', async (req, res) => {
       watermark_text: event.watermark_text,
       enable_devtools_protection: event.enable_devtools_protection === true || event.enable_devtools_protection === 1 || event.enable_devtools_protection === '1',
       use_canvas_rendering: event.use_canvas_rendering === true || event.use_canvas_rendering === 1 || event.use_canvas_rendering === '1',
-      hero_logo_visible: event.hero_logo_visible !== false && event.hero_logo_visible !== 0 && event.hero_logo_visible !== '0',
-      hero_logo_size: event.hero_logo_size || 'medium',
+      hero_logo_visible: resolveHeroLogoVisible(event.hero_logo_visible, globalHeroLogoVisible),
+      // #756: NULL per-event size inherits the global branding_logo_size.
+      hero_logo_size: event.hero_logo_size || globalLogoSize || 'medium',
       hero_logo_position: event.hero_logo_position || 'top',
       hero_logo_url: event.hero_logo_url || null,
       header_style: event.header_style || 'standard',
@@ -635,7 +650,8 @@ router.get('/:slug/photos', verifyGalleryAccess, resolveGuest, async (req, res)
     // selection back to source files. Tied to the same toggle as downloads —
     // one switch controls both surfaces.
     const useOriginalFilenames = await getUseOriginalFilenames();
-    
+    const globalHeroLogoVisible = await getAppSetting('branding_logo_display_hero', true);
+    const globalLogoSize = await getAppSetting('branding_logo_size', 'medium');
 
     res.json({
       event: {
@@ -654,8 +670,8 @@ router.get('/:slug/photos', verifyGalleryAccess, resolveGuest, async (req, res)
         watermark_text: req.event.watermark_text,
         enable_devtools_protection: req.event.enable_devtools_protection === true,
         use_canvas_rendering: req.event.use_canvas_rendering === true,
-        hero_logo_visible: req.event.hero_logo_visible !== false && req.event.hero_logo_visible !== 0 && req.event.hero_logo_visible !== '0',
-        hero_logo_size: req.event.hero_logo_size || 'medium',
+        hero_logo_visible: resolveHeroLogoVisible(req.event.hero_logo_visible, globalHeroLogoVisible),
+        hero_logo_size: req.event.hero_logo_size || globalLogoSize || 'medium',
         hero_logo_position: req.event.hero_logo_position || 'top',
         hero_logo_url: req.event.hero_logo_url || null,
         header_style: req.event.header_style || 'standard',