shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

Feature #3748: tab-datatable does not include items when elementArray returns false

Browse Source
This commit is contained in:
Carlos Martín 2015-06-03 13:06:41 +02:00
parent c640b69451
commit 1f9ab1cc8d
3 changed files with 7 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/sunstone/public/app/tabs/files-tab/datatable.js
View File

@ -79,38 +79,6 @@ define(function(require) {
return Table;
// TODO Check if update_fn must be overwritten
/*
"update_fn": function(datatable){
OpenNebula.Image.list({
timeout: true,
success: function (request, resource_list){
var list_array = [];
$.each(resource_list,function(){
var image = this.IMAGE;
// KERNEL || RAMDISK || CONTEXT
var add = ( image.TYPE != "3" &&
image.TYPE != "4" &&
image.TYPE != "5" )
if(add && opts.filter_fn){
add = opts.filter_fn(this.IMAGE);
}
if(add){
list_array.push(imageElementArray(this));
}
});
updateView(list_array, datatable);
},
error: onError
});
},
*/
/*
FUNCTION DEFINITIONS
*/

32
src/sunstone/public/app/tabs/images-tab/datatable.js
View File

@ -78,38 +78,6 @@ define(function(require) {
return Table;
// TODO Check if update_fn must be overwritten
/*
"update_fn": function(datatable){
OpenNebula.Image.list({
timeout: true,
success: function (request, resource_list){
var list_array = [];
$.each(resource_list,function(){
var image = this.IMAGE;
// KERNEL || RAMDISK || CONTEXT
var add = ( image.TYPE != "3" &&
image.TYPE != "4" &&
image.TYPE != "5" )
if(add && opts.filter_fn){
add = opts.filter_fn(this.IMAGE);
}
if(add){
list_array.push(imageElementArray(this));
}
});
updateView(list_array, datatable);
},
error: onError
});
},
*/
/*
FUNCTION DEFINITIONS
*/

9
src/sunstone/public/app/utils/tab-datatable.js
View File

@ -868,9 +868,14 @@ define(function(require) {
add = (add && fixed_ids_map[this[that.xmlRoot].ID]);
}
if (add) {
var elementArray = that.elementArray(this);
var elementArray;
if (add) {
elementArray = that.elementArray(this);
add = (elementArray != false);
}
if (add) {
if (that.selectOptions.starred_ids != undefined){
if (that.selectOptions.starred_ids_map[this[that.xmlRoot].ID]){
elementArray[that.selectOptions.name_index] =