Redmine 4.1.1
This commit is contained in:
parent
33e7b881a5
commit
3d976f1b3b
1593 changed files with 36180 additions and 19489 deletions
|
@ -1,7 +1,7 @@
|
|||
# encoding: utf-8
|
||||
#
|
||||
# frozen_string_literal: true
|
||||
|
||||
# Redmine - project management software
|
||||
# Copyright (C) 2006-2017 Jean-Philippe Lang
|
||||
# Copyright (C) 2006-2019 Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
|
@ -24,6 +24,7 @@ module SettingsHelper
|
|||
{:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
|
||||
{:name => 'api', :partial => 'settings/api', :label => :label_api},
|
||||
{:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
|
||||
{:name => 'users', :partial => 'settings/users', :label => :label_user_plural},
|
||||
{:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
|
||||
{:name => 'timelog', :partial => 'settings/timelog', :label => :label_time_tracking},
|
||||
{:name => 'attachments', :partial => 'settings/attachments', :label => :label_attachment_plural},
|
||||
|
@ -112,20 +113,16 @@ module SettingsHelper
|
|||
tag_data = notifiable.parent.present? ?
|
||||
{:parent_notifiable => notifiable.parent} :
|
||||
{:disables => "input[data-parent-notifiable=#{notifiable.name}]"}
|
||||
|
||||
tag = check_box_tag('settings[notified_events][]',
|
||||
notifiable.name,
|
||||
setting_value('notified_events').include?(notifiable.name),
|
||||
:id => nil,
|
||||
:data => tag_data)
|
||||
|
||||
notifiable.name,
|
||||
setting_value('notified_events').include?(notifiable.name),
|
||||
:id => nil,
|
||||
:data => tag_data)
|
||||
text = l_or_humanize(notifiable.name, :prefix => 'label_')
|
||||
|
||||
options = {}
|
||||
if notifiable.parent.present?
|
||||
options[:class] = "parent"
|
||||
end
|
||||
|
||||
content_tag(:label, tag + text, options)
|
||||
end
|
||||
|
||||
|
@ -207,4 +204,13 @@ module SettingsHelper
|
|||
["#{today} (#{format})", f]
|
||||
end
|
||||
end
|
||||
|
||||
def gravatar_default_setting_options
|
||||
[['Identicons', 'identicon'],
|
||||
['Monster ids', 'monsterid'],
|
||||
['Mystery man', 'mm'],
|
||||
['Retro', 'retro'],
|
||||
['Robohash', 'robohash'],
|
||||
['Wavatars', 'wavatar']]
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue