diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-11-24 14:22:03 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-12-16 16:29:31 +0530 |
| commit | 990ae6b8e5f2797a6c168f9c16a725a159570058 (patch) | |
| tree | 5dd191819416b4486669623077ff2d971375b6a9 /app/views/doorkeeper | |
| parent | 4d6da770de94f4bf140507cdf43461b67269ce28 (diff) | |
| download | gitlab-ce-990ae6b8e5f2797a6c168f9c16a725a159570058.tar.gz | |
Move the scopes form/list view into a partial.
- The list of scopes that's displayed while creating a personal access
token is identical to the list that's displayed while creating an OAuth
application. Extract these into a partial.
- The list of scopes that's displayed while in the show page for an OAuth token
in the profile settings and admin settings are identical. Extract these into
a partial.
Diffstat (limited to 'app/views/doorkeeper')
| -rw-r--r-- | app/views/doorkeeper/applications/_form.html.haml | 6 | ||||
| -rw-r--r-- | app/views/doorkeeper/applications/show.html.haml | 11 |
2 files changed, 2 insertions, 15 deletions
diff --git a/app/views/doorkeeper/applications/_form.html.haml b/app/views/doorkeeper/applications/_form.html.haml index 96677dc1a4d..a6ad0bb8d1b 100644 --- a/app/views/doorkeeper/applications/_form.html.haml +++ b/app/views/doorkeeper/applications/_form.html.haml @@ -19,11 +19,7 @@ .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])})" + = render partial: 'shared/tokens/scopes_form', locals: { prefix: 'doorkeeper_application', token: application } .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 5473a8e0ddc..e528cb825f5 100644 --- a/app/views/doorkeeper/applications/show.html.haml +++ b/app/views/doorkeeper/applications/show.html.haml @@ -23,16 +23,7 @@ %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])})" + = render partial: "shared/tokens/scopes_list" .form-actions = link_to 'Edit', edit_oauth_application_path(@application), class: 'btn btn-primary wide pull-left' |