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 65d5e04 Display owner of app deployment
65d5e04 is described below
commit 65d5e04675cdaadcf039ac0786bccb136030d93e
Author: Marcus Christie <[email protected]>
AuthorDate: Tue Apr 9 13:38:38 2019 -0400
Display owner of app deployment
---
.../applications/ApplicationDeploymentEditor.vue | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
index 52b309d..ea531aa 100644
---
a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
+++
b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
@@ -2,10 +2,13 @@
<div>
<div class="row">
<div class="col">
- <h1 class="h4 mb-4">
+ <h1 class="h4 mb-1">
{{ name }}
</h1>
- <share-button v-if="localSharedEntity"
:shared-entity="localSharedEntity" @saved="savedSharedEntity"
@unsaved="unsavedSharedEntity"
+ <p v-if="owner" class="mb-2 text-muted">
+ Created by <span :title="ownerTitle">{{ ownerUserId }}</span>
+ </p>
+ <share-button class="mt-2 mb-2" v-if="localSharedEntity"
:shared-entity="localSharedEntity" @saved="savedSharedEntity"
@unsaved="unsavedSharedEntity"
/>
<b-form-group label="Application Executable Path"
label-for="executable-path">
<b-form-input id="executable-path" type="text"
v-model="data.executablePath" required :disabled="readonly"></b-form-input>
@@ -145,6 +148,15 @@ export default {
},
defaultQueueAttributesDisabled() {
return !this.data.defaultQueueName || this.readonly;
+ },
+ owner() {
+ return this.localSharedEntity && this.localSharedEntity.owner ?
this.localSharedEntity.owner : null;
+ },
+ ownerUserId() {
+ return this.owner ? this.owner.userId : null;
+ },
+ ownerTitle() {
+ return this.owner ? this.owner.firstName + " " + this.owner.lastName + "
(" + this.owner.email + ")": null;
}
},
created() {