rattail/appypod-rattail
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[gen] Bugfixes.

Browse source
This commit is contained in:
Gaetan Delannay 2014-04-19 19:58:02 +02:00
parent ff7c300dd0
commit 2b1fc85512
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fields/__init__.py
View file

@ -70,7 +70,7 @@ class Field:
tagCss=tagCss|''; tagCss=tagCss|'';
tagCss=('%s %s' % (slaveCss, tagCss)).strip(); tagCss=('%s %s' % (slaveCss, tagCss)).strip();
zobj=zobj or ztool; zobj=zobj or ztool;
tagId='%s_%s' % (zobj.UID(), name); tagId='%s_%s' % (zobj.id, name);
tagName=field.master and 'slave' or ''; tagName=field.master and 'slave' or '';
layoutTarget=field">:tool.pxLayoutedObject</x>''') layoutTarget=field">:tool.pxLayoutedObject</x>''')

4
fields/ref.py
View file

@ -356,6 +356,7 @@ class Ref(Field):
<x var="innerRef=req.get('innerRef', False) == 'True'; <x var="innerRef=req.get('innerRef', False) == 'True';
ajaxHookId='%s_%s_objs' % (zobj.id, field.name); ajaxHookId='%s_%s_objs' % (zobj.id, field.name);
render=render|'list'; render=render|'list';
layoutType=layoutType|'view';
linkList=field.link == 'list'; linkList=field.link == 'list';
renderAll=req.get('scope') != 'objs'; renderAll=req.get('scope') != 'objs';
inPickList=False; inPickList=False;
@ -381,7 +382,8 @@ class Ref(Field):
numbered=field.isNumbered(zobj); numbered=field.isNumbered(zobj);
changeNumber=not inPickList and numbered and canWrite and \ changeNumber=not inPickList and numbered and canWrite and \
changeOrder and (totalNumber &gt; 3); changeOrder and (totalNumber &gt; 3);
checkboxesEnabled=field.getAttribute(zobj, 'checkboxes'); checkboxesEnabled=field.getAttribute(zobj, 'checkboxes') and \
(layoutType != 'cell');
checkboxes=checkboxesEnabled and (totalNumber &gt; 1); checkboxes=checkboxesEnabled and (totalNumber &gt; 1);
showSubTitles=req.get('showSubTitles', 'true') == 'true'"> showSubTitles=req.get('showSubTitles', 'true') == 'true'">
<!-- The definition of "atMostOneRef" above may sound strange: we <!-- The definition of "atMostOneRef" above may sound strange: we

2
gen/ui/appy.css
View file

@ -13,7 +13,7 @@ h5 { font-size: 10pt; margin:0; font-style: italic; font-weight: normal;
h6 { font-size: 9pt; margin:0; font-weight: bold } h6 { font-size: 9pt; margin:0; font-weight: bold }
a { text-decoration: none; color: #436976 } a { text-decoration: none; color: #436976 }
a:visited { color: #436976 } a:visited { color: #436976 }
table { font-size: 100%; border-spacing: 0px; border-collapse:collapse;} table { font-size: 100%; border-spacing: 0px; border-collapse:collapse }
form { margin: 0; padding: 0 } form { margin: 0; padding: 0 }
p { margin: 0 0 5px 0 } p { margin: 0 0 5px 0 }
acronym { cursor: help } acronym { cursor: help }