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

This commit is contained in:
2016-02-14 21:46:23 +00:00
parent d45146fc23
commit 94bcb4e1e2
3 changed files with 8 additions and 5 deletions
+2 -4
View File
@@ -1,10 +1,8 @@
var myManifest = {
Debug: (window.location.port !== ""),
Name: "Il Management",
Version: "0.3.0.0",
<<<<<<< .mine Version: "0.2.1.0",
======= Version: "0.3.0.0",
>>>>>>> .theirs Author: "Denis Ironi",
Version: "0.3.0.1",
Author: "Denis Ironi",
Settings: {
DefaultURL: (window.location.port === "" ? "http://" + window.location.host + "/Service": "http://" + window.location.hostname + ":" + window.location.port + "/Service_Manut"),
JQueryVersion: "1.11.1",
+5 -1
View File
@@ -1,3 +1,4 @@
define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricettaViewTemplate.html', 'modules/base/baseView',
'controls/window/window', 'modules/addingr/addingr', 'jqx'],
function($, _, Backbone, editricettaViewTemplate, BaseView, Window, AddIngrDlg) {
@@ -384,7 +385,10 @@ define(['jquery', 'underscore', 'backbone', 'text!modules/editricetta/editricett
self.save(function(msg){
//alert(msg.message);
if (msg.result)
{
{
if($("#ricettaID").val() == "")
$("#ricettaID").val(msg.ricettaID);
var profileID = "10203753344023406";
if($("#autorePhoto").val() != 0)