Can't delete locked documents from the trash #710

app/controllers/dmsf_controller.rb

@@ -38,7 +38,6 @@ class DmsfController < ApplicationController
   helper :dmsf_folder_permissions
 
   def permissions
-    Rails.logger.info ">>> #{DmsfFolder.visible.where(:project_id => @project.id).to_sql}"
     render_403 unless DmsfFolder.permissions(@folder)
     true
   end

app/models/dmsf_file.rb

@@ -148,9 +148,13 @@ class DmsfFile < ActiveRecord::Base
   end
 
   def delete(commit)
-    if locked_for_user?
+    if locked_for_user? && (!User.current.allowed_to?(:force_file_unlock, self.project))
       Rails.logger.info l(:error_file_is_locked)
-      errors[:base] << l(:error_file_is_locked)
+      if self.lock.reverse[0].user
+        errors[:base] << l(:title_locked_by_user, :user => self.lock.reverse[0].user)
+      else
+        errors[:base] << l(:error_file_is_locked)
+      end
       return false
     end
     begin

app/views/dmsf/_dir_trash.html.erb

@@ -80,6 +80,7 @@
       <%= link_to('', delete_dmsf_path(:id => project, :folder_id => subfolder, :commit => 'yes'),
         :data => {:confirm => l(:text_are_you_sure)},
         :title => l(:title_delete),
+        :method => :delete,
         :class => 'icon icon-delete') %>
     <% end %>
   <% end %>