Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-11-22 11:57:31 +0300
committerTimothy Andrew <mail@timothyandrew.net>2016-12-16 12:38:10 +0300
commit6c809dfae84e702f7a49d3fac5725745264e0ff9 (patch)
tree185c6d1444abd3f884515b92f077e747cac96e1d /app/views/doorkeeper
parent1d0ccec6dd8375b751846f69bb170ebd11e9a391 (diff)
Allow creating personal access tokens / OAuth applications with scopes.
Diffstat (limited to 'app/views/doorkeeper')
-rw-r--r--app/views/doorkeeper/applications/_form.html.haml9
-rw-r--r--app/views/doorkeeper/applications/show.html.haml15
2 files changed, 23 insertions, 1 deletions
diff --git a/app/views/doorkeeper/applications/_form.html.haml b/app/views/doorkeeper/applications/_form.html.haml
index 5c98265727a..6fdb04077b6 100644
--- a/app/views/doorkeeper/applications/_form.html.haml
+++ b/app/views/doorkeeper/applications/_form.html.haml
@@ -17,5 +17,14 @@
%code= Doorkeeper.configuration.native_redirect_uri
for local tests
+ .form-group
+ = f.label :scopes, class: 'label-light'
+ - @scopes.each do |scope|
+ %fieldset
+ = check_box_tag 'doorkeeper_application[scopes][]', scope, application.scopes.include?(scope), id: "doorkeeper_application_scopes_#{scope}"
+ = label_tag "doorkeeper_application_scopes_#{scope}", scope
+ %span= "(#{t(scope, scope: [:doorkeeper, :scopes])})"
+
+
.prepend-top-default
= f.submit 'Save application', class: "btn btn-create"
diff --git a/app/views/doorkeeper/applications/show.html.haml b/app/views/doorkeeper/applications/show.html.haml
index 47442b78d48..a18e133c8de 100644
--- a/app/views/doorkeeper/applications/show.html.haml
+++ b/app/views/doorkeeper/applications/show.html.haml
@@ -2,7 +2,7 @@
%h3.page-title
Application: #{@application.name}
-.table-holder
+.table-holder.oauth-application-show
%table.table
%tr
%td
@@ -22,6 +22,19 @@
- @application.redirect_uri.split.each do |uri|
%div
%span.monospace= uri
+
+ - if @application.scopes.present?
+ %tr
+ %td
+ Scopes
+ %td
+ %ul.scopes-list.append-bottom-0
+ - @application.scopes.each do |scope|
+ %li
+ %span.scope-name= scope
+ = "(#{t(scope, scope: [:doorkeeper, :scopes])})"
+
+
.form-actions
= link_to 'Edit', edit_oauth_application_path(@application), class: 'btn btn-primary wide pull-left'
= render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger prepend-left-10'