mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-21 04:12:37 +09:00
Merge remote branch 'hector/master'
This commit is contained in:
commit
fb13fa957b
4 files changed
+311
-91
No files matched your search
@@ -162,19 +162,15 @@ var create_service_tmpl = '\
|
||||
</div>\
|
||||
</fieldset>\
|
||||
</form></div>';
|
||||
*/
|
||||
|
||||
|
||||
var update_service_tmpl =
|
||||
'<form action="javascript:alert(\'js error!\');">\
|
||||
<h3 style="margin-bottom:10px;">'+tr("Please, choose and modify the flowironment you want to update")+':</h3>\
|
||||
<h3 style="margin-bottom:10px;">'+tr("Please, choose and modify the service")+':</h3>\
|
||||
<fieldset style="border-top:none;">\
|
||||
<label for="service_template_update_select">'+tr("Select an flowironment")+':</label>\
|
||||
<select id="service_template_update_select" name="service_template_update_select"></select>\
|
||||
<div class="clear"></div>\
|
||||
<label for="templates">'+tr("Compatible templates")+':</label>\
|
||||
<select type="text" name="templates" multiple>\
|
||||
</select>\
|
||||
<div class="clear"></div>\
|
||||
<label for="cookbooks">' + tr("Cookbooks URL") + ':</label><input type="text" name="cookbooks" />\
|
||||
<label for="service_update_select">'+tr("Select a template")+':</label>\
|
||||
<select id="service_update_select" name="service_update_select"></select>\
|
||||
<div class="clear"></div>\
|
||||
<div>\
|
||||
<table class="permissions_table" style="padding:0 10px;">\
|
||||
@@ -185,42 +181,38 @@ var update_service_tmpl =
|
||||
<td style="width:40px;text-align:center;">'+tr("Admin")+'</td></tr></thead>\
|
||||
<tr>\
|
||||
<td>'+tr("Owner")+'</td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_owner_u" class="owner_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_owner_m" class="owner_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_owner_a" class="owner_a" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="serv_owner_u" class="owner_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="serv_owner_m" class="owner_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="serv_owner_a" class="owner_a" /></td>\
|
||||
</tr>\
|
||||
<tr>\
|
||||
<td>'+tr("Group")+'</td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_group_u" class="group_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_group_m" class="group_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_group_a" class="group_a" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="serv_group_u" class="group_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="serv_group_m" class="group_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="serv_group_a" class="group_a" /></td>\
|
||||
</tr>\
|
||||
<tr>\
|
||||
<td>'+tr("Other")+'</td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_other_u" class="other_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_other_m" class="other_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_other_a" class="other_a" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="serv_other_u" class="other_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="serv_other_m" class="other_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="serv_other_a" class="other_a" /></td>\
|
||||
</tr>\
|
||||
</table>\
|
||||
</div>\
|
||||
<label for="service_template_update_textarea">'+tr("Node")+':</label>\
|
||||
<div class="clear"></div>\
|
||||
<textarea id="service_template_update_textarea" style="width:100%; height:14em;"></textarea>\
|
||||
</fieldset>\
|
||||
<fieldset>\
|
||||
<div class="form_buttons">\
|
||||
<button class="button" id="service_template_update_button" value="Service.update_template">'+tr("Update")+'\
|
||||
<button class="button" id="service_update_button" value="Service.update_template">\
|
||||
'+tr("Update")+'\
|
||||
</button>\
|
||||
</div>\
|
||||
</fieldset>\
|
||||
</form>';
|
||||
*/
|
||||
|
||||
var dataTable_services;
|
||||
//var $create_service_dialog;
|
||||
|
||||
var service_actions = {
|
||||
|
||||
|
||||
"Service.list" : {
|
||||
type: "list",
|
||||
call: Service.list,
|
||||
@@ -228,6 +220,11 @@ var service_actions = {
|
||||
error: onError
|
||||
},
|
||||
|
||||
"Service.update_dialog" : {
|
||||
type : "custom",
|
||||
call : popUpServiceUpdateDialog
|
||||
},
|
||||
|
||||
"Service.show" : {
|
||||
type : "single",
|
||||
call: Service.show,
|
||||
@@ -291,11 +288,21 @@ var service_actions = {
|
||||
"Service.chmod" : {
|
||||
type: "single",
|
||||
call: Service.chmod,
|
||||
// callback
|
||||
error: onError,
|
||||
notify: true
|
||||
},
|
||||
|
||||
"Service.fetch_permissions" : {
|
||||
type : "single",
|
||||
call : Service.show,
|
||||
callback : function(request, json){
|
||||
var dialog = $('#service_update_dialog form');
|
||||
var tmpl = json.DOCUMENT;
|
||||
setPermissionsTable(tmpl, dialog);
|
||||
},
|
||||
error: onError
|
||||
},
|
||||
|
||||
"Service.shutdown" : {
|
||||
type: "multiple",
|
||||
call: Service.shutdown,
|
||||
@@ -333,6 +340,13 @@ var service_buttons = {
|
||||
text: '<i class="icon-refresh icon-large">',
|
||||
alwaysActive: true
|
||||
},
|
||||
|
||||
"Service.update_dialog" : {
|
||||
type: "action",
|
||||
text: tr("Update properties"),
|
||||
alwaysActive: true
|
||||
},
|
||||
|
||||
"Service.chown" : {
|
||||
type: "confirm_with_select",
|
||||
text: tr("Change owner"),
|
||||
@@ -359,7 +373,8 @@ var service_buttons = {
|
||||
},
|
||||
"Service.delete" : {
|
||||
type: "confirm",
|
||||
text: tr("Delete")
|
||||
text: tr("Delete"),
|
||||
tip: tr("This will delete the selected services")
|
||||
},
|
||||
"Service.help" : {
|
||||
type: "action",
|
||||
@@ -372,13 +387,7 @@ var service_info_panel = {
|
||||
"service_info_tab" : {
|
||||
title: tr("Service information"),
|
||||
content: ""
|
||||
},
|
||||
/*
|
||||
"service_node_tab" : {
|
||||
title: tr("Node"),
|
||||
content: ""
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
var services_tab = {
|
||||
@@ -542,7 +551,7 @@ function updateServiceInfo(request,elem){
|
||||
<thead></thead>'
|
||||
|
||||
var roles = elem_info.TEMPLATE.BODY.roles
|
||||
if (roles)
|
||||
if (roles && roles.length)
|
||||
for (var i = 0; i < roles.length; i++) {
|
||||
roles_info += '<tr><td class="key_td">'+tr("Role")+' '+roles[i].name+'</td><td></td></tr>\
|
||||
<tr>\
|
||||
@@ -572,8 +581,6 @@ function updateServiceInfo(request,elem){
|
||||
content: roles_info
|
||||
}
|
||||
|
||||
|
||||
|
||||
var vms_tab = {
|
||||
title : "Virtual Machines",
|
||||
content : '\
|
||||
@@ -622,13 +629,18 @@ function updateServiceInfo(request,elem){
|
||||
|
||||
Sunstone.updateInfoPanelTab("service_info_panel",
|
||||
"service_info_tab",info_tab);
|
||||
Sunstone.updateInfoPanelTab("service_info_panel",
|
||||
"service_role_tab",roles_tab);
|
||||
|
||||
if (roles.length)
|
||||
if (roles.length){
|
||||
Sunstone.addInfoPanelTab("service_info_panel",
|
||||
"service_role_tab",roles_tab);
|
||||
Sunstone.updateInfoPanelTab("service_info_panel",
|
||||
"service_vms_tab",vms_tab);
|
||||
|
||||
}
|
||||
else {
|
||||
Sunstone.removeInfoPanelTab("service_info_panel",
|
||||
"service_role_tab");
|
||||
Sunstone.removeInfoPanelTab("service_info_panel",
|
||||
"service_vms_tab");
|
||||
};
|
||||
|
||||
Sunstone.updateInfoPanelTab("service_info_panel",
|
||||
"service_log_tab",logs_tab);
|
||||
@@ -688,8 +700,98 @@ function updateServiceInfo(request,elem){
|
||||
}
|
||||
|
||||
|
||||
function setupServiceUpdateDialog(){
|
||||
//Append to DOM
|
||||
dialogs_context.append('<div id="service_update_dialog" title="'+tr("Update Service properties")+'"></div>');
|
||||
var dialog = $('#service_update_dialog', dialogs_context);
|
||||
|
||||
//Put HTML in place
|
||||
dialog.html(update_service_tmpl);
|
||||
|
||||
var height = Math.floor($(window).height()*0.8); //set height to a percentage of the window
|
||||
|
||||
//Convert into jQuery
|
||||
dialog.dialog({
|
||||
autoOpen:false,
|
||||
width:500,
|
||||
modal:true,
|
||||
height:height,
|
||||
resizable:true
|
||||
});
|
||||
|
||||
$('button',dialog).button();
|
||||
|
||||
$('#service_update_select',dialog).change(function(){
|
||||
var id = $(this).val();
|
||||
$('.permissions_table input', dialog).removeAttr('checked');
|
||||
$('.permissions_table', dialog).removeAttr('update');
|
||||
if (id && id.length){
|
||||
Sunstone.runAction("Service.fetch_permissions", id);
|
||||
};
|
||||
});
|
||||
|
||||
$('.permissions_table input',dialog).change(function(){
|
||||
$(this).parents('table').attr('update','update');
|
||||
});
|
||||
|
||||
$('form',dialog).submit(function(){
|
||||
var dialog = $(this);
|
||||
var id = $('#service_update_select',dialog).val();
|
||||
if (!id || !id.length) {
|
||||
$(this).parents('#service_update_dialog').dialog('close');
|
||||
return false;
|
||||
};
|
||||
|
||||
var permissions = $('.permissions_table',dialog);
|
||||
if (permissions.attr('update')){
|
||||
var perms = {
|
||||
octet : buildOctet(permissions)
|
||||
};
|
||||
Sunstone.runAction("Service.chmod", id, perms);
|
||||
};
|
||||
|
||||
$(this).parents('#service_update_dialog').dialog('close');
|
||||
return false;
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
function popUpServiceUpdateDialog(){
|
||||
var select = makeSelectOptions(dataTable_services,
|
||||
1,//id_col
|
||||
4,//name_col
|
||||
[],
|
||||
[]
|
||||
);
|
||||
var sel_elems = getSelectedNodes(dataTable_services);
|
||||
|
||||
|
||||
var dialog = $('#service_update_dialog');
|
||||
$('#service_update_select', dialog).html(select);
|
||||
// $('#service_update_textarea',dialog).val("");
|
||||
$('.permissions_table input', dialog).removeAttr('checked');
|
||||
$('.permissions_table', dialog).removeAttr('update');
|
||||
|
||||
if (sel_elems.length >= 1){ //several items in the list are selected
|
||||
//grep them
|
||||
var new_select= sel_elems.length > 1? '<option value="">Please select</option>' : "";
|
||||
$('option','<select>'+select+'</select>').each(function(){
|
||||
var val = $(this).val();
|
||||
if ($.inArray(val,sel_elems) >= 0){
|
||||
new_select+='<option value="'+val+'">'+$(this).text()+'</option>';
|
||||
};
|
||||
});
|
||||
$('#service_update_select', dialog).html(new_select);
|
||||
if (sel_elems.length == 1) {
|
||||
$('#service_update_select option',
|
||||
dialog).attr('selected','selected');
|
||||
$('#service_update_select', dialog).trigger("change");
|
||||
};
|
||||
};
|
||||
|
||||
dialog.dialog('open');
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Set the autorefresh interval for the datatable
|
||||
@@ -817,8 +919,7 @@ $(document).ready(function(){
|
||||
'','','','','',''],dataTable_services);
|
||||
Sunstone.runAction("Service.list");
|
||||
|
||||
|
||||
|
||||
setupServiceUpdateDialog();
|
||||
|
||||
// setupImageCloneDialog();
|
||||
setServiceAutorefresh();
|
||||
|
||||
@@ -84,36 +84,45 @@ var service_template_tab_content = '\
|
||||
|
||||
var create_service_template_tmpl = '\
|
||||
<div class="create_form"><form id="create_service_template_form" action="">\
|
||||
<p style="font-size:0.8em;text-align:right;"><i>'+
|
||||
tr("Fields marked with")+' <span style="display:inline-block;" class="ui-icon ui-icon-alert" /> '+
|
||||
tr("are mandatory")+'</i><br />\
|
||||
<fieldset>\
|
||||
<legend style="display:none;">' + tr("Service") + '</legend>\
|
||||
<div class="service_template_param">\
|
||||
<div class="service_template_param st_man">\
|
||||
<label for="service_name">' + tr("Name") + ':</label><input type="text" name="service_name" />\
|
||||
<div class="tip">'+ tr("Name for this template") +'</div>\
|
||||
</div>\
|
||||
<div class="service_template_param">\
|
||||
<div class="service_template_param st_man">\
|
||||
<label for="deployment">' + tr("Deployment strategy") + ':</label>\
|
||||
<select name="deployment">\
|
||||
<option value="straight">'+ tr("Straight") + '</option>\
|
||||
<option value="none">'+ tr("None") + '</option>\
|
||||
</select>\
|
||||
<div class="tip">'+ tr("Straight strategy will instantiate each role in order: parents role will be deployed before their children. None strategy will instantiate the roles regardless of their relationships.") +'</div>\
|
||||
</div>\
|
||||
</fieldset>\
|
||||
<fieldset>\
|
||||
<legend>' + tr("Roles") + '</legend>\
|
||||
<div class="service_template_param service_role">\
|
||||
<div class="service_template_param service_role st_man">\
|
||||
<label for="name">' + tr("Name") + ':</label><input type="text" name="name" />\
|
||||
<div class="tip">'+ tr("Name for the role") +'</div>\
|
||||
</div>\
|
||||
<div class="service_template_param service_role">\
|
||||
<div class="service_template_param service_role st_man">\
|
||||
<label for="cardinality">' + tr("Cardinality") + ':</label><input type="text" name="cardinality" value="1" />\
|
||||
<div class="tip">'+ tr("Number of VMs to instantiate with this role") +'</div>\
|
||||
</div>\
|
||||
<div class="service_template_param service_role">\
|
||||
<div class="service_template_param service_role st_man">\
|
||||
<label for="vm_template">' + tr("VM template") + ':</label>\
|
||||
<select name="vm_template">\
|
||||
</select>\
|
||||
<div class="tip">'+ tr("Template associated to this role") +'</div>\
|
||||
</div>\
|
||||
<div class="service_template_param service_role">\
|
||||
<label for="parents">' + tr("Parent roles") + ':</label>\
|
||||
<select name="parents" multiple="multiple">\
|
||||
</select>\
|
||||
<div class="tip">'+ tr("Mark the roles that will be deployed before this one when using the straight strategy") +'</div>\
|
||||
</div>\
|
||||
<label> </label>\
|
||||
<button id="add_role">' + tr("Add role") + '</button>\
|
||||
@@ -139,19 +148,13 @@ var create_service_template_tmpl = '\
|
||||
</fieldset>\
|
||||
</form></div>';
|
||||
|
||||
/*
|
||||
|
||||
var update_service_template_tmpl =
|
||||
'<form action="javascript:alert(\'js error!\');">\
|
||||
<h3 style="margin-bottom:10px;">'+tr("Please, choose and modify the flowironment you want to update")+':</h3>\
|
||||
<h3 style="margin-bottom:10px;">'+tr("Please, choose and modify the service template")+':</h3>\
|
||||
<fieldset style="border-top:none;">\
|
||||
<label for="service_template_template_update_select">'+tr("Select an flowironment")+':</label>\
|
||||
<select id="service_template_template_update_select" name="service_template_template_update_select"></select>\
|
||||
<div class="clear"></div>\
|
||||
<label for="templates">'+tr("Compatible templates")+':</label>\
|
||||
<select type="text" name="templates" multiple>\
|
||||
</select>\
|
||||
<div class="clear"></div>\
|
||||
<label for="cookbooks">' + tr("Cookbooks URL") + ':</label><input type="text" name="cookbooks" />\
|
||||
<label for="service_template_update_select">'+tr("Select a template")+':</label>\
|
||||
<select id="service_template_update_select" name="service_template_update_select"></select>\
|
||||
<div class="clear"></div>\
|
||||
<div>\
|
||||
<table class="permissions_table" style="padding:0 10px;">\
|
||||
@@ -162,36 +165,34 @@ var update_service_template_tmpl =
|
||||
<td style="width:40px;text-align:center;">'+tr("Admin")+'</td></tr></thead>\
|
||||
<tr>\
|
||||
<td>'+tr("Owner")+'</td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_template_owner_u" class="owner_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_template_owner_m" class="owner_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_template_owner_a" class="owner_a" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="st_owner_u" class="owner_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="st_owner_m" class="owner_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="st_owner_a" class="owner_a" /></td>\
|
||||
</tr>\
|
||||
<tr>\
|
||||
<td>'+tr("Group")+'</td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_template_group_u" class="group_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_template_group_m" class="group_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_template_group_a" class="group_a" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="st_group_u" class="group_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="st_group_m" class="group_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="st_group_a" class="group_a" /></td>\
|
||||
</tr>\
|
||||
<tr>\
|
||||
<td>'+tr("Other")+'</td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_template_other_u" class="other_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_template_other_m" class="other_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="service_template_other_a" class="other_a" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="st_other_u" class="other_u" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="st_other_m" class="other_m" /></td>\
|
||||
<td style="text-align:center"><input type="checkbox" name="st_other_a" class="other_a" /></td>\
|
||||
</tr>\
|
||||
</table>\
|
||||
</div>\
|
||||
<label for="service_template_template_update_textarea">'+tr("Node")+':</label>\
|
||||
<div class="clear"></div>\
|
||||
<textarea id="service_template_template_update_textarea" style="width:100%; height:14em;"></textarea>\
|
||||
</fieldset>\
|
||||
<fieldset>\
|
||||
<div class="form_buttons">\
|
||||
<button class="button" id="service_template_template_update_button" value="ServiceTemplate.update_template">'+tr("Update")+'\
|
||||
<button class="button" id="service_template_update_button" value="ServiceTemplate.update_template">\
|
||||
'+tr("Update")+'\
|
||||
</button>\
|
||||
</div>\
|
||||
</fieldset>\
|
||||
</form>';
|
||||
*/
|
||||
|
||||
var dataTable_service_templates;
|
||||
var $create_service_template_dialog;
|
||||
|
||||
@@ -200,7 +201,13 @@ var service_template_actions = {
|
||||
"ServiceTemplate.create" : {
|
||||
type: "create",
|
||||
call: ServiceTemplate.create,
|
||||
callback: addServiceTemplateElement,
|
||||
callback: function(req, res){
|
||||
//empty creation dialog roles after successful creation
|
||||
var dialog = $create_service_template_dialog;
|
||||
$('table#current_roles tbody', dialog).empty();
|
||||
$('select[name="parents"]', dialog).empty();
|
||||
addServiceTemplateElement(req, res);
|
||||
},
|
||||
error: onError,
|
||||
notify:true
|
||||
},
|
||||
@@ -210,6 +217,11 @@ var service_template_actions = {
|
||||
call: popUpCreateServiceTemplateDialog
|
||||
},
|
||||
|
||||
"ServiceTemplate.update_dialog" : {
|
||||
type : "custom",
|
||||
call : popUpServiceTemplateUpdateDialog
|
||||
},
|
||||
|
||||
"ServiceTemplate.list" : {
|
||||
type: "list",
|
||||
call: ServiceTemplate.list,
|
||||
@@ -288,10 +300,20 @@ var service_template_actions = {
|
||||
"ServiceTemplate.chmod" : {
|
||||
type: "single",
|
||||
call: ServiceTemplate.chmod,
|
||||
// callback
|
||||
error: onError,
|
||||
notify: true
|
||||
},
|
||||
|
||||
"ServiceTemplate.fetch_permissions" : {
|
||||
type : "single",
|
||||
call : ServiceTemplate.show,
|
||||
callback : function(request, json){
|
||||
var dialog = $('#service_template_update_dialog form');
|
||||
var tmpl = json.DOCUMENT;
|
||||
setPermissionsTable(tmpl, dialog);
|
||||
},
|
||||
error: onError
|
||||
},
|
||||
/*
|
||||
"ServiceTemplate.clone_dialog" : {
|
||||
type: "custom",
|
||||
@@ -324,6 +346,13 @@ var service_template_buttons = {
|
||||
type: "create_dialog",
|
||||
text: tr("+ New")
|
||||
},
|
||||
|
||||
"ServiceTemplate.update_dialog" : {
|
||||
type: "action",
|
||||
text: tr("Update properties"),
|
||||
alwaysActive: true
|
||||
},
|
||||
|
||||
"ServiceTemplate.instantiate" : {
|
||||
type: "action",
|
||||
text: tr("Instantiate")
|
||||
@@ -350,7 +379,8 @@ var service_template_buttons = {
|
||||
*/
|
||||
"ServiceTemplate.delete" : {
|
||||
type: "confirm",
|
||||
text: tr("Delete")
|
||||
text: tr("Delete"),
|
||||
tip: tr("This will delete the selected templates")
|
||||
},
|
||||
"ServiceTemplate.help" : {
|
||||
type: "action",
|
||||
@@ -363,13 +393,7 @@ var service_template_info_panel = {
|
||||
"service_template_info_tab" : {
|
||||
title: tr("Service information"),
|
||||
content: ""
|
||||
},
|
||||
/*
|
||||
"service_template_node_tab" : {
|
||||
title: tr("Node"),
|
||||
content: ""
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
var service_templates_tab = {
|
||||
@@ -511,15 +535,11 @@ function updateServiceTemplateInfo(request,elem){
|
||||
</table>'
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
var roles_info = '<table id="service_template_roles_table" class="info_table" style="width:80%;">\
|
||||
<thead></thead>'
|
||||
|
||||
var roles = elem_info.TEMPLATE.BODY.roles
|
||||
if (roles)
|
||||
if (roles && roles.length > 0)
|
||||
for (var i = 0; i < roles.length; i++) {
|
||||
roles_info += '<tr><td class="key_td">'+tr("Role")+' '+roles[i].name+'</td><td></td></tr>\
|
||||
<tr>\
|
||||
@@ -555,7 +575,10 @@ function updateServiceTemplateInfo(request,elem){
|
||||
}
|
||||
*/
|
||||
Sunstone.updateInfoPanelTab("service_template_info_panel","service_template_info_tab",info_tab);
|
||||
Sunstone.updateInfoPanelTab("service_template_info_panel","service_template_roles_tab",roles_tab);
|
||||
if (roles && roles.length > 0)
|
||||
Sunstone.addInfoPanelTab("service_template_info_panel","service_template_roles_tab",roles_tab);
|
||||
else
|
||||
Sunstone.removeInfoPanelTab("service_template_info_panel","service_template_roles_tab");
|
||||
|
||||
Sunstone.popUpInfoPanel("service_template_info_panel");
|
||||
|
||||
@@ -724,6 +747,99 @@ function popUpCreateServiceTemplateDialog(){
|
||||
}
|
||||
|
||||
|
||||
function setupServiceTemplateUpdateDialog(){
|
||||
//Append to DOM
|
||||
dialogs_context.append('<div id="service_template_update_dialog" title="'+tr("Update Service template properties")+'"></div>');
|
||||
var dialog = $('#service_template_update_dialog',dialogs_context);
|
||||
|
||||
//Put HTML in place
|
||||
dialog.html(update_service_template_tmpl);
|
||||
|
||||
var height = Math.floor($(window).height()*0.8); //set height to a percentage of the window
|
||||
|
||||
//Convert into jQuery
|
||||
dialog.dialog({
|
||||
autoOpen:false,
|
||||
width:500,
|
||||
modal:true,
|
||||
height:height,
|
||||
resizable:true
|
||||
});
|
||||
|
||||
$('button',dialog).button();
|
||||
|
||||
$('#service_template_update_select',dialog).change(function(){
|
||||
var id = $(this).val();
|
||||
$('.permissions_table input', dialog).removeAttr('checked');
|
||||
$('.permissions_table', dialog).removeAttr('update');
|
||||
if (id && id.length){
|
||||
Sunstone.runAction("ServiceTemplate.fetch_permissions", id);
|
||||
};
|
||||
});
|
||||
|
||||
$('.permissions_table input',dialog).change(function(){
|
||||
$(this).parents('table').attr('update','update');
|
||||
});
|
||||
|
||||
$('form',dialog).submit(function(){
|
||||
var dialog = $(this);
|
||||
var id = $('#service_template_update_select',dialog).val();
|
||||
if (!id || !id.length) {
|
||||
$(this).parents('#service_template_update_dialog').dialog('close');
|
||||
return false;
|
||||
};
|
||||
|
||||
var permissions = $('.permissions_table',dialog);
|
||||
if (permissions.attr('update')){
|
||||
var perms = {
|
||||
octet : buildOctet(permissions)
|
||||
};
|
||||
Sunstone.runAction("ServiceTemplate.chmod", id, perms);
|
||||
};
|
||||
|
||||
$(this).parents('#service_template_update_dialog').dialog('close');
|
||||
return false;
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
function popUpServiceTemplateUpdateDialog(){
|
||||
var select = makeSelectOptions(dataTable_service_templates,
|
||||
1,//id_col
|
||||
4,//name_col
|
||||
[],
|
||||
[]
|
||||
);
|
||||
var sel_elems = getSelectedNodes(dataTable_service_templates);
|
||||
|
||||
|
||||
var dialog = $('#service_template_update_dialog');
|
||||
$('#service_template_update_select', dialog).html(select);
|
||||
// $('#service_template_update_textarea',dialog).val("");
|
||||
$('.permissions_table input', dialog).removeAttr('checked');
|
||||
$('.permissions_table', dialog).removeAttr('update');
|
||||
|
||||
if (sel_elems.length >= 1){ //several items in the list are selected
|
||||
//grep them
|
||||
var new_select= sel_elems.length > 1? '<option value="">Please select</option>' : "";
|
||||
$('option','<select>'+select+'</select>').each(function(){
|
||||
var val = $(this).val();
|
||||
if ($.inArray(val,sel_elems) >= 0){
|
||||
new_select+='<option value="'+val+'">'+$(this).text()+'</option>';
|
||||
};
|
||||
});
|
||||
$('#service_template_update_select', dialog).html(new_select);
|
||||
if (sel_elems.length == 1) {
|
||||
$('#service_template_update_select option',
|
||||
dialog).attr('selected','selected');
|
||||
$('#service_template_update_select', dialog).trigger("change");
|
||||
};
|
||||
};
|
||||
|
||||
dialog.dialog('open');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Set the autorefresh interval for the datatable
|
||||
function setServiceTemplateAutorefresh() {
|
||||
setInterval(function(){
|
||||
@@ -848,7 +964,10 @@ $(document).ready(function(){
|
||||
|
||||
|
||||
setupCreateServiceTemplateDialog();
|
||||
|
||||
setupServiceTemplateUpdateDialog();
|
||||
setupTips($create_service_template_dialog);
|
||||
$('.st_man .man_icon',
|
||||
$create_service_template_dialog).css('display', 'inline-block');
|
||||
// setupImageCloneDialog();
|
||||
setServiceTemplateAutorefresh();
|
||||
|
||||
|
||||
@@ -130,4 +130,4 @@ post '/service_template' do
|
||||
resp = client.post('/service_template', request.body.read)
|
||||
|
||||
af_format_response(resp)
|
||||
end
|
||||
end
|
||||
@@ -238,7 +238,7 @@ var appstage_actions = {
|
||||
"AppStage.refresh" : {
|
||||
type: "custom",
|
||||
call: function () {
|
||||
waitingNodes(dataTable_appStages);
|
||||
waitingNodes(dataTable_appstages);
|
||||
Sunstone.runAction("AppStage.list");
|
||||
}
|
||||
},
|
||||
@@ -497,7 +497,7 @@ function updateAppStageInfo(request,elem){
|
||||
<td class="value_td">\
|
||||
<input type="text" name="'+ key +'"value="'+ defaults[key] +'"></input>\
|
||||
</td></tr>';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
// Form options of compatible templates
|
||||
|
||||
Reference in new issue
Block a user