Error 500 when a link to another folder is in the folder/project #565 - master branch
This commit is contained in:
parent
942cf99114
commit
9f199d299d
@ -32,7 +32,7 @@
|
||||
<%= link_to(h(title),
|
||||
dmsf_folder_path(:id => project, :folder_id => subfolder),
|
||||
:class => 'icon icon-folder',
|
||||
:title => h(subfolder.description)) %>
|
||||
:title => subfolder ? h(subfolder.description) : nil) %>
|
||||
<% if link %>
|
||||
<div class="dmsf_filename" title="<%= l(:label_target_folder)%>"><%= link.path %></div>
|
||||
<% else %>
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
<td class="dmsf_checkbox"><%= check_box_tag(name, id, false,
|
||||
:title => l(:title_check_for_restore_or_delete), :id => "subfolder_#{id}") %></td>
|
||||
<td class="dmsf_title">
|
||||
<%= content_tag(:span, h(title),
|
||||
:title => h(subfolder.description),
|
||||
<%= content_tag(:span, h(title),
|
||||
:title => subfolder ? h(subfolder.description) : nil,
|
||||
:class => 'icon icon-folder') %>
|
||||
<% if link %>
|
||||
<div class="dmsf_filename" title="<%= l(:label_target_folder)%>"><%= link.path %></div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user