evaluate subtype relations also for normal concepts (e.g. queries)
This commit is contained in:
parent
364a0c8c58
commit
f62a907590
3 changed files with 12 additions and 8 deletions
|
@ -387,8 +387,10 @@ class CreateConceptForm(CreateObjectForm):
|
|||
include.remove('subtype')
|
||||
parentType = self.target.conceptType
|
||||
subtypePred = self.conceptManager['issubtype']
|
||||
tconcepts = (self.target.getChildren([subtypePred]) +
|
||||
parentType.getChildren([subtypePred]))
|
||||
types = [dict(token=ConceptTypeInfo(t).token, title=t.title)
|
||||
for t in parentType.getChildren([subtypePred])]
|
||||
for t in tconcepts]
|
||||
if include or include is None:
|
||||
return util.KeywordVocabulary(types + self.listTypes(include, ('hidden',)))
|
||||
return util.KeywordVocabulary(types)
|
||||
|
|
|
@ -117,8 +117,8 @@ class NodeView(BaseView):
|
|||
break
|
||||
data.insert(1, dict(label=p.title,
|
||||
url=absoluteURL(p, self.request)))
|
||||
if self.virtualTarget:
|
||||
data.extend(self.virtualTarget.breadcrumbs())
|
||||
if self.virtualTarget:
|
||||
data.extend(self.virtualTarget.breadcrumbs())
|
||||
return data
|
||||
|
||||
def viewModes(self):
|
||||
|
|
|
@ -33,11 +33,13 @@
|
|||
<td style="white-space: nowrap; vertical-align: top; width: 10%"
|
||||
i18n:translate="">You are here:</td>
|
||||
<td>
|
||||
<span style="white-space: nowrap"
|
||||
tal:repeat="crumb crumbs">
|
||||
<a tal:attributes="href crumb/url"
|
||||
tal:content="crumb/label" />
|
||||
<span tal:condition="not:repeat/crumb/end"> > </span></span>
|
||||
<span>
|
||||
<span style="white-space: nowrap"
|
||||
tal:repeat="crumb crumbs">
|
||||
<a tal:attributes="href crumb/url"
|
||||
tal:content="crumb/label" />
|
||||
<tal:delimiter
|
||||
condition="not:repeat/crumb/end"> ></tal:delimiter></span> </span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
Loading…
Add table
Reference in a new issue