[Erp5-report] r9221 - in /erp5/trunk/products: ERP5/PropertySheet/ ERP5Form/Document/ ERP5F...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Aug 16 09:51:12 2006
New Revision: 9221

URL: http://svn.erp5.org?rev=9221&view=rev
Log:
use a standard ERP5Type Property to manage preferences' priority


Modified:
    erp5/trunk/products/ERP5/PropertySheet/Preference.py
    erp5/trunk/products/ERP5Form/Document/Preference.py
    erp5/trunk/products/ERP5Form/tests/testPreferences.py

Modified: erp5/trunk/products/ERP5/PropertySheet/Preference.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/Preference.py?rev=9221&r1=9220&r2=9221&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/Preference.py (original)
+++ erp5/trunk/products/ERP5/PropertySheet/Preference.py Wed Aug 16 09:51:12 2006
@@ -26,12 +26,18 @@
 #
 ##############################################################################
 
-class Preference :
+class Preference:
   """
     User Preference PropertySheet
   """
   
   _properties = (
+    { 'id'          : 'priority',
+      'description' : 'Priority of the preference.',
+      'type'        : 'int',
+      'default'     : 3, # ( Priority.USER )
+      'mode'        : 'w',
+      'write_permission': 'View management screens', },
     { 'id'          : 'preferred_section_category',
       'description' : 'The section category for documents; '\
                          'usually something like group/nexedi.',

Modified: erp5/trunk/products/ERP5Form/Document/Preference.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Document/Preference.py?rev=9221&r1=9220&r2=9221&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Document/Preference.py (original)
+++ erp5/trunk/products/ERP5Form/Document/Preference.py Wed Aug 16 09:51:12 2006
@@ -62,18 +62,3 @@
   security = ClassSecurityInfo()
   security.declareObjectProtected(Permissions.AccessContentsInformation)
 
-  def __init__(self, id) :
-    Folder.__init__(self, id)
-    self.priority = Priority.USER
-    
-  security.declareProtected(Permissions.ViewManagementScreens, 'setPriority')
-  def setPriority(self, priority) :
-    """ Sets the priority of the preference"""
-    self.priority = priority
-    self.reindexObjectSecurity()
-    
-  security.declareProtected(Permissions.View, 'getPriority')
-  def getPriority(self) :
-    """ Returns the priority of the preference """
-    return self.priority
-

Modified: erp5/trunk/products/ERP5Form/tests/testPreferences.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/tests/testPreferences.py?rev=9221&r1=9220&r2=9221&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/tests/testPreferences.py (original)
+++ erp5/trunk/products/ERP5Form/tests/testPreferences.py Wed Aug 16 09:51:12 2006
@@ -44,7 +44,7 @@
 
 
 class TestPreferences(ERP5TypeTestCase):
-  quiet = 0
+  quiet = 1
   run_all_tests = 1
   
   def getTitle(self):
@@ -60,12 +60,14 @@
     newSecurityManager(None, user)
     self.createPreferences()
   
+  def beforeTearDown(self):
+    portal_preferences = self.getPreferenceTool()
+    portal_preferences.manage_delObjects(list(portal_preferences.objectIds()))
+    get_transaction().commit()
+
   def createPreferences(self) :
     """ create some preferences objects  """
     portal_preferences = self.getPreferenceTool()
-    if getattr(portal_preferences, 'person1', None) is not None :
-      portal_preferences.manage_delObjects([
-                            'person1', 'person2', 'group', 'site'])
     ## create initial preferences
     person1 = portal_preferences.newContent(
         id='person1', portal_type='Preference')