From: Tom Hughes Date: Sat, 5 Mar 2022 10:08:53 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/3489' X-Git-Tag: live~2202 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/5110b1c706d25e58ecb188c4b1e756cc5760addc?hp=cbcc7dc49f83f60489fde04b0750cf081e7439fb Merge remote-tracking branch 'upstream/pull/3489' --- diff --git a/app/views/oauth2_applications/index.html.erb b/app/views/oauth2_applications/index.html.erb index 119bf5878..4ed849f98 100644 --- a/app/views/oauth2_applications/index.html.erb +++ b/app/views/oauth2_applications/index.html.erb @@ -7,10 +7,12 @@ <% if @applications.length > 0 %> - - - - + + + + + + <%= render :partial => "application", :collection => @applications %> diff --git a/app/views/oauth2_applications/show.html.erb b/app/views/oauth2_applications/show.html.erb index 296705811..8d9c8516d 100644 --- a/app/views/oauth2_applications/show.html.erb +++ b/app/views/oauth2_applications/show.html.erb @@ -48,4 +48,4 @@

<%= link_to t(".edit"), edit_oauth_application_path(@application), :class => "btn btn-outline-primary" %> <%= link_to t(".delete"), oauth_application_path(@application), { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_delete") } } %> - +

diff --git a/app/views/oauth2_authorized_applications/index.html.erb b/app/views/oauth2_authorized_applications/index.html.erb index b9599a919..2d3ad00bd 100644 --- a/app/views/oauth2_authorized_applications/index.html.erb +++ b/app/views/oauth2_authorized_applications/index.html.erb @@ -7,9 +7,11 @@ <% if @applications.length > 0 %>

<%= t ".name" %>	<%= t ".permissions" %>
<%= t ".name" %>	<%= t ".permissions" %>

- - - + + + + + <%= render :partial => "application", :collection => @applications %> diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb index f1f48c1e1..1a3807e4a 100644 --- a/app/views/site/_id.html.erb +++ b/app/views/site/_id.html.erb @@ -1,10 +1,10 @@ <%= javascript_include_tag "edit/id" %>

- <% data = { :key => Settings.id_key } -%> - <% data[:lat] = @lat if @lat -%> - <% data[:lon] = @lon if @lon -%> - <% data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx] -%> - <% data[:url] = id_url(:locale => params[:locale]) -%> + <% data = { :key => Settings.id_key } + data[:lat] = @lat if @lat + data[:lon] = @lon if @lon + data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx] + data[:url] = id_url(:locale => params[:locale]) %> <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb index e6c65a992..c82893e9d 100644 --- a/app/views/site/help.html.erb +++ b/app/views/site/help.html.erb @@ -16,7 +16,7 @@ <%= t ".#{site}.title" %> - +

<%= t ".#{site}.description" %>

diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb index 0178c8f22..ec067b9e7 100644 --- a/app/views/site/id.html.erb +++ b/app/views/site/id.html.erb @@ -8,16 +8,16 @@ -<% data = {} -%> -<% if Settings.key?(:id_key) %> -<% token = current_user.access_token(Settings.id_key) %> -<% data[:token] = token.token -%> -<% data[:token_secret] = token.secret -%> -<% data[:consumer_key] = token.client_application.key -%> -<% data[:consumer_secret] = token.client_application.secret -%> -<% end %> -<% data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s -%> -<% data[:asset_map] = assets("iD").to_json -%> +<% data = {} + if Settings.key?(:id_key) + token = current_user.access_token(Settings.id_key) + data[:token] = token.token + data[:token_secret] = token.secret + data[:consumer_key] = token.client_application.key + data[:consumer_secret] = token.client_application.secret + end + data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s + data[:asset_map] = assets("iD").to_json %> <%= tag.div "", :id => "id-container", :data => data %> diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb index e82711a4e..7d1f83ce3 100644 --- a/app/views/user_blocks/blocks_on.html.erb +++ b/app/views/user_blocks/blocks_on.html.erb @@ -2,6 +2,7 @@ <% content_for :heading do %>

<%= t(".heading_html", :name => link_to(@user.display_name, user_path(@user))) %>

<% end %> + <% unless @user_blocks.empty? %> <%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => false, :show_creator_name => true } %> <% else %> diff --git a/test/controllers/oauth2_applications_controller_test.rb b/test/controllers/oauth2_applications_controller_test.rb index 149b6ee35..1b6eaabfe 100644 --- a/test/controllers/oauth2_applications_controller_test.rb +++ b/test/controllers/oauth2_applications_controller_test.rb @@ -51,7 +51,7 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest get oauth_applications_path assert_response :success assert_template "oauth2_applications/index" - assert_select "tr", 2 + assert_select "tbody tr", 2 end def test_new diff --git a/test/controllers/oauth2_authorized_applications_controller_test.rb b/test/controllers/oauth2_authorized_applications_controller_test.rb index 45a60efcb..347d3e40e 100644 --- a/test/controllers/oauth2_authorized_applications_controller_test.rb +++ b/test/controllers/oauth2_authorized_applications_controller_test.rb @@ -33,7 +33,7 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe get oauth_authorized_applications_path assert_response :success assert_template "oauth2_authorized_applications/index" - assert_select "tr", 2 + assert_select "tbody tr", 2 end def test_destroy @@ -58,6 +58,6 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe get oauth_authorized_applications_path assert_response :success assert_template "oauth2_authorized_applications/index" - assert_select "tr", 1 + assert_select "tbody tr", 1 end end

<%= t ".application" %>	<%= t ".permissions" %>
<%= t ".application" %>	<%= t ".permissions" %>