[Erp5-report] r44165 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Mar 10 23:21:27 CET 2011
Author: gabriel
Date: Thu Mar 10 23:21:27 2011
New Revision: 44165
URL: http://svn.erp5.org?rev=44165&view=rev
Log:
refactor and rename python script
Added:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_checkIfUserExist.xml
Removed:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_getUserValidationState.xml
Modified:
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout/your_listbox_modification_date.xml
erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
Added: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_checkIfUserExist.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_checkIfUserExist.xml?rev=44165&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_checkIfUserExist.xml (added)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_checkIfUserExist.xml [utf8] Thu Mar 10 23:21:27 2011
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>import json\n
+\n
+kw.update(context.REQUEST.form)\n
+\n
+if not kw:\n
+ return json.dumps(dict(response=False))\n
+\n
+portal = context.getPortalObject()\n
+person = portal.portal_catalog.getResultValue(portal_type="Person",\n
+ validation_state="validated",\n
+ **kw)\n
+\n
+return json.dumps(dict(response=(person is not None)))\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>**kw</string> </value>
+ </item>
+ <item>
+ <key> <string>_proxy_roles</string> </key>
+ <value>
+ <tuple>
+ <string>Manager</string>
+ </tuple>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>ERP5Site_checkIfUserExist</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Removed: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_getUserValidationState.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_getUserValidationState.xml?rev=44164&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_getUserValidationState.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_getUserValidationState.xml (removed)
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>Script_magic</string> </key>
- <value> <int>3</int> </value>
- </item>
- <item>
- <key> <string>_bind_names</string> </key>
- <value>
- <object>
- <klass>
- <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
- </klass>
- <tuple/>
- <state>
- <dictionary>
- <item>
- <key> <string>_asgns</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>name_container</string> </key>
- <value> <string>container</string> </value>
- </item>
- <item>
- <key> <string>name_context</string> </key>
- <value> <string>context</string> </value>
- </item>
- <item>
- <key> <string>name_m_self</string> </key>
- <value> <string>script</string> </value>
- </item>
- <item>
- <key> <string>name_subpath</string> </key>
- <value> <string>traverse_subpath</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </state>
- </object>
- </value>
- </item>
- <item>
- <key> <string>_body</string> </key>
- <value> <string>import json\n
-\n
-portal = context.getPortalObject()\n
-person = portal.portal_catalog.getResultValue(portal_type="Person",\n
- validation_state="validated",\n
- **kw)\n
-return json.dumps(dict(response=(person is not None)))\n
-</string> </value>
- </item>
- <item>
- <key> <string>_params</string> </key>
- <value> <string>**kw</string> </value>
- </item>
- <item>
- <key> <string>_proxy_roles</string> </key>
- <value>
- <tuple>
- <string>Manager</string>
- </tuple>
- </value>
- </item>
- <item>
- <key> <string>id</string> </key>
- <value> <string>ERP5Site_getUserValidationState</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout/your_listbox_modification_date.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout/your_listbox_modification_date.xml?rev=44165&r1=44164&r2=44165&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout/your_listbox_modification_date.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/erp5_web_ung_layout/your_listbox_modification_date.xml [utf8] Thu Mar 10 23:21:27 2011
@@ -136,7 +136,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: cell.getModificationDate()</string> </value>
+ <value> <string>cell/getModificationDate</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml?rev=44165&r1=44164&r2=44165&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung.js.xml [utf8] Thu Mar 10 23:21:27 2011
@@ -114,14 +114,14 @@ function changeCheckBoxValue(value){\n
}\n
\n
function waitCreateUNGUser(paramStr){\n
- $.get("ERP5Site_getUserValidationState?" + paramStr, {}, function(data, textStatus, XMLHttpRequest){\n
+ $.get("ERP5Site_checkIfUserExist?" + paramStr, {}, function(data, textStatus, xhr){\n
data = jQuery.parseJSON(data);\n
if (data.response == true){\n
clearTimeout();\n
window.location.reload();\n
}\n
else {\n
- setTimeout(waitCreateUNGUser(paramStr), 2000);\n
+ setTimeout(waitCreateUNGUser(paramStr), 3500);\n
}\n
});\n
}\n
@@ -160,8 +160,7 @@ function displayLoginForm(){ \n
return false;\n
}\n
else {\n
- var paramStr = "first_name=" + formHash.firstname +\n
- "&" + "last_name=" + formHash.lastname;\n
+ var paramStr = "reference=" + formHash.login_name;\n
setTimeout(waitCreateUNGUser(paramStr), 2000); \n
}\n
});\n
Modified: erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py?rev=44165&r1=44164&r2=44165&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/TestTemplateItem/testUNG.py [utf8] Thu Mar 10 23:21:27 2011
@@ -298,8 +298,8 @@ class TestUNG(ERP5TypeTestCase):
response = json.loads(self.portal.ERPSite_createUNGUser())
self.assertEquals(response, None)
- def testERP5Site_getUserValidationState(self):
- """Test script ERP5Site_getUserValidationState"""
+ def testERP5Site_checkIfUserExist(self):
+ """Test script ERP5Site_checkIfUserExist"""
portal = self.portal
form_dict = dict(firstname="UNG",
lastname="User",
@@ -311,15 +311,15 @@ class TestUNG(ERP5TypeTestCase):
last_name=form_dict["lastname"],
reference=form_dict["login_name"],
)
- response = json.loads(portal.ERP5Site_getUserValidationState(**kw))
+ response = json.loads(portal.ERP5Site_checkIfUserExist(**kw))
self.assertEquals(response.get("response"), False)
self.stepTic()
- response = json.loads(portal.ERP5Site_getUserValidationState(**kw))
+ response = json.loads(portal.ERP5Site_checkIfUserExist(**kw))
self.assertEquals(response.get("response"), True)
kw = dict(first_name="Not Exist",
reference="no_reference",
)
- response = json.loads(portal.ERP5Site_getUserValidationState(**kw))
+ response = json.loads(portal.ERP5Site_checkIfUserExist(**kw))
self.assertEquals(response.get("response"), False)
self.login("ung_reference")
user = portal.ERP5Site_getAuthenticatedMemberPersonValue()
Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=44165&r1=44164&r2=44165&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Thu Mar 10 23:21:27 2011
@@ -1 +1 @@
-282
\ No newline at end of file
+283
\ No newline at end of file
More information about the Erp5-report
mailing list