diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 1ff43e9f1..8c987dd35 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -5,6 +5,7 @@ - fixed: #10485: User not returned to asset manager after adding content to /impor - fixed: #10262: Default Inbox View Template: Mismatch in HTML for upper and lower page navigation - fixed rfe #10474: Improve error message for template errors + - removed hardcoding of administer.js and survey.css hardcoded extras paths. 7.7.9 - fixed #10266: Public Profile overrides Able to be friend diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index dfc6a9fdb..b9d1d8b80 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -2180,7 +2180,7 @@ sub processTemplate { $self->session->errorHandler->error("First argument to processTemplate() should be a hash reference."); return "Error: Can't process template for asset ".$self->getId." of type ".$self->get("className"); } - +$self->session->log->error("loading $templateId"); $template = WebGUI::Asset->new($self->session, $templateId,"WebGUI::Asset::Template") unless (defined $template); if (defined $template) { $var = { %{ $var }, %{ $self->getMetaDataAsTemplateVariables } }; diff --git a/www/extras/wobject/Survey/administersurvey.js b/www/extras/wobject/Survey/administersurvey.js index 8a33bb7ec..2b80c1334 100644 --- a/www/extras/wobject/Survey/administersurvey.js +++ b/www/extras/wobject/Survey/administersurvey.js @@ -476,7 +476,7 @@ if (typeof Survey === "undefined") { } } - YAHOO.widget.Chart.SWFURL = "/extras/yui/build/charts/assets/charts.swf"; + YAHOO.widget.Chart.SWFURL = "../../../extras/yui/build/charts/assets/charts.swf"; // Public API Survey.Summary = { globalSummaryDataTip: function(item, index, series){ @@ -518,7 +518,7 @@ if (typeof Survey === "undefined") { } }, //only needed for flash player express install - expressInstall: "/extras/yui/build/charts/assets/charts.swf" + expressInstall: "../../../extras/yui/build/charts/assets/charts.swf" }); //define section datatable columns @@ -585,7 +585,7 @@ if (typeof Survey === "undefined") { xAxis: sectionAxis, yAxis: responseAxis, // dataTipFunction: Survey.Form.globalSummaryDataTip, //try again in 2.7 - expressInstall: "/extras/yui/build/charts/assets/charts.swf" + expressInstall: "../../../extras/yui/build/charts/assets/charts.swf" }); YAHOO.util.Event.addListener("submitbutton", "click", function(){ Survey.Comm.submitSummary(); }); @@ -785,4 +785,4 @@ if (typeof Survey === "undefined") { YAHOO.util.Event.onDOMReady(function(){ // Survey.Comm.setUrl('/' + document.getElementById('assetPath').value); Survey.Comm.callServer('', 'loadQuestions'); -}); \ No newline at end of file +});