diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index c7f5c26dc..e6fc3ccac 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -7,6 +7,7 @@ - fixed: Asset Manager breaks when an asset is locked - fixed: Asset Manager is slow to load - fixed: project management application unable to add or edit tasks. + - fixed: dashboard not working due to using legacy ajax handlers 7.5.12 - skipping this release diff --git a/docs/upgrades/packages-7.5.13/dashboard-default-view-template.wgpkg b/docs/upgrades/packages-7.5.13/dashboard-default-view-template.wgpkg new file mode 100644 index 000000000..2bf075659 Binary files /dev/null and b/docs/upgrades/packages-7.5.13/dashboard-default-view-template.wgpkg differ diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm index 64658a415..6b17a2256 100644 --- a/lib/WebGUI/Asset/Wobject/Dashboard.pm +++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm @@ -224,6 +224,12 @@ sub purge { sub view { my $self = shift; my %vars = %{$self->get()}; + + $self->session->style->setScript( + $self->session->url->extras('yui/build/utilities/utilities.js'), + { type=>'text/javascript' } + ); + my $templateId = $self->get("templateId"); my $children = $self->getLineage( ["children"], { returnObjects=>1, excludeClasses=>["WebGUI::Asset::Wobject::Layout","WebGUI::Asset::Wobject::Dashboard"] }); # I'm sure there's a more efficient way to do this. We'll figure it out someday. diff --git a/www/extras/wobject/Dashboard/draggable.js b/www/extras/wobject/Dashboard/draggable.js index 54cdeef33..f202e1572 100644 --- a/www/extras/wobject/Dashboard/draggable.js +++ b/www/extras/wobject/Dashboard/draggable.js @@ -322,88 +322,81 @@ function dragable_dragOver(obj,position) { //called on mouse up, If an element is being dragged, this method does the right thing. function dragable_dragStop(e) { - dragging=false; - if (z) { - - if (endTD !=null && startTD!=null) { - fObj2 = dragable_getObjectByClass(startTD,"availableDashlet"); + dragging=false; + if (z) { + if (endTD !=null && startTD!=null) { + fObj2 = dragable_getObjectByClass(startTD,"availableDashlet"); + dragable_moveContent(startTD,endTD,endTDPos); + if (fObj2) { + var replId = startTD.id; + replId = replId.replace(/^td/gi,''); + //alert(replId); + var replUrl = available_dashlets[replId]; + //alert(replUrl); + contentDiv = document.getElementById("ct" + replId + "_div"); + + var callback = { + success : function(req) { + var myArr528 = req.responseText.split(/beginDebug/mg,1); + contentDiv.innerHTML = myArr528[0]; + }, + failure : function(req) { + alert("Toggle Edit Form failed. Problem with connection. Please refresh the page and try again."); + } + } + + var url = replUrl + "?func=ajaxInlineView"; + var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); + } + startTD=null; + + if (dragable_isBlank(endTD)) { + divName = endTD.id; + } + else { + divName=endTD.id + "_div"; + document.getElementById(divName).className="dragable"; + } + dragable_postNewContentMap(); + } - dragable_moveContent(startTD,endTD,endTDPos); - - if (fObj2) { - var replId = startTD.id; - replId = replId.replace(/^td/gi,''); - // alert(replId); - var replUrl = available_dashlets[replId]; - // alert(replUrl); - contentDiv = document.getElementById("ct" + replId + "_div"); - var hoopla = AjaxRequest.get( - { - 'url':replUrl - ,'parameters':{ - 'func':"ajaxInlineView" - } - ,'onSuccess':function(req){ - var myArr528 = req.responseText.split(/beginDebug/mg,1); - contentDiv.innerHTML = myArr528[0]; - } - } - ); - - // tdn6p_3ZAFRtB9WiyKnrwryg - // ctn6p_3ZAFRtB9WiyKnrwryg_div + for(i=0;i/mg)[1]; + if (myScript) { + myScript = myScript.split(/\<\/script\>/mg)[0]; + eval(myScript); } - ,'onSuccess':function(req){ - var myHtml = req.responseText.split(/beginDebug/mg,1)[0]; - var myScript = myHtml.split(/\/mg)[1]; - if (myScript) { - myScript = myScript.split(/\<\/script\>/mg)[0]; - eval(myScript); - } - formDiv.innerHTML = myHtml; - } - } - ); + formDiv.innerHTML = myHtml; + }, + failure : function(req) { + alert("Toggle Edit Form failed. Problem with connection. Please refresh the page and try again."); + } + } + + var url = shortcutUrl + "?func=getUserPrefsForm"; + var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); + } function dashboard_reloadDashlet(event,shortcutId,shortcutUrl) { // Reload the content div. contentDiv = document.getElementById("ct" + shortcutId + "_div"); - var hooha = AjaxRequest.get( - { - 'url':shortcutUrl - ,'parameters':{ - 'func':"ajaxInlineView" + + var callback = { + success : function(req) { + var myHtml = req.responseText.split(/beginDebug/mg,1)[0]; + var myScript = myHtml.split(/\/mg)[1]; + if (myScript) { + myScript = myScript.split(/\<\/script\>/mg)[0]; + eval(myScript); } - ,'onSuccess':function(req){ - var myHtml = req.responseText.split(/beginDebug/mg,1)[0]; - var myScript = myHtml.split(/\/mg)[1]; - if (myScript) { - myScript = myScript.split(/\<\/script\>/mg)[0]; - eval(myScript); - } - contentDiv.innerHTML = myHtml; - } - } - ); + contentDiv.innerHTML = myHtml; + }, + failure : function(req) { + alert("Reload Dashlet failed. Problem with connection. Please refresh the page and try again."); + } + } + + var url = shortcutUrl + "?func=ajaxInlineView"; + var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); } +function makeActive(o) { o.style.display = "inline"; } + +function makeInactive(o) { o.style.display = "none"; } +