[airavata-django-portal] branch master updated: Fix loading instances of output view providers

[ma...@apache.org]

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 e85f70e  Fix loading instances of output view providers
e85f70e is described below

commit e85f70e05524d6495983da3e4e4ecdc77f4abde6
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Jun 13 10:37:39 2019 -0400

    Fix loading instances of output view providers
---
 .../components/experiment/output-displays/OutputDisplayContainer.vue   | 3 +--
 django_airavata/settings.py                                            | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/OutputDisplayContainer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/OutputDisplayContainer.vue
index a96840b..0b2d400 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/OutputDisplayContainer.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/OutputDisplayContainer.vue
@@ -1,5 +1,4 @@
 <template>
-  <!-- TODO: Add menu when there are more than one outputViews -->
   <b-card>
     <div slot="header" class="d-flex align-items-baseline">
       <h6>{{ experimentOutput.name }}</h6>
@@ -57,7 +56,7 @@ export default {
   computed: {
     // TODO: support multiple output views
     outputViewData() {
-      return this.currentView;
+      return this.currentView.data ? this.currentView.data : {};
     },
     outputDisplayComponentName() {
       // TODO: maybe rename download to default?
diff --git a/django_airavata/settings.py b/django_airavata/settings.py
index 1c528c6..5ac118a 100644
--- a/django_airavata/settings.py
+++ b/django_airavata/settings.py
@@ -102,7 +102,7 @@ for entry_point in iter_entry_points(group='airavata.djangoapp'):
 
 OUTPUT_VIEW_PROVIDERS = {}
 for entry_point in iter_entry_points(group='airavata.output_view_providers'):
-    OUTPUT_VIEW_PROVIDERS[entry_point.name] = entry_point.load()
+    OUTPUT_VIEW_PROVIDERS[entry_point.name] = entry_point.load()()
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',