[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r6661 - trunk/gnue-forms/src
From: |
johannes |
Subject: |
r6661 - trunk/gnue-forms/src |
Date: |
Tue, 9 Nov 2004 07:21:48 -0600 (CST) |
Author: johannes
Date: 2004-11-09 07:21:47 -0600 (Tue, 09 Nov 2004)
New Revision: 6661
Modified:
trunk/gnue-forms/src/GFDisplayHandler.py
Log:
Entries with allowed values use fk_description for display and work (instead of
fk_key)
Modified: trunk/gnue-forms/src/GFDisplayHandler.py
===================================================================
--- trunk/gnue-forms/src/GFDisplayHandler.py 2004-11-09 10:32:17 UTC (rev
6660)
+++ trunk/gnue-forms/src/GFDisplayHandler.py 2004-11-09 13:21:47 UTC (rev
6661)
@@ -527,14 +527,43 @@
def _buildValue(self):
- self.value = self.work
+ if self.field._allowedValues:
+ if self.work == "":
+ self.value = '' # None
+ else:
+ try:
+ self.value = self.field._allowedValuesReverse [self.display]
+
+ except KeyError:
+ return False
+
+ else:
+ self.value = self.work
+
return True
def _buildDisplayHelper(self, value, editing):
- if value == None:
- return ""
+ if self.field._allowedValues:
+ if editing:
+ val = value.lower ()
+
+ for disp in self.field._allowedValuesDescr:
+ if disp [:len (val)].lower () == val:
+ revVal = self.field._allowedValuesReverse [disp]
+ return self.field._allowedValues [revVal]
+
+ return value
+
+ if self.field._allowedValues.has_key ("%s" % value):
+ return self.field._allowedValues ["%s" % value]
+ else:
+ return ""
+
else:
- return "%s" % value
+ if value == None:
+ return ""
+ else:
+ return "%s" % value
def _buildDisplay(self):
if self.editing:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- r6661 - trunk/gnue-forms/src,
johannes <=