From 4eaa80f3a58c98d656821083aa6496431c12ae66 Mon Sep 17 00:00:00 2001
From: Alexandre Boeglin <alex@nexedi.com>
Date: Mon, 17 Dec 2007 10:49:07 +0000
Subject: [PATCH] Periodivity_view: - remove duplicate empty entries in
frequency lists - add '0' entries in hour and minute lists - replace
map(lambda) by list comprehensions
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18355 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../erp5_core/Periodicity_view.xml | 7 +--
.../my_periodicity_day_frequency.xml | 16 ++----
.../my_periodicity_hour_frequency.xml | 51 +++----------------
.../my_periodicity_hour_list.xml | 16 ++----
.../my_periodicity_minute_frequency.xml | 51 +++----------------
.../my_periodicity_minute_list.xml | 16 ++----
.../my_periodicity_month_day_list.xml | 16 ++----
.../my_periodicity_month_frequency.xml | 51 +++----------------
.../my_periodicity_month_list.xml | 16 ++----
.../my_periodicity_week_frequency.xml | 51 +++----------------
.../my_periodicity_week_list.xml | 16 ++----
product/ERP5/bootstrap/erp5_core/bt/revision | 2 +-
12 files changed, 57 insertions(+), 252 deletions(-)
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view.xml
index 05910a38c9..cadb21dc74 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.ERP5Form.Form</string>
- <string>ERP5Form</string>
- </tuple>
- <none/>
+ <global name="ERP5Form" module="Products.ERP5Form.Form"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_day_frequency.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_day_frequency.xml
index bb7354d085..51c41c096a 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_day_frequency.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_day_frequency.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -270,18 +267,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: [\'\',\'\'] + map(lambda x:(x,x),range(1,8))</string> </value>
+ <value> <string>python: [(\'\', \'\')] + [(str(x), x) for x in range(1, 8)]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_hour_frequency.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_hour_frequency.xml
index e89da15bdd..1ac90940fe 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_hour_frequency.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_hour_frequency.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -238,40 +235,7 @@
<item>
<key> <string>items</string> </key>
<value>
- <list>
- <tuple>
-<string></string>
-<string></string>
- </tuple>
- <tuple>
- <string>1</string>
- <string>1</string>
- </tuple>
- <tuple>
- <string>2</string>
- <string>2</string>
- </tuple>
- <tuple>
- <string>3</string>
- <string>3</string>
- </tuple>
- <tuple>
- <string>4</string>
- <string>4</string>
- </tuple>
- <tuple>
- <string>5</string>
- <string>5</string>
- </tuple>
- <tuple>
- <string>6</string>
- <string>6</string>
- </tuple>
- <tuple>
- <string>7</string>
- <string>7</string>
- </tuple>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -303,18 +267,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: [\'\',\'\'] + map(lambda x:(x,x),range(1,24))</string> </value>
+ <value> <string>python: [(\'\', \'\')] + [(str(x), x) for x in range(1, 24)]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_hour_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_hour_list.xml
index 4e509460bb..3ff9a2e5ba 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_hour_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_hour_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>MultiListField</string>
- </tuple>
- <none/>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -264,18 +261,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: map(lambda x:(x,x),range(1,24))</string> </value>
+ <value> <string>python: [(str(x), x) for x in range(24)]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_minute_frequency.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_minute_frequency.xml
index 478efaf093..d53df83ed9 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_minute_frequency.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_minute_frequency.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -244,40 +241,7 @@
<item>
<key> <string>items</string> </key>
<value>
- <list>
- <tuple>
-<string></string>
-<string></string>
- </tuple>
- <tuple>
- <string>1</string>
- <string>1</string>
- </tuple>
- <tuple>
- <string>2</string>
- <string>2</string>
- </tuple>
- <tuple>
- <string>3</string>
- <string>3</string>
- </tuple>
- <tuple>
- <string>4</string>
- <string>4</string>
- </tuple>
- <tuple>
- <string>5</string>
- <string>5</string>
- </tuple>
- <tuple>
- <string>6</string>
- <string>6</string>
- </tuple>
- <tuple>
- <string>7</string>
- <string>7</string>
- </tuple>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -309,18 +273,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: [\'\',\'\'] + map(lambda x:(x,x),range(1,60))</string> </value>
+ <value> <string>python: [(\'\', \'\')] + [(str(x), x) for x in range(1, 60)]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_minute_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_minute_list.xml
index 22e11e4bf7..4f0d567c4f 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_minute_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_minute_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>MultiListField</string>
- </tuple>
- <none/>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -270,18 +267,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: map(lambda x:(x,x),range(1,60))</string> </value>
+ <value> <string>python: [(str(x), x) for x in range(60)]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_day_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_day_list.xml
index c2884d8fc7..3abbb7b2b9 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_day_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_day_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>MultiListField</string>
- </tuple>
- <none/>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -264,18 +261,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: map(lambda x:(x,x),range(1,32))</string> </value>
+ <value> <string>python: [(str(x), x) for x in range(1, 32)]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_frequency.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_frequency.xml
index 33190b70a0..d57a6454a7 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_frequency.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_frequency.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -238,40 +235,7 @@
<item>
<key> <string>items</string> </key>
<value>
- <list>
- <tuple>
-<string></string>
-<string></string>
- </tuple>
- <tuple>
- <string>1</string>
- <string>1</string>
- </tuple>
- <tuple>
- <string>2</string>
- <string>2</string>
- </tuple>
- <tuple>
- <string>3</string>
- <string>3</string>
- </tuple>
- <tuple>
- <string>4</string>
- <string>4</string>
- </tuple>
- <tuple>
- <string>5</string>
- <string>5</string>
- </tuple>
- <tuple>
- <string>6</string>
- <string>6</string>
- </tuple>
- <tuple>
- <string>7</string>
- <string>7</string>
- </tuple>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -303,18 +267,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: [\'\',\'\'] + map(lambda x:(x,x),range(1,13))</string> </value>
+ <value> <string>python: [(\'\', \'\')] + [(str(x), x) for x in range(1, 13)]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_list.xml
index 2858fd2438..75fa0969b3 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_month_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>MultiListField</string>
- </tuple>
- <none/>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -264,18 +261,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: map(lambda x:(x,x),range(1,13))</string> </value>
+ <value> <string>python: [(str(x), x) for x in range(1, 13)]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_week_frequency.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_week_frequency.xml
index 3583edce47..736a59f4cc 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_week_frequency.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_week_frequency.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
- </tuple>
- <none/>
+ <global name="ListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -238,40 +235,7 @@
<item>
<key> <string>items</string> </key>
<value>
- <list>
- <tuple>
-<string></string>
-<string></string>
- </tuple>
- <tuple>
- <string>1</string>
- <string>1</string>
- </tuple>
- <tuple>
- <string>2</string>
- <string>2</string>
- </tuple>
- <tuple>
- <string>3</string>
- <string>3</string>
- </tuple>
- <tuple>
- <string>4</string>
- <string>4</string>
- </tuple>
- <tuple>
- <string>5</string>
- <string>5</string>
- </tuple>
- <tuple>
- <string>6</string>
- <string>6</string>
- </tuple>
- <tuple>
- <string>7</string>
- <string>7</string>
- </tuple>
- </list>
+ <list/>
</value>
</item>
<item>
@@ -303,18 +267,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: [\'\',\'\'] + map(lambda x:(x,x),range(1,15))</string> </value>
+ <value> <string>python: [(\'\', \'\')] + [(str(x), x) for x in range(1, 15)]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_week_list.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_week_list.xml
index 75c12590eb..cd833b703f 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_week_list.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Periodicity_view/my_periodicity_week_list.xml
@@ -3,11 +3,8 @@
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>MultiListField</string>
- </tuple>
- <none/>
+ <global name="MultiListField" module="Products.Formulator.StandardFields"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
@@ -264,18 +261,15 @@
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: map(lambda x:(x,x),range(1,54))</string> </value>
+ <value> <string>python: [(str(x), (x)) for x in range(1, 54)]</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 0c1a9b6f06..dbda17fdf0 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-645
\ No newline at end of file
+646
\ No newline at end of file
--
2.30.9