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/06/03 18:54:33 UTC

[airavata-django-portal] branch master updated: AIRAVATA-3041 Fixing creationTime display and sorting

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 05ae822  AIRAVATA-3041 Fixing creationTime display and sorting
05ae822 is described below

commit 05ae8224dc111312f6e3a0c91734873d8bd2c816
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Jun 3 14:54:20 2019 -0400

    AIRAVATA-3041 Fixing creationTime display and sorting
---
 .../js/components/storage/UserStoragePathViewer.vue               | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStoragePathViewer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStoragePathViewer.vue
index fb33193..2e9a418 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStoragePathViewer.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/storage/UserStoragePathViewer.vue
@@ -26,7 +26,7 @@
         slot="createdTimestamp"
         slot-scope="data"
       >
-        <human-date :date="data.value"/>
+        <human-date :date="data.item.createdTime"/>
       </template>
       <template
         slot="actions"
@@ -42,7 +42,6 @@
 <script>
 import UserStoragePathBreadcrumb from "./UserStoragePathBreadcrumb.vue";
 import { components } from "django-airavata-common-ui";
-import moment from "moment";
 
 export default {
   name: "user-storage-path-viewer",
@@ -72,7 +71,7 @@ export default {
         },
         {
           label: "Created Time",
-          key: "createdTime",
+          key: "createdTimestamp",
           sortable: true
         },
         {
@@ -113,9 +112,6 @@ export default {
     }
   },
   methods: {
-    fromNow(date) {
-      return moment(date).fromNow();
-    },
     getFormattedSize(size) {
       if (size > Math.pow(2, 30)) {
         return Math.round(size / Math.pow(2, 30)) + " GB";