[Erp5-report] r25529 - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateItem/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Feb 11 16:42:18 CET 2009
Author: kazuhiko
Date: Wed Feb 11 16:42:17 2009
New Revision: 25529
URL: http://svn.erp5.org?rev=25529&view=rev
Log:
cleanup PreferenceTool_viewPreferenceList.
* display priority as text even for Manager.
* remove (already disactivated) owner and portal_type column.
* modify a column name from 'Active' to 'Status'.
Removed:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox_owner.xml
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_getPriorityAsText.xml
erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList.xml?rev=25529&r1=25528&r2=25529&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList.xml [utf8] Wed Feb 11 16:42:17 2009
@@ -72,9 +72,7 @@
<item>
<key> <string>hidden</string> </key>
<value>
- <list>
- <string>listbox_owner</string>
- </list>
+ <list/>
</value>
</item>
</dictionary>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox.xml?rev=25529&r1=25528&r2=25529&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox.xml [utf8] Wed Feb 11 16:42:17 2009
@@ -313,11 +313,27 @@
<item>
<key> <string>all_columns</string> </key>
<value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>all_editable_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>columns</string> </key>
+ <value>
<list>
- <tuple>
- <string>id</string>
- <string>ID</string>
- </tuple>
<tuple>
<string>title</string>
<string>Title</string>
@@ -328,57 +344,12 @@
</tuple>
<tuple>
<string>translated_preference_state_title</string>
- <string>Active</string>
+ <string>Status</string>
</tuple>
<tuple>
<string>Preference_getPriorityAsText</string>
<string>Level</string>
</tuple>
- <tuple>
- <string>owner</string>
- <string>Owner</string>
- </tuple>
- <tuple>
- <string>portal_type</string>
- <string>Type</string>
- </tuple>
- </list>
- </value>
- </item>
- <item>
- <key> <string>all_editable_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>anchor</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>columns</string> </key>
- <value>
- <list>
- <tuple>
- <string>title</string>
- <string>Title</string>
- </tuple>
- <tuple>
- <string>description</string>
- <string>Description</string>
- </tuple>
- <tuple>
- <string>translated_preference_state_title</string>
- <string>Active</string>
- </tuple>
- <tuple>
- <string>Preference_getPriorityAsText</string>
- <string>Level</string>
- </tuple>
</list>
</value>
</item>
@@ -456,7 +427,7 @@
</item>
<item>
<key> <string>list_action</string> </key>
- <value> <string>list</string> </value>
+ <value> <string>PreferenceTool_viewPreferenceList</string> </value>
</item>
<item>
<key> <string>list_cookie</string> </key>
@@ -566,6 +537,12 @@
<item>
<key> <string>title</string> </key>
<value> <string>Preferences</string> </value>
+ </item>
+ <item>
+ <key> <string>untranslatable_columns</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
<item>
<key> <string>url_columns</string> </key>
Removed: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox_owner.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox_owner.xml?rev=25528&view=auto
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox_owner.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/PreferenceTool_viewPreferenceList/listbox_owner.xml (removed)
@@ -1,284 +1,0 @@
-<?xml version="1.0"?>
-<ZopeData>
- <record id="1" aka="AAAAAAAAAAE=">
- <pickle>
- <tuple>
- <global name="StringField" module="Products.Formulator.StandardFields"/>
- <tuple/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>listbox_owner</string> </value>
- </item>
- <item>
- <key> <string>message_values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>external_validator_failed</string> </key>
- <value> <string>The input failed the external validator.</string> </value>
- </item>
- <item>
- <key> <string>required_not_found</string> </key>
- <value> <string>Input is required but no input given.</string> </value>
- </item>
- <item>
- <key> <string>too_long</string> </key>
- <value> <string>Too much input was given.</string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>overrides</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>tales</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_maxwidth</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>display_width</string> </key>
- <value> <int>20</int> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>max_length</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string>Owner</string> </value>
- </item>
- <item>
- <key> <string>truncate</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
- </item>
- </dictionary>
- </value>
- </item>
- </dictionary>
- </pickle>
- </record>
- <record id="2" aka="AAAAAAAAAAI=">
- <pickle>
- <tuple>
- <tuple>
- <string>Products.Formulator.TALESField</string>
- <string>TALESMethod</string>
- </tuple>
- <none/>
- </tuple>
- </pickle>
- <pickle>
- <dictionary>
- <item>
- <key> <string>_text</string> </key>
- <value> <string>cell/getViewPermissionOwner</string> </value>
- </item>
- </dictionary>
- </pickle>
- </record>
-</ZopeData>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_getPriorityAsText.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_getPriorityAsText.xml?rev=25529&r1=25528&r2=25529&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_getPriorityAsText.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Preference_getPriorityAsText.xml [utf8] Wed Feb 11 16:42:17 2009
@@ -53,18 +53,11 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string># managers can edit the priority field in Preference_view, so they need to have the value\n
-if context.getPortalObject().portal_membership.checkPermission("Manage portal", context) :\n
- #getAuthenticatedMember().hasRole(context, \'Manager\') :\n
- return context.getPriority()\n
-\n
-# others just want a readable text.\n
-if context.getPriority() == 1 :\n
- return "Site"\n
-elif context.getPriority() == 2 : \n
- return "Group"\n
-else : \n
- return "User"\n
+ <value> <string>priority_dict = {\n
+ 1:\'Site\',\n
+ 2:\'Group\',\n
+}\n
+return priority_dict.get(context.getPriority(), \'User\')\n
</string> </value>
</item>
<item>
@@ -101,6 +94,7 @@
<key> <string>co_varnames</string> </key>
<value>
<tuple>
+ <string>priority_dict</string>
<string>_getattr_</string>
<string>context</string>
</tuple>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=25529&r1=25528&r2=25529&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Wed Feb 11 16:42:17 2009
@@ -1,1 +1,1 @@
-1085
+1086
More information about the Erp5-report
mailing list