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

[nobody at svn.erp5.org]

Author: bartek
Date: Tue Apr 22 23:54:22 2008
New Revision: 20761

URL: http://svn.erp5.org?rev=20761&view=rev
Log:
added Update button to security window

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

Modified: erp5admin/trunk/content/erp5admin/erp5admin.xul
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin.xul?rev=20761&r1=20760&r2=20761&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin.xul (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin.xul Tue Apr 22 23:54:22 2008
@@ -129,6 +129,8 @@
             <hbox>
                 <spacer flex="1"/>
                 <separator class="groove-thin" orient="vertical"/>
+                <toolbarbutton id="erp5admin-update-security-but" label="[[ Update ]]" tooltiptext="Re-calculate security information for the object in security window" oncommand="erp5admin_recalculateSecurity();"/>
+                <separator class="groove-thin" orient="vertical"/>
                 <toolbarbutton id="erp5admin-refresh-security" label="[[ Refresh ]]" tooltiptext="Re-read security information for the same object" oncommand="erp5admin_refreshSecurity();"/>
                 <separator class="groove-thin" orient="vertical"/>
                 <toolbarbutton id="erp5admin-read-security" label="[[ Go Here ]]" tooltiptext="Read security info for current context" oncommand="erp5admin_openSecurity();"/>
@@ -141,12 +143,13 @@
         </vbox>
     </window>
 
+    <!-- DOESN'T WORK
     <popupset>
         <popup id="dashboardPopup">
             <menuitem label="Refresh" oncommand="erp5admin_openSecurity();"/>
             <menuitem label="Recalculate" oncommand="erp5admin_recalculateSecurity();"/>
         </popup>
-    </popupset>
+    </popupset> -->
 
     <statusbar id="status-bar">
         <statusbarpanel id="erp5admin-statusbar-panel" insertafter="page-report-button">

Modified: erp5admin/trunk/content/erp5admin/erp5admin_async.js
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin_async.js?rev=20761&r1=20760&r2=20761&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin_async.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin_async.js Tue Apr 22 23:54:22 2008
@@ -1,4 +1,4 @@
-security_url = false;
+security_context_url = false;
 
 function erp5admin_processResponse(http_request, callback, fallback){
     if (http_request.readyState == 4){
@@ -139,11 +139,11 @@
 
 function erp5admin_openSecurity(){
     context_url = erp5admin_getContextURL();
-    erp5admin_openInDashboard('security', context_url + '/Admin_viewSecurity');
+    erp5admin_openInDashboard('security', context_url, '/Admin_viewSecurity');
 } 
 
 function erp5admin_refreshSecurity(){
-    erp5admin_openInDashboard('security', security_url);
+    erp5admin_openInDashboard('security', security_context_url, '/Admin_viewSecurity');
 }
 
 function erp5admin_getTestScriptName(){
@@ -164,8 +164,8 @@
 }
 
 function erp5admin_recalculateSecurity(){
-    site_url = erp5admin_getContextURL();
-    erp5admin_openInDashboard('security', site_url + '/Admin_updateSecurity');
+    if(security_context_url == false) return;
+    erp5admin_openInDashboard('security', security_context_url, '/Admin_updateSecurity');
 } 
 
 function erp5admin_isDashboardOpen(){
@@ -220,7 +220,7 @@
 }
 
 // Opens the given URL in the dashboard
-function erp5admin_openInDashboard(title, url)
+function erp5admin_openInDashboard(title, url, method)
 {
     dashboard = document.getElementById("erp5admin-dashboard")
     dashboard_browse = document.getElementById("erp5admin-dashboard-browse")
@@ -232,9 +232,9 @@
         browser = dashboard_browse.childNodes[0]
     }
     try {
-        security_url = url;
-        browser.setAttribute("src", security_url);
-        browser.loadURI(security_url); 
+        security_context_url = url; // not quite good - why security?
+        browser.setAttribute("src", security_context_url + method);
+        browser.loadURI(security_context_url + method); 
     }catch(e){
         // pass
     }
@@ -257,5 +257,5 @@
 function erp5admin_hideDashboard(){
     dashboard.hidden = true;
     document.getElementById("erp5admin-dashboard-splitter").hidden = true;
-    security_url = false;
-}
+    security_context_url = false;
+}