diff options
| -rw-r--r-- | app.rb | 4 | ||||
| -rw-r--r-- | views/album.erb | 2 |
2 files changed, 2 insertions, 4 deletions
@@ -342,9 +342,7 @@ def slideshow_view(rel) top_dirs = params[:dirs]&.split(',')&.map(&:strip)&.reject(&:empty?) all_media_entries(top_dirs: top_dirs&.any? ? top_dirs : nil) else - album_files(dir, data) - .select { |e| %i[image video].include?(e[:type]) } - .map { |e| e.merge(file_rel: "#{rel}/#{e[:name]}") } + all_media_entries(top_dirs: [rel]) end erb :slideshow, layout: false end diff --git a/views/album.erb b/views/album.erb index 3dc4fdb..8577bdb 100644 --- a/views/album.erb +++ b/views/album.erb @@ -10,7 +10,7 @@ <% end %> <h1><%= @title %></h1> <% if @desc %><p class="album-desc"><%= @desc %></p><% end %> - <% if @rel.empty? ? @albums.any? : @entries.any? { |e| %i[image video].include?(e[:type]) } %> + <% if @albums.any? || @entries.any? { |e| %i[image video].include?(e[:type]) } %> <div class="ss-launcher"> <a href="/slideshow/<%= @rel %>" id="ss-launch" data-base="/slideshow/<%= @rel %>" class="btn">Slideshow</a> <div class="ss-opts"> |