Fix: due to a bad if in Lockable::lock did not traverse the heirarchy as expected
This commit is contained in:
parent
c9d6c32ba4
commit
86bc901965
@ -154,8 +154,8 @@
|
||||
<%= file.last_revision.updated_at.strftime("%Y-%m-%d %H:%M") %>
|
||||
<% if file.locked_for_user? %>
|
||||
<%= link_to(image_tag("locked.png", :plugin => :redmine_dmsf),
|
||||
{:controller => "users", :action => "show", :id => file.locks[0].user },
|
||||
:title => l(:title_locked_by_user, :user => file.locks[0].user.to_s)) %>
|
||||
{:controller => "users", :action => "show", :id => file.lock.reverse[0].user },
|
||||
:title => l(:title_locked_by_user, :user => file.lock.reverse[0].user.to_s)) %>
|
||||
<% elsif file.locked? %>
|
||||
<%= image_tag("lockedbycurrent.png", :title => l(:title_locked_by_you), :plugin => :redmine_dmsf) %>
|
||||
<% end %>
|
||||
|
||||
@ -16,7 +16,7 @@ module RedmineDmsf
|
||||
}
|
||||
end
|
||||
if tree
|
||||
ret = ret | (folder.locks || folder.lock) unless folder.nil?
|
||||
ret = ret | (folder.locks.empty? ? folder.lock : folder.locks) unless folder.nil?
|
||||
end
|
||||
return ret
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user