Index: lams_build/lib/lams/lams-learning.jar =================================================================== diff -u -r7e05bfe2c334b0b3224bbbdd3d6b7f10b383ee9f -r2bb977730eb38127921bd886690e679bfeab57a1 Binary files differ Index: lams_central/web/includes/javascript/main.js =================================================================== diff -u -r2e48a918c22150864aacb792f64f3103f61d3200 -r2bb977730eb38127921bd886690e679bfeab57a1 --- lams_central/web/includes/javascript/main.js (.../main.js) (revision 2e48a918c22150864aacb792f64f3103f61d3200) +++ lams_central/web/includes/javascript/main.js (.../main.js) (revision 2bb977730eb38127921bd886690e679bfeab57a1) @@ -547,7 +547,7 @@ 'open' : function() { var orgID = $(this).data('orgID'); // load contents after opening the dialog - $('iframe', this).attr('src', LAMS_URL + '/learning/kumalive.do?method=getRubrics&organisationID=' + orgID); + $('iframe', this).attr('src', LAMS_URL + 'learning/kumalive/getRubrics.do?organisationID=' + orgID); } }, false); } @@ -564,7 +564,7 @@ 'open' : function() { var orgID = $(this).data('orgID'); // load contents after opening the dialog - $('iframe', this).attr('src', LAMS_URL + '/learning/kumalive.do?method=getReport&organisationID=' + orgID); + $('iframe', this).attr('src', LAMS_URL + 'learning/kumalive/getReport.do?organisationID=' + orgID); } }, false); } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java =================================================================== diff -u -r7e05bfe2c334b0b3224bbbdd3d6b7f10b383ee9f -r2bb977730eb38127921bd886690e679bfeab57a1 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (.../ActivityMapping.java) (revision 7e05bfe2c334b0b3224bbbdd3d6b7f10b383ee9f) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (.../ActivityMapping.java) (revision 2bb977730eb38127921bd886690e679bfeab57a1) @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.struts.action.ActionForward; import org.lamsfoundation.lams.learning.service.ICoreLearnerService; import org.lamsfoundation.lams.learning.service.LearnerServiceException; import org.lamsfoundation.lams.learning.web.controller.DisplayActivityController; @@ -248,9 +247,6 @@ * Takes a Struts forward containing the path such as /DisplayRequest.do and turns it into a full URL including * servername */ - protected String strutsForwardToURL(ActionForward forward) { - return Configuration.get(ConfigurationKeys.SERVER_URL) + ActivityMapping.LEARNING + forward.getPath(); - } /** * Calculate the activity url for progress view at learner side.