bug fix for create/edit resource dialog; activated ppt and xls full-text indexing

git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@1627 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
helmutm 2007-03-08 08:14:34 +00:00
parent 0c6d0a4102
commit 31ff35de3c
3 changed files with 18 additions and 2 deletions

View file

@ -101,6 +101,10 @@ class ObjectForm(NodeView):
def defaultPredicate(self): def defaultPredicate(self):
return self.loopsRoot.getConceptManager().getDefaultPredicate() return self.loopsRoot.getConceptManager().getDefaultPredicate()
@Lazy
def defaultPredicateUid(self):
return util.getUidForObject(self.defaultPredicate)
@Lazy @Lazy
def typeManager(self): def typeManager(self):
return ITypeManager(self.context) return ITypeManager(self.context)
@ -115,7 +119,7 @@ class ObjectForm(NodeView):
def conceptsForType(self, token): def conceptsForType(self, token):
noSelection = dict(token='none', title=u'not selected') noSelection = dict(token='none', title=u'not selected')
result = sorted(ConceptQuery(self).query(type=token), key=lambda x: x.title) result = sorted(ConceptQuery(self).query(type=token), key=lambda x: x.title)
predicateUid = util.getUidForObject(self.defaultPredicate) predicateUid = self.defaultPredicateUid
return ([noSelection] + return ([noSelection] +
[dict(title=o.title, [dict(title=o.title,
token='%s:%s' % (util.getUidForObject(o), predicateUid)) token='%s:%s' % (util.getUidForObject(o), predicateUid))

View file

@ -152,7 +152,7 @@
<td> <td>
<input type="hidden" <input type="hidden"
id="concept.search.predicate" id="concept.search.predicate"
tal:attributes="value view/defaultPredicate" /> tal:attributes="value view/defaultPredicateUid" />
<input dojoType="comboBox" mode="remote" autoComplete="False" <input dojoType="comboBox" mode="remote" autoComplete="False"
name="concept.search.text" id="concept.search.text" name="concept.search.text" id="concept.search.text"
tal:attributes="dataUrl tal:attributes="dataUrl

View file

@ -352,6 +352,8 @@
<adapter factory="loops.target.ConceptProxy" <adapter factory="loops.target.ConceptProxy"
permission="zope.ManageContent" /> permission="zope.ManageContent" />
<!-- text conversions, e.g. for full-text indexing -->
<adapter for="loops.interfaces.IFile" <adapter for="loops.interfaces.IFile"
provides="cybertools.text.interfaces.ITextTransform" provides="cybertools.text.interfaces.ITextTransform"
name="application/pdf" name="application/pdf"
@ -362,6 +364,16 @@
name="application/msword" name="application/msword"
factory="cybertools.text.doc.DocTransform" /> factory="cybertools.text.doc.DocTransform" />
<adapter for="loops.interfaces.IFile"
provides="cybertools.text.interfaces.ITextTransform"
name="application/vnd.ms-powerpoint"
factory="cybertools.text.ppt.PptTransform" />
<adapter for="loops.interfaces.IFile"
provides="cybertools.text.interfaces.ITextTransform"
name="application/vnd.ms-excel"
factory="cybertools.text.xls.XlsTransform" />
<!-- utilities --> <!-- utilities -->
<utility <utility