Fix compatible with other plugins which overwrites projects_helper
This commit is contained in:
@@ -12,6 +12,9 @@ Rails.configuration.to_prepare do
|
||||
require 'redmine_messenger/patches/db_entry_patch' if RedmineMessenger::REDMINE_DB_SUPPORT
|
||||
require 'redmine_messenger/patches/password_patch' if RedmineMessenger::REDMINE_PASSWORDS_SUPPORT
|
||||
|
||||
# Global helpers
|
||||
require_dependency 'redmine_messenger/helpers'
|
||||
|
||||
# Hooks
|
||||
require_dependency 'redmine_messenger/hooks'
|
||||
end
|
||||
|
||||
21
lib/redmine_messenger/helpers.rb
Normal file
21
lib/redmine_messenger/helpers.rb
Normal file
@@ -0,0 +1,21 @@
|
||||
# Redmine Messenger plugin for Redmine
|
||||
|
||||
module RedmineMessenger
|
||||
module Helpers
|
||||
def project_messenger_options(active)
|
||||
options_for_select({ l(:label_messenger_settings_default) => 0,
|
||||
l(:label_messenger_settings_disabled) => 1,
|
||||
l(:label_messenger_settings_enabled) => 2 }, active)
|
||||
end
|
||||
|
||||
def project_setting_messenger_default_value(value)
|
||||
if Messenger.default_project_setting(@project, value)
|
||||
l(:label_messenger_settings_enabled)
|
||||
else
|
||||
l(:label_messenger_settings_disabled)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
ActionView::Base.send :include, RedmineMessenger::Helpers
|
||||
@@ -1,7 +1,5 @@
|
||||
# Redmine Messenger plugin for Redmine
|
||||
|
||||
require_dependency 'projects_helper'
|
||||
|
||||
module RedmineMessenger
|
||||
module Patches
|
||||
module ProjectsHelperPatch
|
||||
@@ -13,12 +11,6 @@ module RedmineMessenger
|
||||
end
|
||||
|
||||
module InstanceMethods
|
||||
def project_messenger_options(active)
|
||||
options_for_select({ l(:label_messenger_settings_default) => 0,
|
||||
l(:label_messenger_settings_disabled) => 1,
|
||||
l(:label_messenger_settings_enabled) => 2 }, active)
|
||||
end
|
||||
|
||||
def project_settings_tabs_with_messenger
|
||||
tabs = project_settings_tabs_without_messenger
|
||||
action = { name: 'messenger',
|
||||
@@ -30,14 +22,6 @@ module RedmineMessenger
|
||||
tabs << action if User.current.allowed_to?(:manage_messenger, @project)
|
||||
tabs
|
||||
end
|
||||
|
||||
def project_setting_messenger_default_value(value)
|
||||
if Messenger.default_project_setting(@project, value)
|
||||
l(:label_messenger_settings_enabled)
|
||||
else
|
||||
l(:label_messenger_settings_disabled)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user