You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/11/20 16:22:20 UTC
[airavata-django-portal] branch master updated: AIRAVATA-2811 Trim
public key for copying to clipboard
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
The following commit(s) were added to refs/heads/master by this push:
new 1093934 AIRAVATA-2811 Trim public key for copying to clipboard
1093934 is described below
commit 10939341c893ccbf2d7816bf0f3b669114335adc
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Tue Nov 20 11:21:51 2018 -0500
AIRAVATA-2811 Trim public key for copying to clipboard
---
.../src/components/credentials/SSHCredentialSelector.vue | 4 ++--
.../src/components/dashboards/CredentialStoreDashboard.vue | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/credentials/SSHCredentialSelector.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/credentials/SSHCredentialSelector.vue
index 622f984..c6f29b5 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/credentials/SSHCredentialSelector.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/credentials/SSHCredentialSelector.vue
@@ -89,9 +89,9 @@ export default {
},
copySSHPublicKeyText() {
return this.selectedCredential
- ? this.selectedCredential.publicKey
+ ? this.selectedCredential.publicKey.trim()
: this.defaultCredentialSummary
- ? this.defaultCredentialSummary.publicKey
+ ? this.defaultCredentialSummary.publicKey.trim()
: null;
}
},
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/dashboards/CredentialStoreDashboard.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/dashboards/CredentialStoreDashboard.vue
index 0dd2795..915c5bf 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/dashboards/CredentialStoreDashboard.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/dashboards/CredentialStoreDashboard.vue
@@ -8,7 +8,7 @@
<share-button :entity-id="data.item.token" :disallow-editing-admin-groups="false" />
</template>
<template slot="action" slot-scope="data">
- <clipboard-copy-link :text="data.item.publicKey" class="mr-1" />
+ <clipboard-copy-link :text="data.item.publicKey.trim()" class="mr-1" />
<delete-link v-if="data.item.userHasWriteAccess" @delete="deleteSSHCredential(data.item)">
Are you sure you want to delete the
<strong>{{ data.item.description }}</strong> SSH credential?