mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-19 06:50:07 +03:00
Bug #3177: Fix regex error for flow template instantiate
This commit is contained in:
parent
2999576f75
commit
ee6a807f17
@ -740,8 +740,8 @@ function updateServiceTemplateInfo(request,elem){
|
||||
case "vnet_id":
|
||||
network_configuration +=
|
||||
'<tr>\
|
||||
<td class="key_td">'+htmlDecode(attrs.name)+'</td>\
|
||||
<td class="value_td">'+htmlDecode(attrs.description)+'</td>\
|
||||
<td class="key_td">'+attrs.name+'</td>\
|
||||
<td class="value_td">'+attrs.description+'</td>\
|
||||
</tr>'
|
||||
|
||||
var roles_using_net = [];
|
||||
@ -788,7 +788,7 @@ function updateServiceTemplateInfo(request,elem){
|
||||
</tr>\
|
||||
<tr>\
|
||||
<td class="key_td">'+tr("Description")+'</td>\
|
||||
<td class="value_td">'+(htmlDecode(elem_info.TEMPLATE.BODY.description)||"-")+'</td>\
|
||||
<td class="value_td">'+(elem_info.TEMPLATE.BODY.description||"-")+'</td>\
|
||||
</tr>\
|
||||
<tr>\
|
||||
<td class="key_td">'+tr("Strategy")+'</td>\
|
||||
@ -796,7 +796,7 @@ function updateServiceTemplateInfo(request,elem){
|
||||
</tr>\
|
||||
<tr>\
|
||||
<td class="key_td">'+tr("Shutdown action")+'</td>\
|
||||
<td class="value_td">'+elem_info.TEMPLATE.BODY.shutdown_action+'</td>\
|
||||
<td class="value_td">'+(elem_info.TEMPLATE.BODY.shutdown_action||"-")+'</td>\
|
||||
</tr>\
|
||||
<tr>\
|
||||
<td class="key_td">'+tr("Ready Status Gate")+'</td>\
|
||||
@ -1844,6 +1844,10 @@ function setupInstantiateServiceTemplateDialog(){
|
||||
|
||||
retrieveWizardFields($("#"+div_id, dialog), tmp_json);
|
||||
|
||||
$.each(role.elasticity_policies, function(i, pol){
|
||||
pol.expression = htmlDecode(pol.expression);
|
||||
});
|
||||
|
||||
role.user_inputs_values = tmp_json;
|
||||
|
||||
extra_info.merge_template.roles.push(role);
|
||||
|
Loading…
x
Reference in New Issue
Block a user