diff --git a/src/cli/one_helper/oneimage_helper.rb b/src/cli/one_helper/oneimage_helper.rb index 2f2c4f1beb..195b765cee 100644 --- a/src/cli/one_helper/oneimage_helper.rb +++ b/src/cli/one_helper/oneimage_helper.rb @@ -339,7 +339,19 @@ class OneImageHelper < OpenNebulaHelper::OneHelper d["CHILDREN"] end - column :NAME, "Snapshot Name", :left, :size=>45 do |d| + column :SIZE, "", :right, :size=>8 do |d| + if d["SIZE"] + OpenNebulaHelper.unit_to_str( + d['SIZE'].to_i, + {}, + "M" + ) + else + "-" + end + end + + column :NAME, "Snapshot Name", :left, :size=>37 do |d| d["NAME"] end @@ -347,7 +359,7 @@ class OneImageHelper < OpenNebulaHelper::OneHelper OpenNebulaHelper.time_to_str(d["DATE"]) end - default :AC, :ID, :PARENT, :DATE, :CHILDREN, :NAME + default :AC, :ID, :PARENT, :DATE, :SIZE, :NAME end # Convert snapshot data to an array diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb index 4c88a42c11..65755aadf0 100644 --- a/src/cli/one_helper/onevm_helper.rb +++ b/src/cli/one_helper/onevm_helper.rb @@ -1027,7 +1027,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper d["CHILDREN"] end - column :SIZE, "", :left, :size=>9 do |d| + column :SIZE, "", :right, :size=>12 do |d| if d["SIZE"] size = OpenNebulaHelper.unit_to_str( d['SIZE'].to_i, @@ -1051,15 +1051,15 @@ class OneVMHelper < OpenNebulaHelper::OneHelper "#{monitor_size}/#{size}" end - column :NAME, "Snapshot Name", :left, :size=>26 do |d| + column :NAME, "Snapshot Name", :left, :size=>32 do |d| d["NAME"] end - column :DATE, "Snapshot creation date", :size=>10 do |d| + column :DATE, "Snapshot creation date", :size=>15 do |d| OpenNebulaHelper.time_to_str(d["DATE"]) end - default :AC, :ID, :DISK, :PARENT, :DATE, :CHILDREN, :SIZE, :NAME + default :AC, :ID, :DISK, :PARENT, :DATE, :SIZE, :NAME end # Convert snapshot data to an array diff --git a/src/sunstone/public/app/tabs/images-tab/panels/snapshots.js b/src/sunstone/public/app/tabs/images-tab/panels/snapshots.js index 2703809873..44ee6424e7 100644 --- a/src/sunstone/public/app/tabs/images-tab/panels/snapshots.js +++ b/src/sunstone/public/app/tabs/images-tab/panels/snapshots.js @@ -184,6 +184,7 @@ define(function(require){ } html += Humanize.prettyTime(snapshot.DATE) + SPACE + + Humanize.sizeFromMB(snapshot.SIZE) + SPACE + (snapshot.NAME ? snapshot.NAME + SPACE : ''); html += '';