[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
r6700 - trunk/gnue-appserver/src/generator
From: |
johannes |
Subject: |
r6700 - trunk/gnue-appserver/src/generator |
Date: |
Thu, 18 Nov 2004 08:07:32 -0600 (CST) |
Author: johannes
Date: 2004-11-18 08:07:31 -0600 (Thu, 18 Nov 2004)
New Revision: 6700
Modified:
trunk/gnue-appserver/src/generator/form.py
Log:
Generate proper reference widgets (according to latest changes)
Modified: trunk/gnue-appserver/src/generator/form.py
===================================================================
--- trunk/gnue-appserver/src/generator/form.py 2004-11-18 12:55:30 UTC (rev
6699)
+++ trunk/gnue-appserver/src/generator/form.py 2004-11-18 14:07:31 UTC (rev
6700)
@@ -134,27 +134,14 @@
table = item.reference.classname
# dropdown widgets need an additional datasource for their values
- if refItem.style == 'dropdown' or refItem.style is None:
- source = "dts%s" % item.reference.classname
- refItem.block = 'blkMaster'
- refItem.source = source
+ source = "dts%s%s" % (item.fullName, item.reference.classname)
+ refItem.block = 'blkMaster'
+ refItem.source = source
- self.__addToSources (source, table, {'prequery': 'Y'})
+ self.__addToSources (source, table, {'prequery': 'Y'})
- # label widgets need a detail-source connected to the master as well
- # as an additional block bound to the detail-source
- elif refItem.style == 'label':
- source = "dtsLookup%s%s" % (item.dbField, table)
- block = "blkLookup%s%s" % (item.dbField, table)
- refItem.block = block
- self.__addToBlocks (block, source, refItem)
- self.__addToSources (source, table, {'master': 'dtsMaster',
- 'masterlink': item.dbField, 'detaillink': 'gnue_id'})
-
-
-
# ---------------------------------------------------------------------------
# Add/Update a datasource
# ---------------------------------------------------------------------------
@@ -253,13 +240,12 @@
else:
for refItem in field.reference.properties:
- if refItem.style == 'dropdown' or refItem.style is None:
- fDef = {'name' : refItem.fieldName,
- 'field' : field.dbField,
- 'fk_key' : 'gnue_id',
- 'fk_source' : refItem.source,
- 'fk_description': refItem.dbField}
- fCode.extend (self.__xml ('field', fDef))
+ fDef = {'name' : refItem.fieldName,
+ 'field' : field.dbField,
+ 'fk_key' : 'gnue_id',
+ 'fk_source' : refItem.source,
+ 'fk_description': refItem.dbField}
+ fCode.extend (self.__xml ('field', fDef))
bDef = {'name' : blockName,
'datasource': block ['source'],
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- r6700 - trunk/gnue-appserver/src/generator,
johannes <=