mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-19 06:50:07 +03:00
feature #3416: Add a hidden column including the vm info
This commit is contained in:
parent
ce5544e1e5
commit
f127a7f80c
@ -139,6 +139,7 @@ tabs:
|
||||
- 9 # IPs
|
||||
#- 10 # Start Time
|
||||
- 11 # VNC
|
||||
#- 12 # Hidden Template
|
||||
actions:
|
||||
VM.refresh: true
|
||||
VM.create_dialog: true
|
||||
|
@ -138,6 +138,7 @@ tabs:
|
||||
- 9 # IPs
|
||||
#- 10 # Start Time
|
||||
- 11 # VNC
|
||||
#- 12 # Hidden Template
|
||||
actions:
|
||||
VM.refresh: true
|
||||
VM.create_dialog: true
|
||||
|
@ -139,6 +139,7 @@ tabs:
|
||||
- 9 # IPs
|
||||
#- 10 # Start Time
|
||||
- 11 # VNC
|
||||
#- 12 # Hidden Template
|
||||
actions:
|
||||
VM.refresh: true
|
||||
VM.create_dialog: true
|
||||
|
@ -464,17 +464,7 @@ function userElementArray(user_json){
|
||||
}
|
||||
|
||||
// Build hidden user template
|
||||
var hidden_template = "";
|
||||
for (var key in user.TEMPLATE){
|
||||
switch (key){
|
||||
// Don't copy unnecesary keys
|
||||
case "SSH_PUBLIC_KEY":
|
||||
case "TOKEN_PASSWORD":
|
||||
break;
|
||||
default:
|
||||
hidden_template = hidden_template + key + "=" + user.TEMPLATE[key] + "\n";
|
||||
}
|
||||
}
|
||||
var hidden_template = convert_template_to_string(user);
|
||||
|
||||
return [
|
||||
'<input class="check_item" type="checkbox" id="user_'+user.ID+'" name="selected_items" value="'+user.ID+'"/>',
|
||||
@ -886,7 +876,7 @@ $(document).ready(function(){
|
||||
});
|
||||
|
||||
$('#user_search').keyup(function(){
|
||||
dataTable_users.fnFilter( $(this).val() );
|
||||
dataTable_users.fnFilter( $(this).val(), null, true, false );
|
||||
})
|
||||
|
||||
dataTable_users.on('draw', function(){
|
||||
|
@ -965,6 +965,7 @@ var vms_tab = {
|
||||
<th>'+tr("IPs")+'</th>\
|
||||
<th>'+tr("Start Time")+'</th>\
|
||||
<th>'+tr("")+'</th>\
|
||||
<th>'+tr("Hidden Template")+'</th>\
|
||||
</tr>\
|
||||
</thead>\
|
||||
<tbody id="tbodyvmachines">\
|
||||
@ -1032,6 +1033,8 @@ function vMachineElementArray(vm_json){
|
||||
state = OpenNebula.Helper.resource_state("vm_lcm",vm.LCM_STATE);
|
||||
};
|
||||
|
||||
// Build hidden user template
|
||||
var hidden_template = convert_template_to_string(vm);
|
||||
|
||||
return [
|
||||
'<input class="check_item" type="checkbox" id="vm_'+vm.ID+'" name="selected_items" value="'+vm.ID+'"/>',
|
||||
@ -1045,7 +1048,8 @@ function vMachineElementArray(vm_json){
|
||||
hostname,
|
||||
ip_str(vm),
|
||||
str_start_time(vm),
|
||||
vncIcon(vm)
|
||||
vncIcon(vm),
|
||||
hidden_template
|
||||
];
|
||||
};
|
||||
|
||||
@ -3388,7 +3392,7 @@ $(document).ready(function(){
|
||||
});
|
||||
|
||||
$('#vms_search').keyup(function(){
|
||||
dataTable_vMachines.fnFilter( $(this).val() );
|
||||
dataTable_vMachines.fnFilter( $(this).val(), null, true, false );
|
||||
})
|
||||
|
||||
dataTable_vMachines.on('draw', function(){
|
||||
|
Loading…
x
Reference in New Issue
Block a user