cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into bbmaster

Browse source
This commit is contained in:
Helmut Merz 2012-07-08 18:54:05 +02:00
commit 3fdc16f5c5
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
external/element.py vendored
View file

@ -89,7 +89,8 @@ class ConceptElement(Element):
def execute(self, loader): def execute(self, loader):
type = loader.concepts[self['type']] type = loader.concepts[self['type']]
kw = dict((k, v) for k, v in self.items() kw = dict((k, v) for k, v in self.items()
if k not in self.posArgs) #if k not in self.posArgs)
if k not in ['name', 'type'])
self.object = loader.addConcept(self['name'], self['title'], type) self.object = loader.addConcept(self['name'], self['title'], type)
formState = self.getInstance().applyTemplate(data=kw, ignoreValidation=True) formState = self.getInstance().applyTemplate(data=kw, ignoreValidation=True)
# simple hack for resolving interface definition: # simple hack for resolving interface definition:
@ -97,7 +98,8 @@ class ConceptElement(Element):
if pi: if pi:
adapted(self.object).predicateInterface = resolve(pi) adapted(self.object).predicateInterface = resolve(pi)
def getInstance(self, omit=['title']): #def getInstance(self, omit=['title']):
def getInstance(self, omit=[]):
adObject = adapted(self.object) adObject = adapted(self.object)
schemaFactory = ISchemaFactory(adObject) schemaFactory = ISchemaFactory(adObject)
ti = IType(self.object).typeInterface or IConceptSchema ti = IType(self.object).typeInterface or IConceptSchema

6
table.py
View file

@ -31,6 +31,7 @@ from cybertools.composer.schema.factory import SchemaFactory
from cybertools.composer.schema.grid.interfaces import KeyTable from cybertools.composer.schema.grid.interfaces import KeyTable
from cybertools.composer.interfaces import IInstance from cybertools.composer.interfaces import IInstance
from loops.common import AdapterBase, adapted, baseObject from loops.common import AdapterBase, adapted, baseObject
from loops.external.element import Element
from loops.interfaces import IConcept, IConceptSchema, ILoopsAdapter from loops.interfaces import IConcept, IConceptSchema, ILoopsAdapter
from loops.type import TypeInterfaceSourceList from loops.type import TypeInterfaceSourceList
from loops import util from loops import util
@ -99,8 +100,9 @@ class DataTableSchemaFactory(SchemaFactory):
def __call__(self, interface, **kw): def __call__(self, interface, **kw):
schema = super(DataTableSchemaFactory, self).__call__(interface, **kw) schema = super(DataTableSchemaFactory, self).__call__(interface, **kw)
schema.fields.remove('columns') if not isinstance(kw.get('manager'), Element):
schema.fields.remove('viewName') schema.fields.remove('columns')
schema.fields.remove('viewName')
return schema return schema