Feature #44684 » 0002-Distinguish-built-in-and-Gravatar-initials-in-the-de.patch
| app/helpers/settings_helper.rb | ||
|---|---|---|
| 249 | 249 |
end |
| 250 | 250 | |
| 251 | 251 |
def gravatar_default_setting_options |
| 252 |
[['Initials', 'initials'], |
|
| 252 |
[['Initials (built-in)', ''], |
|
| 253 |
['Initials (Gravatar)', 'initials'], |
|
| 253 | 254 |
['Color', 'color'], |
| 254 | 255 |
['Mystery man', 'mm'], |
| 255 | 256 |
['Identicons', 'identicon'], |
| app/views/settings/_display.html.erb | ||
|---|---|---|
| 40 | 40 |
<%= t(:text_avatar_server_config_html, :url => Redmine::Configuration['avatar_server_url']) %></em></p> |
| 41 | 41 | |
| 42 | 42 |
<p> |
| 43 |
<%= setting_select :gravatar_default, gravatar_default_setting_options, :blank => :label_none %>
|
|
| 43 |
<%= setting_select :gravatar_default, gravatar_default_setting_options %> |
|
| 44 | 44 |
<em class="<%= Setting.gravatar_default == "initials" ? "info" : "hidden" %>"> |
| 45 | 45 |
<%= t(:text_setting_gravatar_default_initials_html, :url => Redmine::Configuration['avatar_server_url']) %> |
| 46 | 46 |
</em> |
| test/functional/settings_controller_test.rb | ||
|---|---|---|
| 79 | 79 |
assert_select '#settings_gravatar_default ~ em.info a[href=?]', url, :text => url |
| 80 | 80 |
end |
| 81 | 81 | |
| 82 |
def test_get_edit_should_distinguish_built_in_and_gravatar_initials_options |
|
| 83 |
get :edit |
|
| 84 |
assert_response :success |
|
| 85 | ||
| 86 |
assert_select '#settings_gravatar_default' do |
|
| 87 |
assert_select 'option[value=""]', :text => 'Initials (built-in)' |
|
| 88 |
assert_select 'option[value="initials"]', :text => 'Initials (Gravatar)' |
|
| 89 |
end |
|
| 90 |
end |
|
| 91 | ||
| 82 | 92 |
def test_post_edit_notifications |
| 83 | 93 |
post :edit, :params => {
|
| 84 | 94 |
:settings => {
|