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/09/10 22:38:09 UTC
[airavata-django-portal] branch master updated (cfe4f77 -> 0f4742e)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from cfe4f77 Gateways 19 tutorial: updated app input configuration exercise
new 94c109a Move Session.init to api so it's available in dist/airavata-api.js
new 0f4742e AIRAVATA-3187 eval javascript if provided
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apps/api/static/django_airavata_api/js/session/Session.js | 8 +++++++-
.../components/experiment/output-displays/HtmlOutputDisplay.vue | 5 ++++-
django_airavata/static/common/js/entry.js | 3 ---
3 files changed, 11 insertions(+), 5 deletions(-)
[airavata-django-portal] 02/02: AIRAVATA-3187 eval javascript if
provided
Posted by 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
commit 0f4742ec1f081d8efa1491e353ded917dbb83c35
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Sep 10 18:37:52 2019 -0400
AIRAVATA-3187 eval javascript if provided
---
.../js/components/experiment/output-displays/HtmlOutputDisplay.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/HtmlOutputDisplay.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/HtmlOutputDisplay.vue
index 1d6b76f..dd1243f 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/HtmlOutputDisplay.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/output-displays/HtmlOutputDisplay.vue
@@ -35,7 +35,10 @@ export default {
"experiment-output-name": this.experimentOutput.name,
"provider-id": this.providerId
}).then(data => {
- this.rawOutput = data.output
+ this.rawOutput = data.output;
+ if (data.js) {
+ eval(data.js);
+ }
})
}
};
[airavata-django-portal] 01/02: Move Session.init to api so it's
available in dist/airavata-api.js
Posted by 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
commit 94c109a923f3b4a07547d9f555fe016b77dea898
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Sep 10 12:08:39 2019 -0400
Move Session.init to api so it's available in dist/airavata-api.js
---
.../apps/api/static/django_airavata_api/js/session/Session.js | 8 +++++++-
django_airavata/static/common/js/entry.js | 3 ---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/django_airavata/apps/api/static/django_airavata_api/js/session/Session.js b/django_airavata/apps/api/static/django_airavata_api/js/session/Session.js
index 102033e..0d59418 100644
--- a/django_airavata/apps/api/static/django_airavata_api/js/session/Session.js
+++ b/django_airavata/apps/api/static/django_airavata_api/js/session/Session.js
@@ -6,4 +6,10 @@ class Session {
}
}
-export default new Session();
+const session = new Session();
+if (window.AiravataPortalSessionData) {
+ // Initialize portal session object with data provided by base.html template
+ session.init(window.AiravataPortalSessionData);
+}
+
+export default session;
diff --git a/django_airavata/static/common/js/entry.js b/django_airavata/static/common/js/entry.js
index 8fae546..2063b4a 100644
--- a/django_airavata/static/common/js/entry.js
+++ b/django_airavata/static/common/js/entry.js
@@ -20,8 +20,5 @@ export default function entry(entryPointFunction) {
// Common Vue configuration
Vue.use(BootstrapVue);
- // Initialize portal session object with data provided by base.html template
- session.Session.init(window.AiravataPortalSessionData);
-
entryPointFunction(Vue);
}