[Erp5-report] r19661 - /erp5admin/trunk/content/erp5admin/

[nobody at svn.erp5.org]

Author: bartek
Date: Tue Mar  4 10:26:13 2008
New Revision: 19661

URL: http://svn.erp5.org?rev=19661&view=rev
Log:
refactoring - this implementation is much cooler, and adds useful functions to erp5admin API

Modified:
    erp5admin/trunk/content/erp5admin/erp5admin.js
    erp5admin/trunk/content/erp5admin/erp5admin.xul
    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=19661&r1=19660&r2=19661&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin.js Tue Mar  4 10:26:13 2008
@@ -286,14 +286,6 @@
             case 'object':
                 manage = erp5admin_getContextURL() + '/manage_main';
                 break;
-            case 'form':
-                form_id = erp5admin_getFormId(); 
-                if(form_id == false){
-                    alert('could not find form_id');
-                    return;
-                }
-                manage = site_url + '/' + 'Admin_redirectToSkinObject?object_id=' + form_id
-                break;
             case 'dict':
                 manage = context_url + '/Base_viewDict';
                 break;

Modified: erp5admin/trunk/content/erp5admin/erp5admin.xul
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin.xul?rev=19661&r1=19660&r2=19661&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin.xul (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin.xul Tue Mar  4 10:26:13 2008
@@ -29,7 +29,7 @@
 
     <toolbox id="navigator-toolbox">
         <toolbar id="erp5admin-toolbar" class="chromeclass-toolbar" collapsed="false" iconsize="small" mode="full" inherits="collapsed,hidden" hidden="false" persist="collapsed,hidden" >
-            <button label="form" id="manage-form-button" tooltiptext="Manage form" oncommand="erp5admin_gotoManage('form',true)"/>
+            <button label="form" id="manage-form-button" tooltiptext="Manage form" oncommand="erp5admin_gotoFormManage(true)"/>
             <button label="object" id="manage-object-button" tooltiptext="Manage object" oncommand="erp5admin_gotoManage('object',true)"/>
             <menu id="toolbar_object" label="object" tooltiptext="Object menu" position="1">
                 <menupopup onpopupshowing="erp5admin_updateObjectMenu();">

Modified: erp5admin/trunk/content/erp5admin/erp5admin_async.js
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin_async.js?rev=19661&r1=19660&r2=19661&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin_async.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin_async.js Tue Mar  4 10:26:13 2008
@@ -31,6 +31,14 @@
     //}
 }
 
+function erp5admin_parseTuple(tup){
+    // parse a tuple string representation returned by the site
+    tup = tup.replace("(", '').replace(")", '');     tup = tup.replace(/ /g, "").replace(/'/g, "");
+    tup = tup.split(',');
+    tup.shift(); // remove the ''
+    return tup;
+}
+
 function erp5admin_reportTaskResult(val){
     alert(val);
 }
@@ -68,6 +76,13 @@
     erp5admin_goto(url, 'manage_editRolesForm', true, true);
 }
 
+function erp5admin_editForm(val){
+    val = erp5admin_parseTuple(val);
+    val.shift(); // remove the site root
+    url = val.join('/');
+    erp5admin_goto(url, 'manage_main', true, true);
+}
+
 function erp5admin_gotoPortalType(newtab){
     url = erp5admin_getContextURL() + '/getPortalType';
     erp5admin_sendRequest(url, erp5admin_editPortalType);
@@ -76,6 +91,16 @@
 function erp5admin_gotoPortalTypeRoles(newtab){
     url = erp5admin_getContextURL() + '/getPortalType' ;
     erp5admin_sendRequest(url, erp5admin_editPortalTypeRoles);
+}
+
+function erp5admin_gotoFormManage(newtab){
+    form_id = erp5admin_getFormId(); 
+    if(form_id == false){
+        alert('could not find form_id');
+        return;
+    }
+    url = erp5admin_getSiteURL() + '/Admin_getDefaultObjectPath?object_id=' + form_id ;
+    erp5admin_sendRequest(url, erp5admin_editForm);
 }
 
 function erp5admin_reindexObject(){