kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ce-fe-fix-ee-diff-profile-key-views' into 'master'

Browse source 
Resolve EE/CE differences in app/views/profiles/keys

See merge request gitlab-org/gitlab-ce!28900
This commit is contained in:
Bob Van Landuyt 2019-06-04 08:02:53 +00:00
commit d16c11ab36
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/key.rb
View file

@ -59,6 +59,11 @@ class Key < ApplicationRecord
"key-#{id}" "key-#{id}"
end end
# EE overrides this
def can_delete?
true
end
# rubocop: disable CodeReuse/ServiceClass # rubocop: disable CodeReuse/ServiceClass
def update_last_used_at def update_last_used_at
Keys::LastUsedService.new(self).execute Keys::LastUsedService.new(self).execute

7
app/views/profiles/keys/_key.html.haml
View file

@ -18,6 +18,7 @@
.float-right .float-right
%span.key-created-at %span.key-created-at
= s_('Profiles|Created %{time_ago}'.html_safe) % { time_ago:time_ago_with_tooltip(key.created_at)} = s_('Profiles|Created %{time_ago}'.html_safe) % { time_ago:time_ago_with_tooltip(key.created_at)}
= link_to path_to_key(key, is_admin), data: { confirm: _('Are you sure?')}, method: :delete, class: "btn btn-transparent prepend-left-10" do - if key.can_delete?
%span.sr-only= _('Remove') = link_to path_to_key(key, is_admin), data: { confirm: _('Are you sure?')}, method: :delete, class: "btn btn-transparent prepend-left-10" do
= icon('trash') %span.sr-only= _('Remove')
= icon('trash')

3
app/views/profiles/keys/_key_details.html.haml
View file

@ -24,4 +24,5 @@
= @key.key = @key.key
.col-md-12 .col-md-12
.float-right .float-right
= link_to _('Remove'), path_to_key(@key, is_admin), data: {confirm: _('Are you sure?')}, method: :delete, class: "btn btn-remove delete-key qa-delete-key-button" - if @key.can_delete?
= link_to _('Remove'), path_to_key(@key, is_admin), data: {confirm: _('Are you sure?')}, method: :delete, class: "btn btn-remove delete-key qa-delete-key-button"