[Erp5-report] r19741 - /experimental/FSPatch/Products/ERP5Form/ERP5Form_safeRelationField.diff

[nobody at svn.erp5.org]

Author: bartek
Date: Thu Mar  6 18:53:13 2008
New Revision: 19741

URL: http://svn.erp5.org?rev=19741&view=rev
Log:
updated to HEAD version of the target

Modified:
    experimental/FSPatch/Products/ERP5Form/ERP5Form_safeRelationField.diff

Modified: experimental/FSPatch/Products/ERP5Form/ERP5Form_safeRelationField.diff
URL: http://svn.erp5.org/experimental/FSPatch/Products/ERP5Form/ERP5Form_safeRelationField.diff?rev=19741&r1=19740&r2=19741&view=diff
==============================================================================
--- experimental/FSPatch/Products/ERP5Form/ERP5Form_safeRelationField.diff (original)
+++ experimental/FSPatch/Products/ERP5Form/ERP5Form_safeRelationField.diff Thu Mar  6 18:53:13 2008
@@ -1,17 +1,17 @@
 Index: MultiRelationField.py
 ===================================================================
---- MultiRelationField.py	(wersja 17264)
+--- MultiRelationField.py	(wersja 19672)
 +++ MultiRelationField.py	(kopia robocza)
-@@ -40,6 +40,8 @@
- from Products.Formulator.DummyField import fields
- from Globals import get_request
+@@ -42,6 +42,8 @@
+ from AccessControl import Unauthorized
+ from AccessControl import getSecurityManager
  
 +from Products.ERP5Form import Form
 +
  # Max. number of catalog result
  MAX_SELECT = 30
  NEW_CONTENT_PREFIX = '_newContent_'
-@@ -324,6 +326,8 @@
+@@ -325,6 +327,8 @@
      """
      Render link to the related object.
      """
@@ -22,7 +22,7 @@
      portal_url = getToolByName(here, 'portal_url')
 Index: Form.py
 ===================================================================
---- Form.py	(wersja 17264)
+--- Form.py	(wersja 19672)
 +++ Form.py	(kopia robocza)
 @@ -47,6 +47,8 @@
  from Products.ERP5Type.PsycoWrapper import psyco
@@ -33,19 +33,31 @@
  _field_value_cache = {}
  def purgeFieldValueCache():
    _field_value_cache.clear()
-@@ -197,7 +199,10 @@
-       else:
-         # else we should give a chance to the accessor to provide
-         # a default value (including None)
+@@ -193,13 +195,16 @@
+       form = field.aq_parent
+       ob = getattr(form, 'aq_parent', None)
+       value = self.value
+-      if value not in (None, ''):
+-        # If a default value is defined on the field, it has precedence
+-        value = ob.getProperty(self.key, d=value)
+-      else:
+-        # else we should give a chance to the accessor to provide
+-        # a default value (including None)
 -        value = ob.getProperty(self.key)
-+        try:
++      try:
++        if value not in (None, ''):
++          # If a default value is defined on the field, it has precedence
++          value = ob.getProperty(self.key, d=value)
++        else:
++          # else we should give a chance to the accessor to provide
++          # a default value (including None)
 +          value = ob.getProperty(self.key)
-+        except Unauthorized:
-+          value = NOT_AVAILABLE_MARKER
++      except Unauthorized:
++        return NOT_AVAILABLE_MARKER
      except (KeyError, AttributeError):
        value = None
      return self.returnValue(field, id, value)
-@@ -286,7 +291,10 @@
+@@ -290,7 +295,10 @@
        _field_value_cache[cache_id] = value
  
    if callable(value):
@@ -57,7 +69,7 @@
    return value
  
  psyco.bind(get_value)
-@@ -305,7 +313,10 @@
+@@ -309,7 +317,10 @@
          value = self._get_user_input_value(key, REQUEST)
      except (KeyError, AttributeError):
          # fall back on default
@@ -71,18 +83,18 @@
      # convert to unicode first
 Index: ListBox.py
 ===================================================================
---- ListBox.py	(wersja 17264)
+--- ListBox.py	(wersja 19672)
 +++ ListBox.py	(kopia robocza)
-@@ -54,6 +54,8 @@
- import cgi
- import types
+@@ -41,6 +41,8 @@
+ from Products.ZSQLCatalog.zsqlbrain import ZSQLBrain
+ from Products.ERP5Type.Message import Message
  
 +from Products.ERP5Form import Form
 +
- # For compatibility with Python 2.3.
- try:
-   set
-@@ -1907,9 +1909,12 @@
+ from Acquisition import aq_base, aq_self
+ from zLOG import LOG, WARNING, INFO
+ from ZODB.POSException import ConflictError
+@@ -1896,9 +1898,12 @@
                except AttributeError:
                  original_value = getattr(obj, property_id, None)
                  processed_value = original_value
@@ -96,7 +108,7 @@
            else:
              original_value = None
              processed_value = 'Object does not exist'
-@@ -1927,6 +1932,9 @@
+@@ -1916,6 +1921,9 @@
              processed_value = original_value
          except (ConflictError, RuntimeError):
            raise