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/07/01 18:58:54 UTC

[airavata-django-portal] branch master updated (9b038a2 -> 0dc58f9)

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 9b038a2  AIRAVATA-3029 Indicate active output view in menu
     new 71c38a0  AIRAVATA-2588 MySQL settings
     new 0dc58f9  AIRAVATA-3029 Fixing call to open output file

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:
 django_airavata/apps/api/output_views.py |  2 +-
 django_airavata/settings_local.py.sample | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)


[airavata-django-portal] 02/02: AIRAVATA-3029 Fixing call to open output file

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 0dc58f9f2dbf0972ae260d1125426dab215bb79e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jul 1 14:58:41 2019 -0400

    AIRAVATA-3029 Fixing call to open output file
---
 django_airavata/apps/api/output_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/django_airavata/apps/api/output_views.py b/django_airavata/apps/api/output_views.py
index d9fa758..9ffbb05 100644
--- a/django_airavata/apps/api/output_views.py
+++ b/django_airavata/apps/api/output_views.py
@@ -116,7 +116,7 @@ def _generate_data(request,
         data_product = request.airavata_client.getDataProduct(
             request.authz_token, experiment_output.value)
         if data_products_helper.exists(request, data_product):
-            output_file = data_products_helper.open()
+            output_file = data_products_helper.open(request, data_product)
     data = output_view_provider.generate_data(
         experiment_output, experiment, output_file=output_file)
     return data


[airavata-django-portal] 01/02: AIRAVATA-2588 MySQL settings

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 71c38a03692dcb1520a9cb0f7e4356d215be9404
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Sun Jun 30 18:11:20 2019 -0400

    AIRAVATA-2588 MySQL settings
---
 django_airavata/settings_local.py.sample | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/django_airavata/settings_local.py.sample b/django_airavata/settings_local.py.sample
index 83f637f..8a15edd 100644
--- a/django_airavata/settings_local.py.sample
+++ b/django_airavata/settings_local.py.sample
@@ -17,6 +17,21 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # STATIC_ROOT = "/var/www/path/to/sitename/static/"
 # ALLOWED_HOSTS = ['production.hostname']
 
+# Django - database settings
+# MySQL - to use MySQL, uncomment and specify the settings
+# DATABASES = {
+#     'default': {
+#         'ENGINE': 'django.db.backends.mysql',
+#         'NAME': '...',
+#         'HOST': '...',
+#         'USER': '...',
+#         'PASSWORD': '...'
+#     },
+#     'OPTIONS': {
+#         'init_command': 'SET default_storage_engine=INNODB,collation_connection=utf8_bin',
+#     }
+# }
+
 # Django - Email settings
 # Uncomment and specify the following for sending emails (default email backend
 # just prints to the console)