Merge branch 'master' into devel-1.6.1

This commit is contained in:
Karel Picman 2018-01-16 13:38:13 +01:00
commit 1a66110202
3 changed files with 10 additions and 17 deletions

View File

@ -70,23 +70,8 @@ else
require File.expand_path('../app/models/easy_page_modules/easy_dms/epm_dmsf_locked_documents', __FILE__)
require File.expand_path('../app/models/easy_page_modules/easy_dms/epm_dmsf_open_approvals', __FILE__)
EpmDmsfLockedDocuments.register_to_scope(:user, :plugin => :easy_dms)
EpmDmsfOpenApprovals.register_to_scope(:user, :plugin => :easy_dms)
EasyExtensions::AfterInstallScripts.add do
page = EasyPage.where(:page_name => 'project-overview').first
page_template = page.default_template if page
unless page_template
page_template = EasyPageTemplate.create(:easy_pages_id => page.id, :template_name => 'Default template',
:description => 'Default template', :is_default => true)
EasyPageTemplateModule.create_template_module(page, page_template, EpmDmsfLockedDocuments.first,
'top-left', HashWithIndifferentAccess.new, 1)
EasyPageTemplateModule.create_template_module(page, page_template, EpmDmsfOpenApprovals.first,
'top-left', HashWithIndifferentAccess.new, 1)
end
end
EpmDmsfLockedDocuments.register_to_scope(:user, :plugin => :redmine_dmsf)
EpmDmsfOpenApprovals.register_to_scope(:user, :plugin => :redmine_dmsf)
end
end

View File

@ -32,4 +32,8 @@ class EpmDmsfLockedDocuments < EasyPageModule
{}
end
def registered_in_plugin
'redmine_dmsf'
end
end

View File

@ -28,4 +28,8 @@ class EpmDmsfOpenApprovals < EasyPageModule
{}
end
def registered_in_plugin
'redmine_dmsf'
end
end