WebDAV tests fixed and re-enabled

This commit is contained in:
Karel Picman 2014-04-03 15:08:18 +02:00
parent a1aee1100b
commit f6e444e1c0
2 changed files with 2 additions and 5 deletions

View File

@ -107,13 +107,11 @@ class DmsfFile < ActiveRecord::Base
return false
end
begin
if Setting.plugin_redmine_dmsf['dmsf_really_delete_files']
Rails.logger.info '>>> destroy'
if Setting.plugin_redmine_dmsf['dmsf_really_delete_files']
self.revisions.visible.each {|r| r.delete(true)}
self.destroy
else
# Revisions of a deleted file SHOULD be deleted too
Rails.logger.info '>>> visible'
self.revisions.visible.each {|r| r.delete }
self.deleted = true
self.deleted_by_user = User.current

View File

@ -232,8 +232,7 @@ module RedmineDmsf
#
# <instance> should be of entity to be deleted, we simply follow the Dmsf entity method
# for deletion and return of appropriate status based on outcome.
def delete
Rails.logger.info ">>>> def delete"
def delete
if(file?) then
raise Forbidden unless User.current.admin? || User.current.allowed_to?(:file_manipulation, project)
file.delete ? NoContent : Conflict