git-svn-id: https://msi/svn/firstRepo/Management/trunk@31 0f545695-f87b-41b6-9a03-7f16563b5454

This commit is contained in:
2015-02-06 07:40:10 +00:00
parent da94eb0fe3
commit 00cd1a3a61
97 changed files with 1259 additions and 197 deletions
+4 -3
View File
@@ -220,14 +220,15 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricett
var datarecord = this.source[index];
if (datarecord)
{
datarecord.note = unescape(datarecord.note);
var div = '';
if (datarecord.id_tipo_ingredienti === "22")
{
div = '<div><b>' + datarecord.nome_ingrediente + '</b>: <i>' + unescape(datarecord.note) + '</i></div>';
div = '<div><b>' + datarecord.nome_ingrediente + '</b>: <i>' + datarecord.note + '</i></div>';
}
else
{
div = '<div><b>' + datarecord.nome_ingrediente + '</b>: ' + datarecord.quantita + ' ' + datarecord.unita + ' <i>' + unescape(datarecord.note) + '</i></div>';
div = '<div><b>' + datarecord.nome_ingrediente + '</b>: ' + datarecord.quantita + ' ' + datarecord.unita + ' <i>' + datarecord.note + '</i></div>';
}
return div;
}
@@ -302,7 +303,7 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricett
"ingrediente_id": val.id_tipo_ingredienti,
"quantita": val.quantita,
"tipo_quantita_id": val.id_tipo_quantita,
"note": escape(val.note)
"note": escape(unescape(val.note))
};
sendobj.ingredienti.push(newItem);
});