Author: bpoussin Date: 2013-02-27 11:17:29 +0100 (Wed, 27 Feb 2013) New Revision: 327 Url: http://chorem.org/projects/chorem/repository/revisions/327 Log: bugfix in javascript URL, now use webContext to create URL Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/chorem-webmotion/src/main/webapp/js/chorem.js Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-02-25 19:03:26 UTC (rev 326) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2013-02-27 10:17:29 UTC (rev 327) @@ -41,6 +41,10 @@ <link href="<c:url value='/css/chorem-crm.css'/>" rel="stylesheet" type="text/css"/> <link href="<c:url value='/css/chorem-sales.css'/>" rel="stylesheet" type="text/css"/> + <script type="text/javascript"> + var webContext = "<c:url value='/'/>"; + </script> + <%-- import via nuiton-js to add js or css show WEB-INF/wro.xml --%> <script type="text/javascript" src="<c:url value='/nuiton-js/chorem-lib.js'/>"></script> Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js =================================================================== --- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-02-25 19:03:26 UTC (rev 326) +++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2013-02-27 10:17:29 UTC (rev 327) @@ -21,6 +21,15 @@ * #L% */ +function createUrl() { + var result = webContext; + for (var i = 0; i < arguments.length; i++) { + result += arguments[i]; + } + result = result.replace('//', '/'); + return result; +} + $(function() { $('.withTooltip').tooltip({html:true}); }); @@ -116,7 +125,7 @@ jQuery.ajax({ type: 'GET', - url:'/chorem/hr/vacationDiv/new', + url: createUrl('/hr/vacationDiv/new'), data:'', sucess: function(data, textStatus, jqXHR){ @@ -145,7 +154,8 @@ input.keyup(function (e) { if (e.keyCode == 13) { value = input.val(); - $.get("/chorem/wikitty-json/save?id="+id+"&extension=ContactDetails&ContactDetails.value="+value, function(){ + $.get(createUrl("/wikitty-json/save?id=", id, "&extension=ContactDetails&ContactDetails.value=", value), + function(){ //success span.text(value); input.replaceWith(span); @@ -184,10 +194,10 @@ var id = $(".elementId").html(); var date = $.datepicker.formatDate('dd/mm/yy', new Date()); - $.get("/chorem/wikitty-json/save?extension=Note&Note.target=" + id + - "&Note.title=" + title + - "&Note.content=" + content + - "&Note.date="+date,function(data){ + $.get(createUrl("/wikitty-json/save?extension=Note&Note.target=", id, + "&Note.title=", title, + "&Note.content=", content, + "&Note.date=", date),function(data){ //success var note; $.each(data, function(key, val) { @@ -220,7 +230,8 @@ function leadToDraft() { var id = $(this).attr('wikittyId'); var oldQuotation = $(this).parent(); - $.get("/chorem/sales/funnel/json/answer/" + id,function(data){ + $.get(createUrl("/sales/funnel/json/answer/", id), + function(data){ //success var wikittyId = data.meta.id; var wikitty = data.data; @@ -230,7 +241,7 @@ //leftDiv var leftDiv = $("<div></div>").addClass("pull-left"); var aIconEdit = $("<a></a>") - .attr("href","/chorem/wikitty/edit/" + data.meta.id); + .attr("href", createUrl("/wikitty/edit/", wikittyId)); var iconEdit = $("<i></i>").addClass("icon-edit"); aIconEdit.append(iconEdit); leftDiv.append(aIconEdit); @@ -243,7 +254,7 @@ } var aAccount = $("<a></a>") .text(firstName + " " + lastName + " (" + company + ")") - .attr("href","/chorem/wikitty/Employee/view/" + wikitty["Quotation.customer"]); + .attr("href",createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"])); smallAccount.append(aAccount); leftDiv.append(smallAccount); var leftP = $("<p> - </p>"); @@ -252,7 +263,7 @@ if (wikitty["Quotation.project"]!=null) { var aProject = $("<a/>") .addClass("nameLink") - .attr("href" , "/chorem/wikitty/Project/view/" + wikitty["Quotation.project"]) + .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"])) .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]); } itemTitleSpan.append(aProject); @@ -301,7 +312,8 @@ function draftToSent() { var id = $(this).attr('wikittyId'); var oldQuotation = $(this).parent(); - $.get("/chorem/sales/funnel/json/send/" + id,function(data){ + $.get(createUrl("/sales/funnel/json/send/", id), + function(data){ //success var wikittyId = data.meta.id; @@ -312,7 +324,7 @@ //leftDiv var leftDiv = $("<div></div>").addClass("pull-left"); var aIconEdit = $("<a></a>") - .attr("href","/chorem/wikitty/edit/" + data.meta.id); + .attr("href",createUrl("/wikitty/edit/", wikittyId)); var iconEdit = $("<i></i>").addClass("icon-edit"); aIconEdit.append(iconEdit); leftDiv.append(aIconEdit); @@ -325,7 +337,7 @@ } var aAccount = $("<a></a>") .text(firstName + " " + lastName + " (" + company + ")") - .attr("href","/chorem/wikitty/Employee/view/" + wikitty["Quotation.customer"]); + .attr("href", createUrl("/wikitty/Employee/view/", wikitty["Quotation.customer"])); smallAccount.append(aAccount); leftDiv.append(smallAccount); var leftP = $("<p> - </p>"); @@ -334,7 +346,7 @@ if (wikitty["Quotation.project"]!=null) { var aProject = $("<a/>") .addClass("nameLink") - .attr("href" , "/chorem/wikitty/Project/view/" + wikitty["Quotation.project"]) + .attr("href" , createUrl("/wikitty/Project/view/", wikitty["Quotation.project"])) .text(data.preloaded[wikitty["Quotation.project"]].data["Project.name"]); } itemTitleSpan.append(aProject); @@ -389,7 +401,8 @@ function sentToRejected(){ var id = $(this).attr('wikittyId'); var oldQuotation = $(this).parent(); - $.get("/chorem/sales/funnel/json/reject/" + id,function(){ + $.get(createUrl("/sales/funnel/json/reject/", id), + function(){ //success oldQuotation.slideUp(); }).fail(function(){ @@ -401,7 +414,8 @@ function sentToAccepted(){ var id = $(this).attr('wikittyId'); var oldQuotation = $(this).parent(); - $.get("/chorem/sales/funnel/json/accept/" + id,function(){ + $.get(createUrl("/sales/funnel/json/accept/", id), + function(){ //success oldQuotation.slideUp(); }).fail(function(){