From de44ab0244a0a47dad04b8b53b5d55e31a0e430e Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 10 Aug 2016 08:58:57 +0200
Subject: [PATCH] Always show delete icon for new tokens
* Always show delete icon
* Hide form if the new icon is deleted
---
settings/js/authtoken_view.js | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js
index 354173341bc..c8cf66a6cea 100644
--- a/settings/js/authtoken_view.js
+++ b/settings/js/authtoken_view.js
@@ -183,6 +183,8 @@
_newAppPassword: undefined,
+ _newAppId: undefined,
+
_hideAppPasswordBtn: undefined,
_addingToken: false,
@@ -255,10 +257,13 @@
});
$.when(creatingToken).done(function (resp) {
+ // We can delete token we add
+ resp.deviceToken.canDelete = true;
_this.collection.add(resp.deviceToken);
_this.render();
_this._newAppLoginName.val(resp.loginName);
_this._newAppPassword.val(resp.token);
+ _this._newAppId = resp.deviceToken.id;
_this._toggleFormResult(false);
_this._newAppPassword.select();
_this._tokenName.val('');
@@ -293,6 +298,10 @@
var $row = $target.closest('tr');
var id = $row.data('id');
+ if (id === this._newAppId) {
+ this._toggleFormResult(true);
+ }
+
var token = this.collection.get(id);
if (_.isUndefined(token)) {
// Ignore event
--
GitLab