Fixed #128, Fixed #192, Fixed #193, Fixed #194, Fixed #195, Fixed #196, Fixed #197, Fixed #198, Fixed #199, Fixed #200, Fixed #239, Fixed #240

Author: thomaswoehlke

src/main/resources/templates/layout/page.html

@@ -163,16 +163,17 @@
 			var myUrl = '';
 			var requestPath = '[(@{{url}(url=${#request.getRequestURI()})})]';
 			var requestPathFirst = requestPath.split("/")[1];
+            var requestPathSecond = requestPath.split("/")[2];
 			var srcType = ev.dataTransfer.getData("task").split("_")[0];
 			var sourceTaskId = ev.dataTransfer.getData("task").split("_")[1];
 			var destinationTaskIdInfo = ev.target.id;
 			var destinationTaskId = destinationTaskIdInfo.split("_")[1];
 			if(srcType === 'task') {
 				if(requestPathFirst === 'taskstate'){
-					myUrl = '[(@{/taskstate/})]' + sourceTaskId + '/changeorderto/' + destinationTaskId;
+					myUrl = '[(@{/taskstate/task/})]' + sourceTaskId + '/changeorderto/' + destinationTaskId;
 					window.location.replace(myUrl);
 				} else if(requestPathFirst === 'project'){
-					myUrl = '[(@{/project/task/})]' + sourceTaskId + '/changeorderto/' + destinationTaskId;
+					myUrl = '[(@{/project/})]' + requestPathSecond + "/task/"+ sourceTaskId + '/changeorderto/' + destinationTaskId;
 					window.location.replace(myUrl);
 				}
 			}