\
+
\
\
+
'+ tr("Number of VMs to instantiate with this role") +'
\
\
-
\
+
\
\
\
+
'+ tr("Template associated to this role") +'
\
\
\
\
\
+
'+ tr("Mark the roles that will be deployed before this one when using the straight strategy") +'
\
\
\
\
@@ -139,19 +148,13 @@ var create_service_template_tmpl = '\
\
';
-/*
+
var update_service_template_tmpl =
'
';
-*/
+
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){
'
};
-
-
-
-
var roles_info = '
\
'
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("Role")+' '+roles[i].name+' | |
\
\
@@ -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('');
+ 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','').each(function(){
+ var val = $(this).val();
+ if ($.inArray(val,sel_elems) >= 0){
+ new_select+='';
+ };
+ });
+ $('#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();
diff --git a/flow/sunstone/routes/appflow.rb b/flow/sunstone/routes/appflow.rb
index 545a8cec14..3a1932052f 100644
--- a/flow/sunstone/routes/appflow.rb
+++ b/flow/sunstone/routes/appflow.rb
@@ -130,4 +130,4 @@ post '/service_template' do
resp = client.post('/service_template', request.body.read)
af_format_response(resp)
-end
\ No newline at end of file
+end
diff --git a/stage/sunstone/public/js/user-plugins/apptools.appstage.js b/stage/sunstone/public/js/user-plugins/apptools.appstage.js
index cc5e8be5fb..5cea915394 100644
--- a/stage/sunstone/public/js/user-plugins/apptools.appstage.js
+++ b/stage/sunstone/public/js/user-plugins/apptools.appstage.js
@@ -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){
| \
\
|
';
- };
+ };
}
// Form options of compatible templates