[airavata-django-portal] branch master updated: AIRAVATA-3016 Fix cloning shared experiment

[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 79a89fb  AIRAVATA-3016 Fix cloning shared experiment
79a89fb is described below

commit 79a89fba30dece5900e4752daffeac8f03822b4e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Jun 5 09:52:15 2019 -0400

    AIRAVATA-3016 Fix cloning shared experiment
---
 django_airavata/apps/api/data_products_helper.py |  3 ++-
 django_airavata/apps/api/datastore.py            | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/django_airavata/apps/api/data_products_helper.py b/django_airavata/apps/api/data_products_helper.py
index 9eff6a1..d7818ba 100644
--- a/django_airavata/apps/api/data_products_helper.py
+++ b/django_airavata/apps/api/data_products_helper.py
@@ -39,8 +39,9 @@ def save_input_file_upload(request, file):
 def copy_input_file_upload(request, data_product):
     path = _get_replica_filepath(data_product)
     name = data_product.productName
-    full_path = datastore.copy(request.user.username,
+    full_path = datastore.copy(data_product.ownerName,
                                path,
+                               request.user.username,
                                TMP_INPUT_FILE_UPLOAD_DIR,
                                name=name)
     return _save_data_product(request, full_path, name=name)
diff --git a/django_airavata/apps/api/datastore.py b/django_airavata/apps/api/datastore.py
index 2438939..f5c782e 100644
--- a/django_airavata/apps/api/datastore.py
+++ b/django_airavata/apps/api/datastore.py
@@ -57,10 +57,14 @@ def create_user_dir(username, path):
             "Directory {} already exists".format(path))
 
 
-def copy(username, source_path, target_path, name=None):
+def copy(source_username,
+         source_path,
+         target_username,
+         target_path,
+         name=None):
     """Copy a user file into target_path dir."""
-    f = open(username, source_path)
-    return save(username, target_path, f, name=name)
+    f = open(source_username, source_path)
+    return save(target_username, target_path, f, name=name)
 
 
 def delete(username, path):