diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 929933814..53ee35b75 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,5 @@ 7.6.0 + - fixed: Project Manager sometimes causes errors when adding users to a task - fixed: site navigation will sometimes show as half or not styled - fixed: after editting assets from the asset manager, it returns to site instead of manager - improved Rich Text selection list, changed CS and Wiki to use it diff --git a/www/extras/wobject/ProjectManager/modal.js b/www/extras/wobject/ProjectManager/modal.js index d407b4a6e..5df4df1da 100644 --- a/www/extras/wobject/ProjectManager/modal.js +++ b/www/extras/wobject/ProjectManager/modal.js @@ -40,6 +40,7 @@ function hidePopWin() { function showPopWin( e ) { + YAHOO.util.Event.stopEvent(e); var link = YAHOO.util.Event.getTarget(e); if(link == "") { diff --git a/www/extras/wobject/ProjectManager/taskEdit.js b/www/extras/wobject/ProjectManager/taskEdit.js index 4890c5380..3313e12ef 100644 --- a/www/extras/wobject/ProjectManager/taskEdit.js +++ b/www/extras/wobject/ProjectManager/taskEdit.js @@ -48,8 +48,7 @@ function taskEdit_updateResources(resources) { var component = encodeURIComponent(resources.join(';')); var url = document.location.toString(); - var queryIndex = url.indexOf('?'); - if (queryIndex > -1) url = url.substr(0, queryIndex); + url = url.replace(/[#\?].*/, ''); url += '?func=innerHtmlOfResources;resources=' + component; taskEdit_updateExclude("taskEdit_resourceList_addUser_a", 'user', resources); taskEdit_updateExclude("taskEdit_resourceList_addGroup_a", 'group', resources);