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

Merge branch 'master' of ssh://git.cy55.de/home/git/loops into bbmaster

Browse source
This commit is contained in:
hplattner 2012-03-15 12:41:25 +01:00
commit 65ce2d9779
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser/common.py
View file

@ -674,6 +674,8 @@ class BaseView(GenericView, I18NView):
@Lazy @Lazy
def xeditable(self): def xeditable(self):
if self.typeOptions('no_external_edit'):
return False
ct = getattr(self.context, 'contentType', '') ct = getattr(self.context, 'contentType', '')
if not ct or ct in ('application/pdf', 'application/x-pdf'): if not ct or ct in ('application/pdf', 'application/x-pdf'):
return False return False

4
browser/form.py
View file

@ -387,8 +387,10 @@ class CreateConceptForm(CreateObjectForm):
include.remove('subtype') include.remove('subtype')
parentType = self.target.conceptType parentType = self.target.conceptType
subtypePred = self.conceptManager['issubtype'] subtypePred = self.conceptManager['issubtype']
tconcepts = (self.target.getChildren([subtypePred]) +
parentType.getChildren([subtypePred]))
types = [dict(token=ConceptTypeInfo(t).token, title=t.title) 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: if include or include is None:
return util.KeywordVocabulary(types + self.listTypes(include, ('hidden',))) return util.KeywordVocabulary(types + self.listTypes(include, ('hidden',)))
return util.KeywordVocabulary(types) return util.KeywordVocabulary(types)

4
browser/node.py
View file

@ -117,8 +117,8 @@ class NodeView(BaseView):
break break
data.insert(1, dict(label=p.title, data.insert(1, dict(label=p.title,
url=absoluteURL(p, self.request))) url=absoluteURL(p, self.request)))
if self.virtualTarget: if self.virtualTarget:
data.extend(self.virtualTarget.breadcrumbs()) data.extend(self.virtualTarget.breadcrumbs())
return data return data
def viewModes(self): def viewModes(self):

3
browser/resource.py
View file

@ -207,7 +207,8 @@ class ResourceView(BaseView):
data = context.data data = context.data
if useAttachment: if useAttachment:
filename = adapted(self.context).localFilename or getName(self.context) filename = adapted(self.context).localFilename or getName(self.context)
filename = NameChooser(getParent(self.context)).normalizeName(filename) if not self.typeOptions('no_normalize_download_filename'):
filename = NameChooser(getParent(self.context)).normalizeName(filename)
response.setHeader('Content-Disposition', response.setHeader('Content-Disposition',
'attachment; filename=%s' % filename) 'attachment; filename=%s' % filename)
response.setHeader('Content-Length', len(data)) response.setHeader('Content-Length', len(data))

12
browser/skin/lobo/body.pt
View file

@ -33,11 +33,13 @@
<td style="white-space: nowrap; vertical-align: top; width: 10%" <td style="white-space: nowrap; vertical-align: top; width: 10%"
i18n:translate="">You are here:</td> i18n:translate="">You are here:</td>
<td> <td>
<span style="white-space: nowrap" <span>
tal:repeat="crumb crumbs"> <span style="white-space: nowrap"
<a tal:attributes="href crumb/url" tal:repeat="crumb crumbs">
tal:content="crumb/label" /> <a tal:attributes="href crumb/url"
<span tal:condition="not:repeat/crumb/end"> > </span></span> tal:content="crumb/label" />
<tal:delimiter
condition="not:repeat/crumb/end"> ></tal:delimiter></span> </span>
</td> </td>
</tr> </tr>
</table> </table>