redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Custom fields tabs not work with last custom_fields_helper_patch.rb #267

Browse Source
This commit is contained in:
Karel Pičman 2015-07-16 10:43:12 +02:00
parent ab16cde32d
commit fa07cd7576
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/redmine_dmsf/patches/custom_fields_helper_patch.rb
View File

@ -1,8 +1,10 @@
# encoding: utf-8
#
# Redmine plugin for Document Management System "Features"
#
# Copyright (C) 2011 Vít Jonáš <vit.jonas@gmail.com>
# Copyright (C) 2012 Daniel Munn <dan.munn@munnster.co.uk>
# Copyright (C) 2011-15 Karel Picman <karel.picman@kontron.com>
# Copyright (C) 2011-15 Karel Pičman <karel.picman@kontron.com>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@ -40,24 +42,21 @@ module RedmineDmsf
module InstanceMethods
def render_custom_fields_tabs_with_render_custom_tab(types)
add_cf
render_custom_fields_tabs_without_render_custom_tab(types)
end
def custom_field_type_options_with_custom_tab_options
add_cf
custom_field_type_options_without_custom_tab_options
end
private
def add_cf
cf = {:name => 'DmsfFileRevisionCustomField', :partial => 'custom_fields/index', :label => :dmsf}
unless CustomFieldsHelper::CUSTOM_FIELDS_TABS.index { |f| f[:name] == cf[:name] }
CustomFieldsHelper::CUSTOM_FIELDS_TABS << cf
end
render_custom_fields_tabs_without_render_custom_tab(types)
end
def custom_field_type_options_with_custom_tab_options
cf = {:name => 'DmsfFileRevisionCustomField', :partial => 'custom_fields/index', :label => :dmsf}
unless CustomFieldsHelper::CUSTOM_FIELDS_TABS.index { |f| f[:name] == cf[:name] }
CustomFieldsHelper::CUSTOM_FIELDS_TABS << cf
end
custom_field_type_options_without_custom_tab_options
end
end
end
end

3
lib/redmine_dmsf/webdav/dmsf_resource.rb
View File

@ -221,8 +221,7 @@ module RedmineDmsf
if (parent.projectless_path != '/')
return Conflict unless parent.folder?
parent_folder = parent.folder.id
end
#f = DmsfFolder.new({:title => basename, :dmsf_folder_id => parent_folder, :description => 'Folder created from WebDav'})
end
f = DmsfFolder.new
f.title = basename
f.dmsf_folder_id = parent_folder