diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 1430f6534ab..7c05f43c96a 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -6,6 +6,7 @@ label.system.wide.capacity=System-wide capacity
label.network.service.providers=Network Service Providers
message.launch.zone=Zone is ready to launch; please proceed to the next step.
error.unable.to.reach.management.server=Unable to reach Management Server
+label.internal.name=Internal name
#new labels (end) ************************************************************************************************
label.add.compute.offering=Add compute offering
diff --git a/ui/index.jsp b/ui/index.jsp
index d53335a32ab..c216d76dfa6 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -2873,6 +2873,7 @@ dictionary = {
'message.please.select.a.different.public.and.management.network.before.removing': ''));
var reorder = options.reorder;
- $.each(fields, function(key) {
+ var hiddenFields = [];
+ if(preFilter != null)
+ hiddenFields = preFilter();
+
+ $.each(fields, function(key) {
+ if($.inArray(key, hiddenFields) != -1)
+ return true;
var field = this;
var $th = $(' ').addClass(key).appendTo($thead.find('tr'));
@@ -702,7 +708,7 @@
$detailsPanel = data.$browser.cloudBrowser('addPanel', panelArgs);
};
- var addTableRows = function(fields, data, $tbody, actions, options) {
+ var addTableRows = function(preFilter, fields, data, $tbody, actions, options) {
if (!options) options = {};
var rows = [];
var reorder = options.reorder;
@@ -734,9 +740,15 @@
$tr.appendTo($tbody);
}
+ var hiddenFields = [];
+ if(preFilter != null)
+ hiddenFields = preFilter();
+
// Add field data
- $.each(fields, function(key) {
- var field = this;
+ $.each(fields, function(key) {
+ if($.inArray(key, hiddenFields) != -1)
+ return true;
+ var field = this;
var $td = $(' ')
.addClass(key)
.data('list-view-item-field', key)
@@ -912,7 +924,7 @@
});
};
- var loadBody = function($table, dataProvider, fields, append, loadArgs, actions, options) {
+ var loadBody = function($table, dataProvider, preFilter, fields, append, loadArgs, actions, options) {
if (!options) options = {};
var context = options.context;
var reorder = options.reorder;
@@ -941,8 +953,8 @@
response: {
success: function(args) {
setLoadingArgs.loadingCompleted();
-
- addTableRows(fields, args.data, $tbody, actions, {
+
+ addTableRows(preFilter, fields, args.data, $tbody, actions, {
actionFilter: args.actionFilter,
context: context,
reorder: reorder
@@ -954,8 +966,8 @@
});
},
error: function(args) {
- setLoadingArgs.loadingCompleted();
- addTableRows(fields, [], $tbody, actions);
+ setLoadingArgs.loadingCompleted();
+ addTableRows(preFilter, fields, [], $tbody, actions);
$table.find('td:first').html(_l('ERROR'));
$table.dataTable(null, { noSelect: uiCustom });
}
@@ -1147,16 +1159,18 @@
$('