diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index e36b46297..242b3d3ee 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -2,6 +2,7 @@ - fixed: During postback on a recurring transaction, the routine could error out instead of catching an error. - fixed: Do not show the Edit entry in the More menu in the asset manager if the asset is locked. - fixed #9677: no output from form helper template variable sticky.form and stick.label + - fixed #9738: Gallery Title [TEMPLATE] 7.6.11 - fixed: Asset Manager can generate URLs that are too long diff --git a/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-delete-album.wgpkg b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-delete-album.wgpkg new file mode 100644 index 000000000..dcb26da30 Binary files /dev/null and b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-delete-album.wgpkg differ diff --git a/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-delete-file.wgpkg b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-delete-file.wgpkg new file mode 100644 index 000000000..4c35daf10 Binary files /dev/null and b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-delete-file.wgpkg differ diff --git a/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-edit-comment.wgpkg b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-edit-comment.wgpkg new file mode 100644 index 000000000..5209c3608 Binary files /dev/null and b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-edit-comment.wgpkg differ diff --git a/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-list-albums-view.wgpkg b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-list-albums-view.wgpkg new file mode 100644 index 000000000..35b4d1c7c Binary files /dev/null and b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-list-albums-view.wgpkg differ diff --git a/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-list-files-for-user.wgpkg b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-list-files-for-user.wgpkg new file mode 100644 index 000000000..c7f19de93 Binary files /dev/null and b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-list-files-for-user.wgpkg differ diff --git a/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-search.wgpkg b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-search.wgpkg new file mode 100644 index 000000000..419b68adc Binary files /dev/null and b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-search.wgpkg differ diff --git a/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-view-album-thumbnails.wgpkg b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-view-album-thumbnails.wgpkg new file mode 100644 index 000000000..57734e226 Binary files /dev/null and b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-view-album-thumbnails.wgpkg differ diff --git a/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-view-album.wgpkg b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-view-album.wgpkg new file mode 100644 index 000000000..b8963796e Binary files /dev/null and b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-view-album.wgpkg differ diff --git a/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-view-photo.wgpkg b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-view-photo.wgpkg new file mode 100644 index 000000000..c1c8f3aae Binary files /dev/null and b/docs/upgrades/packages-7.6.12/root_import_gallery-templates_default-gallery-view-photo.wgpkg differ diff --git a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm index 88ab9d778..2a0c7b86b 100644 --- a/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm +++ b/lib/WebGUI/Asset/Wobject/GalleryAlbum.pm @@ -537,7 +537,7 @@ sub getTemplateVars { # Add some specific vars from the Gallery my $galleryVar = $gallery->getTemplateVars; - for my $key ( qw{ title menuTitle url } ) { + for my $key ( qw{ title menuTitle url displayTitle } ) { $var->{ "gallery_" . $key } = $galleryVar->{ $key }; } diff --git a/lib/WebGUI/Help/Asset_GalleryAlbum.pm b/lib/WebGUI/Help/Asset_GalleryAlbum.pm index 77845dc23..b3c854269 100644 --- a/lib/WebGUI/Help/Asset_GalleryAlbum.pm +++ b/lib/WebGUI/Help/Asset_GalleryAlbum.pm @@ -124,6 +124,10 @@ our $HELP = { name => 'gallery_url', description => 'helpvar gallery_url', }, + { + name => 'gallery_displayTitle', + description => 'helpvar gallery_displayTitle', + }, ], }, diff --git a/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm b/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm index 4b77c4eab..c2085656a 100644 --- a/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm +++ b/lib/WebGUI/i18n/English/Asset_GalleryAlbum.pm @@ -490,6 +490,12 @@ our $I18N = { context => q{Description of template variable}, }, + 'helpvar gallery_displayTitle' => { + message => q{Whether the Gallery containing this File is set to display its title, or not.}, + lastUpdated => 0, + context => q{Description of template variable}, + }, + 'helpvar isPending' => { message => q{A flag to set if the GalleryAlbum is not yet approved. Users who can edit the GalleryAlbum are allowed to see them before they are approved.}, lastUpdated => 0,