[Erp5-report] r37969 seb - in /erp5/trunk/products/ERP5: Document/ PropertySheet/ dtml/

[nobody at svn.erp5.org]

Author: seb
Date: Tue Aug 24 11:09:36 2010
New Revision: 37969

URL: http://svn.erp5.org?rev=37969&view=rev
Log:
* associate PythonScript property sheet to PythonScript class
* fix AttributeError (while searching _v_ft) when runing scripts
* fix title in the form allowing to add erp5 python script

Added:
    erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMIForm.dtml
      - copied, changed from r37965, erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMI.dtml
Removed:
    erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMI.dtml
Modified:
    erp5/trunk/products/ERP5/Document/PythonScript.py
    erp5/trunk/products/ERP5/PropertySheet/PythonScript.py

Modified: erp5/trunk/products/ERP5/Document/PythonScript.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PythonScript.py?rev=37969&r1=37968&r2=37969&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PythonScript.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/PythonScript.py [utf8] Tue Aug 24 11:09:36 2010
@@ -37,7 +37,7 @@ from Products.PythonScripts.PythonScript
 
 # Only needed until skin tool is migrated
 manage_addPythonScriptFormThroughZMI = \
-  HTMLFile("../dtml/addPythonScriptThroughZMI", globals())
+  HTMLFile("../dtml/addPythonScriptThroughZMIForm", globals())
 def addPythonScriptThroughZMI(self, id, title="", REQUEST=None):
     """Add a Python script to a folder.
     """
@@ -86,6 +86,7 @@ class PythonScript(XMLObject, ZopePython
                       , PropertySheet.XMLObject
                       , PropertySheet.CategoryCore
                       , PropertySheet.DublinCore
+                      , PropertySheet.PythonScript
                       )
     
     def _setBody(self, value):
@@ -98,3 +99,7 @@ class PythonScript(XMLObject, ZopePython
 
     def edit(self, **kw):
       XMLObject.edit(self, **kw)
+
+    # We need to take __setstate__ from ZopePythonScript in order to
+    # generate _v_ft attributes which is necessary to run the script
+    __setstate__ = ZopePythonScript.__setstate__

Modified: erp5/trunk/products/ERP5/PropertySheet/PythonScript.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/PythonScript.py?rev=37969&r1=37968&r2=37969&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/PythonScript.py [utf8] (original)
+++ erp5/trunk/products/ERP5/PropertySheet/PythonScript.py [utf8] Tue Aug 24 11:09:36 2010
@@ -43,4 +43,6 @@ class PythonScript:
           'mode'        : '' },
   )
 
+  _categories = ('callable_type',)
+
 

Removed: erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMI.dtml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMI.dtml?rev=37968&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMI.dtml [utf8] (original)
+++ erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMI.dtml (removed)
@@ -1,51 +0,0 @@
-<dtml-var manage_page_header>
-
-<dtml-var "manage_form_title(this(), _,
-           form_title='Add ERP5 Formulator Form',
-           )">
-
-<p class="form-help">
-Formulator Forms allow you to create solid web forms more easily.
-</p>
-
-<form action="addPythonScriptThroughZMI" method="POST">
-
-<table cellspacing="0" cellpadding="2" border="0">
-  <tr>
-    <td align="left" valign="top">
-    <div class="form-label">
-    Id
-    </div>
-    </td>
-    <td align="left" valign="top">
-    <input type="text" name="id" size="40" />
-    </td>
-  </tr>
-
-  <tr>
-    <td align="left" valign="top">
-    <div class="form-label">
-    Title
-    </div>
-    </td>
-    <td align="left" valign="top">
-    <input type="text" name="title" size="40" />
-    </td>
-  </tr>
-
-  <tr>
-    <td align="left" valign="top">
-    </td>
-    <td align="left" valign="top">
-    <div class="form-element">
-    <input class="form-element" type="submit" name="submit" 
-     value=" Add " /> 
-    <input class="form-element" type="submit" name="submit" 
-     value=" Add and Edit " />
-    </div>
-    </td>
-  </tr>
-</table>
-</form>
-
-<dtml-var manage_page_footer>

Copied: erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMIForm.dtml (from r37965, erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMI.dtml)
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMIForm.dtml?p2=erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMIForm.dtml&p1=erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMI.dtml&r1=37965&r2=37969&rev=37969&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMI.dtml [utf8] (original)
+++ erp5/trunk/products/ERP5/dtml/addPythonScriptThroughZMIForm.dtml [utf8] Tue Aug 24 11:09:36 2010
@@ -1,11 +1,12 @@
 <dtml-var manage_page_header>
 
 <dtml-var "manage_form_title(this(), _,
-           form_title='Add ERP5 Formulator Form',
+           form_title='Add ERP5 Python Script',
            )">
 
 <p class="form-help">
-Formulator Forms allow you to create solid web forms more easily.
+ERP5 Python Scripts allows to add to usual python scripts
+some erp5 properties
 </p>
 
 <form action="addPythonScriptThroughZMI" method="POST">