[Erp5-report] r18957 - in /erp5admin/trunk/content/erp5admin: erp5admin.js erp5admin_async.js

[nobody at svn.erp5.org]

Author: bartek
Date: Thu Jan 31 22:52:49 2008
New Revision: 18957

URL: http://svn.erp5.org?rev=18957&view=rev
Log:
fixed an annoying (and dangerous) bug which sometimes caused erp5admin to run a script one was editing every 5 seconds

Modified:
    erp5admin/trunk/content/erp5admin/erp5admin.js
    erp5admin/trunk/content/erp5admin/erp5admin_async.js

Modified: erp5admin/trunk/content/erp5admin/erp5admin.js
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin.js?rev=18957&r1=18956&r2=18957&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin.js Thu Jan 31 22:52:49 2008
@@ -237,7 +237,14 @@
 }
 
 function erp5admin_getSiteURL(){
-    return erp5admin_getContextURL();
+    href = window.content.document.location;
+    root = '/';
+    path = href.pathname.split('/');
+    if(path[1] == 'erp5'){
+        root = '/erp5';
+    }
+    url = href.protocol + '//' + href.host + root;
+    return url
 }
 
 function erp5admin_getContextURL(){

Modified: erp5admin/trunk/content/erp5admin/erp5admin_async.js
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin_async.js?rev=18957&r1=18956&r2=18957&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin_async.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin_async.js Thu Jan 31 22:52:49 2008
@@ -69,12 +69,12 @@
 }
 
 function erp5admin_gotoPortalType(newtab){
-    url = erp5admin_getSiteURL() + '/getPortalType';
+    url = erp5admin_getContextURL() + '/getPortalType';
     erp5admin_sendRequest(url, erp5admin_editPortalType);
 }
 
 function erp5admin_gotoPortalTypeRoles(newtab){
-    url = erp5admin_getSiteURL() + '/getPortalType' ;
+    url = erp5admin_getContextURL() + '/getPortalType' ;
     erp5admin_sendRequest(url, erp5admin_editPortalTypeRoles);
 }
 
@@ -89,12 +89,12 @@
 }
 
 function erp5admin_clearAllCache(){
-    url =  erp5admin_getContextURL() + '/Admin_clearAllCache';
+    url =  erp5admin_getSiteURL() + '/Admin_clearAllCache';
     erp5admin_sendRequest(url, erp5admin_reportTaskResult);
 }
 
 function erp5admin_openSecurity(){
-    site_url = erp5admin_getSiteURL();
+    site_url = erp5admin_getContextURL();
     erp5admin_openInDashboard('security', site_url + '/Admin_viewSecurity');
     sec_timeout = window.setTimeout(erp5admin_openSecurity, 3000);
     // start timed refresh ?
@@ -118,7 +118,7 @@
 }
 
 function erp5admin_recalculateSecurity(){
-    site_url = erp5admin_getSiteURL();
+    site_url = erp5admin_getContextURL();
     erp5admin_openInDashboard('security', site_url + '/Admin_updateSecurity');
 }