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

[rails.git] / app / views / oauth2_applications / _form.html.erb

diff --git a/app/views/oauth2_applications/_form.html.erb b/app/views/oauth2_applications/_form.html.erb
index c61d351b7012c3264156796f0d0cd535a84458e4..51267c069e3e80f486c803093c46ba197fa7d60a 100644 (file)
--- a/app/views/oauth2_applications/_form.html.erb
+++ b/app/views/oauth2_applications/_form.html.erb
@@ -1,7 +1,7 @@
 <%= f.text_field :name %>
-<%= f.text_area :redirect_uri, :help => t(".redirect_uri_help") %>
-<%= f.form_group :confidential, :help => t(".confidential_help") do %>
+<%= f.text_area :redirect_uri %>
+<%= f.form_group :confidential do %>
   <%= f.check_box :confidential %>
 <% end %>
-<%= f.collection_check_boxes :scopes, Oauth.scopes, :name, :description %>
+<%= f.collection_check_boxes :scopes, Oauth.scopes(:oauth2 => true, :privileged => current_user.administrator?), :name, :description %>
 <%= f.primary %>