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.

6 files changed, 19 insertions, 30 deletions

diff --git a/app/views/admin/applications/show.html.haml b/app/views/admin/applications/show.html.haml
index 3418dc96496..6e7b7003ac5 100644
--- a/app/views/admin/applications/show.html.haml
+++ b/app/views/admin/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_admin_application_path(@application), class: 'btn btn-primary wide pull-left'
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'
diff --git a/app/views/profiles/personal_access_tokens/_form.html.haml b/app/views/profiles/personal_access_tokens/_form.html.haml
index 6083fdaa31d..5651b242129 100644
--- a/app/views/profiles/personal_access_tokens/_form.html.haml
+++ b/app/views/profiles/personal_access_tokens/_form.html.haml
@@ -12,11 +12,7 @@
 
   .form-group
     = f.label :scopes, class: 'label-light'
-    - @scopes.each do |scope|
-      %fieldset
-        = check_box_tag 'personal_access_token[scopes][]', scope, @personal_access_token.scopes.include?(scope), id: "personal_access_token_scopes_#{scope}"
-        = label_tag "personal_access_token_scopes_#{scope}", scope
-        %span= "(#{t(scope, scope: [:doorkeeper, :scopes])})"
+    = render partial: 'shared/tokens/scopes_form', locals: { prefix: 'personal_access_token', token: @personal_access_token }
 
   .prepend-top-default
     = f.submit 'Create Personal Access Token', class: "btn btn-create"
diff --git a/app/views/shared/tokens/_scopes_form.html.haml b/app/views/shared/tokens/_scopes_form.html.haml
new file mode 100644
index 00000000000..5dbbd9e4808
--- /dev/null
+++ b/app/views/shared/tokens/_scopes_form.html.haml
@@ -0,0 +1,5 @@
+- @scopes.each do |scope|
+  %fieldset
+    = check_box_tag "#{prefix}[scopes][]", scope, token.scopes.include?(scope), id: "#{prefix}_scopes_#{scope}"
+    = label_tag "#{prefix}_scopes_#{scope}", scope
+    %span= "(#{t(scope, scope: [:doorkeeper, :scopes])})"
diff --git a/app/views/shared/tokens/_scopes_list.html.haml b/app/views/shared/tokens/_scopes_list.html.haml
new file mode 100644
index 00000000000..9e3b562f0f5
--- /dev/null
+++ b/app/views/shared/tokens/_scopes_list.html.haml
@@ -0,0 +1,10 @@
+- 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])})"