CLOUDSTACK-2505: object_store - UI - infrastructure menu - secondary storages - add URL, Provider, Scope, Details to detailView.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd318661 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd318661 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd318661 Branch: refs/heads/object_store Commit: cd318661d2f60ed218f5c1fa7b316b9228148216 Parents: 44adba0 Author: Jessica Wang <jessicaw...@apache.org> Authored: Thu May 16 13:54:32 2013 -0700 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Thu May 16 13:54:32 2013 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd318661/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 5cb59a3..527d80b 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -10878,15 +10878,8 @@ section: 'seconary-storage', fields: { name: { label: 'label.name' }, - created: { label: 'label.created', converter: cloudStack.converters.toLocalDate }, - resourcestate: { - label: 'label.state', - indicator: { - 'Enabled': 'on', - 'Disabled': 'off', - 'Destroyed': 'off' - } - } + url: { label: 'label.url' }, + providername: { label: 'Provider' } }, dataProvider: function(args) { @@ -11349,10 +11342,27 @@ { name: { label: 'label.name' } }, - { - id: { label: 'label.id' }, + { + url: { label: 'label.url' }, + providername: { label: 'Provider' }, + scope: { label: 'label.scope' }, zonename: { label: 'label.zone' }, - created: { label: 'label.created', converter: cloudStack.converters.toLocalDate } + details: { + label: 'label.details', + converter: function(array1) { + var string1 = ''; + if(array1 != null) { + for(var i = 0; i < array1.length; i++) { + if(i > 0) + string1 += ', '; + + string1 += array1[i].name + ': ' + array1[i].value; + } + } + return string1; + } + }, + id: { label: 'label.id' } } ],
