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 2019/05/01 19:37:04 UTC

[airavata-django-portal] branch master updated: AIRAVATA-3018 Project sharing button

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 13061ae  AIRAVATA-3018 Project sharing button
13061ae is described below

commit 13061ae31bb93474a7f590c30f0ba006041eb91d
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed May 1 12:52:57 2019 -0400

    AIRAVATA-3018 Project sharing button
---
 .../js/components/project/ProjectEditor.vue                | 14 +++++++++-----
 .../js/containers/EditProjectContainer.vue                 |  8 ++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/project/ProjectEditor.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/project/ProjectEditor.vue
index 8df9cd0..5ecff22 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/project/ProjectEditor.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/project/ProjectEditor.vue
@@ -1,10 +1,14 @@
 <template>
   <div>
-    <slot name="title">
-      <h1 class="h4 mb-4">
-        Edit Project
-      </h1>
-    </slot>
+    <div class="d-flex">
+      <slot name="title">
+        <h1 class="h4 mb-4 mr-auto">
+          Edit Project
+        </h1>
+      </slot>
+      <slot name="buttons">
+      </slot>
+    </div>
     <b-form
       @submit="onSubmit"
       @input="onUserInput"
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/containers/EditProjectContainer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/containers/EditProjectContainer.vue
index ecf6251..8e0dd66 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/containers/EditProjectContainer.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/containers/EditProjectContainer.vue
@@ -1,6 +1,8 @@
 <template>
   <div v-if="project">
-    <project-editor v-model="project" @save="saveProject" @valid="valid = true" @invalid="valid = false"/>
+    <project-editor v-model="project" @save="saveProject" @valid="valid = true" @invalid="valid = false">
+      <share-button slot="buttons" :entity-id="projectId"/>
+    </project-editor>
     <div class="d-flex justify-content-end">
         <b-button @click="saveProject" variant="primary" :disabled="!valid">Save</b-button>
         <b-button @click="cancel" variant="secondary">Cancel</b-button>
@@ -10,6 +12,7 @@
 
 <script>
 import { services } from "django-airavata-api";
+import { components } from "django-airavata-common-ui";
 import urls from "../utils/urls";
 import ProjectEditor from "../components/project/ProjectEditor.vue"
 
@@ -28,7 +31,8 @@ export default {
     };
   },
   components: {
-    ProjectEditor
+    ProjectEditor,
+    "share-button": components.ShareButton
   },
   created() {
     services.ProjectService.retrieve({lookup: this.projectId})