diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-08-21 15:01:05 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-08-30 20:50:44 +0100 |
| commit | b49b7bc147955df6589b13942d0437a3b4518c7b (patch) | |
| tree | c796cb83a10509aad8b5aeae39e139db2fdb3156 | |
| parent | b0f982fbdf69c292ab4530c0aaaf1ab42f4e7a01 (diff) | |
| download | gitlab-ce-b49b7bc147955df6589b13942d0437a3b4518c7b.tar.gz | |
Warn users when their keys are invalid
| -rw-r--r-- | app/helpers/form_helper.rb | 5 | ||||
| -rw-r--r-- | app/views/profiles/keys/_key.html.haml | 8 | ||||
| -rw-r--r-- | app/views/profiles/keys/_key_details.html.haml | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/app/helpers/form_helper.rb b/app/helpers/form_helper.rb index 9247b1f72de..2e05b8c6d65 100644 --- a/app/helpers/form_helper.rb +++ b/app/helpers/form_helper.rb @@ -1,9 +1,10 @@ module FormHelper - def form_errors(model) + def form_errors(model, headline = 'The form contains the following') return unless model.errors.any? pluralized = 'error'.pluralize(model.errors.count) - headline = "The form contains the following #{pluralized}:" + + headline = headline + ' ' + pluralized + ':' content_tag(:div, class: 'alert alert-danger', id: 'error_explanation') do content_tag(:h4, headline) << diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml index d2a60ac2867..99b9a05fff6 100644 --- a/app/views/profiles/keys/_key.html.haml +++ b/app/views/profiles/keys/_key.html.haml @@ -1,6 +1,12 @@ %li.key-list-item .pull-left.append-right-10 - = icon 'key', class: "settings-list-icon hidden-xs" + - if key.valid? + = icon 'key', class: 'settings-list-icon hidden-xs' + - else + = icon 'exclamation-triangle', class: 'settings-list-icon hidden-xs', + title: 'The key is disabled because it is invalid' + + .key-list-item-info = link_to path_to_key(key, is_admin), class: "title" do = key.title diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml index d44603c638c..cf70320e7a8 100644 --- a/app/views/profiles/keys/_key_details.html.haml +++ b/app/views/profiles/keys/_key_details.html.haml @@ -16,6 +16,7 @@ %strong= @key.last_used_at.try(:to_s, :medium) || 'N/A' .col-md-8 + = form_errors(@key, 'The key has the following') unless @key.valid? %p %span.light Fingerprint: %code.key-fingerprint= @key.fingerprint |