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

minor fixes on versioning, probably due to changes in Python 2.7 and BlueBream

Browse source
This commit is contained in:
Helmut Merz 2014-06-03 11:09:35 +02:00
parent ca8f509748
commit da24ef6324
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
browser/form_macros.pt
View file

@ -264,9 +264,10 @@
<label style="display: inline" <label style="display: inline"
for="version.create"><span i18n:translate=""> for="version.create"><span i18n:translate="">
New version</span></label> New version</span></label>
<tal:level condition="python: len(list(view.versionLevels)) > 1">: <tal:level define="versionLevels python:list(view.versionLevels)"
condition="python: len(versionLevels) > 1">:
<select name="version.level"> <select name="version.level">
<option tal:repeat="level view/versionLevels" <option tal:repeat="level versionLevels"
i18n:translate="" i18n:translate=""
tal:attributes="value level/token" tal:attributes="value level/token"
tal:content="level/label" /> tal:content="level/label" />

4
versioning/versionable.py
View file

@ -168,7 +168,9 @@ class VersionableResource(object):
for name in ('data', 'externalAddress',): for name in ('data', 'externalAddress',):
attrs.remove(name) attrs.remove(name)
for attr in attrs: for attr in attrs:
setattr(adaptedObj, attr, getattr(adaptedContext, attr)) value = getattr(adaptedContext, attr)
if not callable(value):
setattr(adaptedObj, attr, value)
if IExternalFile.providedBy(adaptedObj): if IExternalFile.providedBy(adaptedObj):
adaptedObj.storageParams = adaptedContext.storageParams adaptedObj.storageParams = adaptedContext.storageParams
adaptedObj.storageName = adaptedContext.storageName adaptedObj.storageName = adaptedContext.storageName