Commit 4ad862fa authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch...

Merge branch '332844-create-a-download-for-the-secret-when-creating-an-application-in-admin-applications' into 'master'

Refactor admin applications to use doorkeeper HAML partials

See merge request gitlab-org/gitlab!66483
parents 99de1a31 81eed08b
...@@ -3,47 +3,7 @@ ...@@ -3,47 +3,7 @@
%h3.page-title %h3.page-title
Application: #{@application.name} Application: #{@application.name}
.table-holder.oauth-application-show = render 'shared/doorkeeper/applications/show',
%table.table edit_path: edit_admin_application_path(@application),
%tr delete_path: admin_application_path(@application),
%td show_trusted_row: true
= _('Application ID')
%td
.clipboard-group
.input-group
%input.label.label-monospace.monospace{ id: "application_id", type: "text", autocomplete: 'off', value: @application.uid, readonly: true }
.input-group-append
= clipboard_button(target: '#application_id', title: _("Copy ID"), class: "gl-button btn btn-default")
%tr
%td
= _('Secret')
%td
.clipboard-group
.input-group
%input.label.label-monospace.monospace{ id: "secret", type: "text", autocomplete: 'off', value: @application.secret, readonly: true }
.input-group-append
= clipboard_button(target: '#secret', title: _("Copy secret"), class: "gl-button btn btn-default")
%tr
%td
= _('Callback URL')
%td
- @application.redirect_uri.split.each do |uri|
%div
%span.monospace= uri
%tr
%td
Trusted
%td
= @application.trusted? ? 'Y' : 'N'
%tr
%td
Confidential
%td
= @application.confidential? ? 'Y' : 'N'
= render "shared/tokens/scopes_list", token: @application
.form-actions
= link_to 'Edit', edit_admin_application_path(@application), class: 'gl-button btn btn-confirm wide float-left'
= render 'delete_form', application: @application, submit_btn_css: 'gl-button btn btn-danger gl-ml-3'
- show_trusted_row = local_assigns.fetch(:show_trusted_row, false)
.table-holder.oauth-application-show .table-holder.oauth-application-show
%table.table %table.table
%tr %tr
...@@ -26,6 +28,13 @@ ...@@ -26,6 +28,13 @@
%div %div
%span.monospace= uri %span.monospace= uri
- if show_trusted_row
%tr
%td
= _('Trusted')
%td
= @application.trusted? ? _('Yes') : _('No')
%tr %tr
%td %td
= _('Confidential') = _('Confidential')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment