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

[nobody at svn.erp5.org]

Author: bartek
Date: Sat Apr 12 15:26:49 2008
New Revision: 20459

URL: http://svn.erp5.org?rev=20459&view=rev
Log:
when doing 'inspect selected' use the new redirection mechanism so that the object is in the right path

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=20459&r1=20458&r2=20459&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin.js Sat Apr 12 15:26:49 2008
@@ -82,23 +82,6 @@
     return doc;
 }
 
-function erp5admin_inspectFromString(newtab){
-    /* 
-     * find selected text, find name inside it
-     * and open it in a new tab
-    */
-    newtab=true;
-    doc = erp5admin_getDoc();
-    text=erp5admin_findSelectionInDocument(doc);
-    name=erp5admin_cutName(text);
-    if(name==null){
-        alert('Name not found in selection\n\nSelect something which follows naming convention (Aaa_aaAaaAaaa)\nMake sure there is no selected text in another control.');
-        return;
-    }
-    erp5admin_goto(name,'manage_main',newtab,true);
-    return;
-}
-
 function erp5admin_grepForString(newtab){
     /* 
      * find selected text, find name inside it

Modified: erp5admin/trunk/content/erp5admin/erp5admin_async.js
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin_async.js?rev=20459&r1=20458&r2=20459&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin_async.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin_async.js Sat Apr 12 15:26:49 2008
@@ -77,7 +77,7 @@
     erp5admin_goto(url, 'manage_editRolesForm', true, true);
 }
 
-function erp5admin_editForm(val){
+function erp5admin_editObject(val){
     val = erp5admin_parseTuple(val);
     val.shift(); // remove the site root
     url = val.join('/');
@@ -101,7 +101,25 @@
         return;
     }
     url = erp5admin_getSiteURL() + '/Admin_getDefaultObjectPath?object_id=' + form_id ;
-    erp5admin_sendRequest(url, erp5admin_editForm);
+    erp5admin_sendRequest(url, erp5admin_editObject);
+}
+
+function erp5admin_inspectFromString(newtab){
+    /* 
+     * find selected text, find name inside it
+     * and open it in a new tab
+    */
+    newtab = true;
+    doc = erp5admin_getDoc();
+    text=erp5admin_findSelectionInDocument(doc);
+    name=erp5admin_cutName(text);
+    if(name == null){
+        alert('Name not found in selection\n\nSelect something which follows naming convention (Aaa_aaAaaAaaa)\nMake sure there is no selected text in another control.');
+        return;
+    }
+    url = erp5admin_getSiteURL() + '/Admin_getDefaultObjectPath?object_id=' + name ;
+    erp5admin_sendRequest(url, erp5admin_editObject);
+    return;
 }
 
 function erp5admin_reindexObject(){