Staging (#1030)

* Display a dash when the section's file location is nil [skip ci] (#1023) * version bump for 5.1.2 release
avalonmediasystem · Aug 4, 2016 · 76de5b8 · 76de5b8
1 parent 28f5c64
commit 76de5b8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/app/views/media_objects/_file_upload.html.erb b/app/views/media_objects/_file_upload.html.erb
@@ -86,7 +86,11 @@ Unless required by applicable law or agreed to in writing, software distributed
  <% end %>
  </td>
  <td class="section-filename">
- <%= truncate_center(File.basename(part.file_location), 50, 20) %>
+ <% if part.file_location.present? %>
+ <%= truncate_center(File.basename(part.file_location), 50, 20) %>
+ <% else %>
+ -
+ <% end %>
  </td>
  <td>
  <%= number_to_human_size(part.file_size) %>

diff --git a/app/views/media_objects/_structure.html.erb b/app/views/media_objects/_structure.html.erb
@@ -42,7 +42,11 @@ Unless required by applicable law or agreed to in writing, software distributed
  </li><li>
  <%= section.label.blank? ? '&#8212;'.html_safe : section.label %>
  </li><li>
- <%= truncate_center(File.basename(section.file_location), 50, 20) %>
+ <% if section.file_location.present? %>
+ <%= truncate_center(File.basename(section.file_location), 50, 20) %>
+ <% else %>
+ -
+ <% end %>
  </li><li>
  <%= number_to_human_size(section.file_size) %>
  </li><li>

diff --git a/config/application.rb b/config/application.rb
@@ -11,7 +11,7 @@
 end
 
 module Avalon
- VERSION = '5.1.1'
+ VERSION = '5.1.2'
  class MissingUserId < Exception; end
 
  class Application < Rails::Application