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/10/09 13:13:24 UTC
[airavata-django-portal] branch master updated (50b3041 -> e201154)
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 50b3041 AIRAVATA-3081 Move Uppy dependencies to common package
new 25bcc10 Label walltime units
new e201154 Fixing linting errors
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:
.../src/components/applications/ApplicationDeploymentEditor.vue | 2 +-
django_airavata/apps/api/views.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
[airavata-django-portal] 02/02: Fixing linting errors
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 e201154f125d05df5d68bc271432aa3850867e0c
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Oct 9 09:13:15 2019 -0400
Fixing linting errors
---
django_airavata/apps/api/views.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/django_airavata/apps/api/views.py b/django_airavata/apps/api/views.py
index dccf505..4ba414c 100644
--- a/django_airavata/apps/api/views.py
+++ b/django_airavata/apps/api/views.py
@@ -915,7 +915,7 @@ def tus_upload_finish(request):
def move_input_file(file_path, file_name):
return data_products_helper.move_input_file_upload_from_filepath(
- request, file_path, name=file_name)
+ request, file_path, name=file_name)
data_product = tus.move_tus_upload(uploadURL, move_input_file)
serializer = serializers.DataProductSerializer(
data_product, context={'request': request})
@@ -1457,7 +1457,7 @@ class UserStoragePathView(APIView):
def move_file(file_path, file_name):
return data_products_helper.move_from_filepath(
- request, file_path, path, name=file_name)
+ request, file_path, path, name=file_name)
data_product = tus.move_tus_upload(uploadURL, move_file)
return self._create_response(request, path, uploaded=data_product)
[airavata-django-portal] 01/02: Label walltime units
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 25bcc10c3f541a799aaf1c25840438386ee38777
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Oct 9 09:11:37 2019 -0400
Label walltime units
---
.../src/components/applications/ApplicationDeploymentEditor.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
index ea531aa..81a1513 100644
--- a/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
+++ b/django_airavata/apps/admin/static/django_airavata_admin/src/components/applications/ApplicationDeploymentEditor.vue
@@ -45,7 +45,7 @@
<b-form-group label="Default CPU Count" label-for="default-cpu-count">
<b-form-input id="default-cpu-count" type="number" v-model="data.defaultCPUCount" min="0" :max="maxCPUCount" :disabled="defaultQueueAttributesDisabled"></b-form-input>
</b-form-group>
- <b-form-group label="Default Walltime" label-for="default-walltime">
+ <b-form-group label="Default Walltime (in minutes)" label-for="default-walltime">
<b-form-input id="default-walltime" type="number" v-model="data.defaultWalltime" min="0" :max="maxWalltime" :disabled="defaultQueueAttributesDisabled"></b-form-input>
</b-form-group>
</div>