Merge remote-tracking branch 'upstream/pull/4581'

[rails.git] / app / views / oauth2_authorizations / new.html.erb

diff --git a/app/views/oauth2_authorizations/new.html.erb b/app/views/oauth2_authorizations/new.html.erb
index 3b943a043c503f886cc7280160e840725f213b8a..8720bf05a6461bee51d96a9ec83ccc154e5dde24 100644 (file)
--- a/app/views/oauth2_authorizations/new.html.erb
+++ b/app/views/oauth2_authorizations/new.html.erb
@@ -6,11 +6,11 @@
 
 <ul>
   <% @pre_auth.scopes.each do |scope| -%>
 
 <ul>
   <% @pre_auth.scopes.each do |scope| -%>

-    <li><%= t "oauth.scopes.#{scope}" %></li>
+    <li><%= authorization_scope(scope) %></li>

   <% end -%>
 </ul>
 
   <% end -%>
 </ul>
 

-<div class="row justify-content-start no-gutters mx-n1">
+<div class="row justify-content-start g-0 mx-n1">

   <div class="col-auto mx-1">
     <%= bootstrap_form_tag :action => :create do |f| %>
       <%= f.hidden_field :client_id, :value => @pre_auth.client.uid %>
   <div class="col-auto mx-1">
     <%= bootstrap_form_tag :action => :create do |f| %>
       <%= f.hidden_field :client_id, :value => @pre_auth.client.uid %>


@@ -18,6 +18,7 @@
       <%= f.hidden_field :state, :value => @pre_auth.state %>
       <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
       <%= f.hidden_field :scope, :value => @pre_auth.scope %>
       <%= f.hidden_field :state, :value => @pre_auth.state %>
       <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
       <%= f.hidden_field :scope, :value => @pre_auth.scope %>

+      <%= f.hidden_field :nonce, :value => @pre_auth.nonce %>

       <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
       <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
       <%= f.primary t(".authorize") %>
       <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
       <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
       <%= f.primary t(".authorize") %>


@@ -30,6 +31,7 @@
       <%= f.hidden_field :state, :value => @pre_auth.state %>
       <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
       <%= f.hidden_field :scope, :value => @pre_auth.scope %>
       <%= f.hidden_field :state, :value => @pre_auth.state %>
       <%= f.hidden_field :response_type, :value => @pre_auth.response_type %>
       <%= f.hidden_field :scope, :value => @pre_auth.scope %>

+      <%= f.hidden_field :nonce, :value => @pre_auth.nonce %>

       <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
       <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
       <%= f.submit t(".deny") %>
       <%= f.hidden_field :code_challenge, :value => @pre_auth.code_challenge %>
       <%= f.hidden_field :code_challenge_method, :value => @pre_auth.code_challenge_method %>
       <%= f.submit t(".deny") %>