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

[gen] Replaced old-style JS calls to 'askAjaxChunk' to calls to 'askAjax'.

Browse source
This commit is contained in:
Gaetan Delannay 2015-02-13 17:29:51 +01:00
parent 7c58582b9a
commit f842c0ce02
8 changed files with 141 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fields/__init__.py
View file

@ -114,8 +114,7 @@ class Field:
</x>
<!-- Any other field -->
<x if="(refField.name != 'title') and mayView">
<x var="zobj=tied.o; obj=tied; layoutType='cell';
innerRef=True; field=refField"
<x var="zobj=tied.o; obj=tied; layoutType='cell'; field=refField"
if="field.isShowable(zobj, 'result')">:field.pxRender</x>
</x>''')
@ -173,7 +172,7 @@ class Field:
</x>
<!-- Any other field -->
<x if="(field.name != 'title') and mayView">
<x var="layoutType='cell'; innerRef=True"
<x var="layoutType='cell'"
if="field.isShowable(zobj, 'result')">:field.pxRender</x>
</x>''')

4
fields/pod.py
View file

@ -92,10 +92,10 @@ class Pod(Field):
onmouseout=":'toggleDropdown(%s,%s)' % (q(dropdownId), q('none'))">
<x>:field.pxIcon</x>
<!-- The dropdown menu containing freeze actions -->
<table id=":dropdownId" class="dropdown" width="100px">
<table id=":dropdownId" class="dropdown" width="110px">
<!-- Unfreeze -->
<tr if="freezeAllowed and frozen" valign="top">
<td width="85px">
<td width="95px">
<a onclick=":'freezePod(%s,%s,%s,%s,%s)' % (q(uid), q(name), \
q(info.template), q(fmt), q('unfreeze'))"
class="smaller">:_('unfreezeField')</a>

76
fields/ref.py
View file

@ -83,26 +83,27 @@ class Ref(Field):
style=":'display:%s' % field.showActions" var2="layoutType='buttons'">
<!-- Arrows for moving objects up or down -->
<x if="(totalNumber &gt;1) and changeOrder and not inPickList \
and not inMenu"
var2="ajaxBaseCall=navBaseCall.replace('**v**','%s,%s,{%s:%s,%s:%s}'%\
(q(startNumber), q('doChangeOrder'), q('refObjectUid'),
q(tiedUid), q('move'), q('**v**')))">
and not inMenu">
<!-- Move to top -->
<img if="objectIndex &gt; 1" class="clickable"
src=":url('arrowsUp')" title=":_('move_top')"
onclick=":ajaxBaseCall.replace('**v**', 'top')"/>
onclick=":'askBunchMove(%s, %s, %s, %s)' % \
(q(ajaxHookId), q(startNumber), q(tiedUid), q('top'))"/>
<!-- Move to bottom -->
<img if="objectIndex &lt; (totalNumber-2)" class="clickable"
src=":url('arrowsDown')" title=":_('move_bottom')"
onclick=":ajaxBaseCall.replace('**v**', 'bottom')"/>
onclick=":'askBunchMove(%s, %s, %s, %s)' % \
(q(ajaxHookId), q(startNumber), q(tiedUid), q('bottom'))"/>
<!-- Move up -->
<img if="objectIndex &gt; 0" class="clickable" src=":url('arrowUp')"
title=":_('move_up')"
onclick=":ajaxBaseCall.replace('**v**', 'up')"/>
onclick=":'askBunchMove(%s, %s, %s, %s)' % \
(q(ajaxHookId), q(startNumber), q(tiedUid), q('up'))"/>
<!-- Move down -->
<img if="objectIndex &lt; (totalNumber-1)" class="clickable"
src=":url('arrowDown')" title=":_('move_down')"
onclick=":ajaxBaseCall.replace('**v**', 'down')"/>
onclick=":'askBunchMove(%s, %s, %s, %s)' % \
(q(ajaxHookId), q(startNumber), q(tiedUid), q('down'))"/>
</x>
<!-- Edit -->
<a if="not field.noForm and tied.o.mayEdit()"
@ -167,7 +168,7 @@ class Ref(Field):
css=ztool.getButtonCss(label)" class=":css"
value=":label" style=":url('add', bg=True)" title=":addLabel"
onclick=":field.getOnAdd(q, formName, addConfirmMsg, target, \
navBaseCall, startNumber)"/>
ajaxHookId, startNumber)"/>
</form>''')
# Displays the button allowing to select from a popup objects to be linked
@ -192,16 +193,15 @@ class Ref(Field):
# ref field according to the field that corresponds to this column.
pxSortIcons = Px('''
<x if="changeOrder and (len(objects) &gt; 1) and \
refField.isSortable(usage='ref')"
var2="ajaxBaseCall=navBaseCall.replace('**v**', '%s,%s,{%s:%s,%s:%s}'% \
(q(startNumber), q('sort'), q('sortKey'), q(refField.name), \
q('reverse'), q('**v**')))">
refField.isSortable(usage='ref')">
<img class="clickable" src=":url('sortAsc')"
var="js=ajaxBaseCall.replace('**v**', 'False')"
var="js='askBunchSortRef(%s, %s, %s, %s)' % \
(q(ajaxHookId), q(startNumber), q(refField.name), q('False'))"
onclick=":'askConfirm(%s,%s,%s)' % (q('script'), q(js,False), \
q(sortConfirm))"/>
<img class="clickable" src=":url('sortDesc')"
var="js=ajaxBaseCall.replace('**v**', 'True')"
var="js='askBunchSortRef(%s, %s, %s, %s)' % \
(q(ajaxHookId), q(startNumber), q(refField.name), q('True'))"
onclick=":'askConfirm(%s,%s,%s)' % (q('script'), q(js,False), \
q(sortConfirm))"/>
</x>''')
@ -223,16 +223,16 @@ class Ref(Field):
<div id=":dropdownId" class="dropdown">
<img class="clickable" src=":url('move')" id=":imgId"
title=":_('move_number')"
onclick=":navBaseCall.replace('**v**','%s,%s,{%s:%s,%s:this}' % \
(q(startNumber), q('doChangeOrder'), q('refObjectUid'),
q(tiedUid), q('move')))"/>
onclick=":'askBunchMove(%s, %s, %s, this)' % \
(q(ajaxHookId), q(startNumber), q(tiedUid))"/>
</div>
</div>''')
# PX that displays referred objects as a list
pxViewList = Px('''
<div id=":ajaxHookId">
<div if="not innerRef or mayAdd or mayLink" style="margin-bottom: 4px">
<div if="(layoutType == 'view') or mayAdd or mayLink"
style="margin-bottom: 4px">
<x if="field.collapsible and objects">:collapse.px</x>
<span if="subLabel" class="discreet">:_(subLabel)</span>
(<span class="discreet">:totalNumber</span>)
@ -253,13 +253,11 @@ class Ref(Field):
<x>:tool.pxNavigate</x>
<!-- No object is present -->
<p class="discreet"
if="not objects and (innerRef and mayAdd)">:_('no_ref')</p>
<p class="discreet" if="not objects and mayAdd">:_('no_ref')</p>
<!-- Linked objects -->
<table if="objects" id=":collapse.id" style=":collapse.style"
class=":not innerRef and 'list' or ''"
width=":innerRef and '100%' or field.layouts['view'].width"
<table if="objects" id=":collapse.id" style=":collapse.style" class="list"
width=":field.layouts['view'].width"
var2="columns=ztool.getColumnsSpecifiers(tiedClassName, \
field.getAttribute(obj, 'shownInfo'), dir);
currentNumber=0">
@ -267,7 +265,7 @@ class Ref(Field):
checkboxes=checkboxes, startNumber=startNumber, \
totalNumber=totalNumber, sourceId=zobj.id, \
refFieldName=field.name, inPickList=inPickList, \
numbered=numbered, navBaseCall=navBaseCall)</script>
numbered=numbered)</script>
<tr if="field.showHeaders">
<th if="not inPickList and numbered" width=":numbered"></th>
@ -300,8 +298,7 @@ class Ref(Field):
# PX that displays the list of objects the user may select to insert into a
# ref field with link="list".
pxViewPickList = Px('''
<x var="innerRef=False;
ajaxHookId=ajaxHookId|'%s_%s_poss' % (zobj.id, field.name);
<x var="ajaxHookId=ajaxHookId|'%s_%s_poss' % (zobj.id, field.name);
layoutType='view';
inMenu=False;
inPickList=True;
@ -321,8 +318,6 @@ class Ref(Field):
mayAdd=False;
mayLink=False;
mayUnlink=False;
navBaseCall='askRefField(%s,%s,%s,**v**)' % \
(q(ajaxHookId), q(zobj.absolute_url()), q(innerRef));
changeOrder=False;
changeNumber=False;
numbered=False;
@ -396,8 +391,7 @@ class Ref(Field):
# if, in the request, key "scope" is present and holds value "objs", the
# pick list (containing possible values) will not be rendered.
pxView = Px('''
<x var="innerRef=req.get('innerRef', False) == 'True';
ajaxHookId='%s_%s_objs' % (zobj.id, field.name);
<x var="ajaxHookId='%s_%s_objs' % (zobj.id, field.name);
layoutType=layoutType|'view';
render=field.getRenderMode(layoutType);
linkList=field.link == 'list';
@ -423,8 +417,6 @@ class Ref(Field):
mayUnlink=mayEdit and field.getAttribute(zobj, 'unlink');
addConfirmMsg=field.addConfirm and \
_('%s_addConfirm' % field.labelId) or '';
navBaseCall='askRefField(%s,%s,%s,**v**)' % \
(q(ajaxHookId), q(zobj.absolute_url()), q(innerRef));
changeOrder=mayEdit and field.getAttribute(zobj, 'changeOrder');
sortConfirm=changeOrder and _('sort_confirm');
numbered=field.isNumbered(zobj);
@ -960,7 +952,7 @@ class Ref(Field):
return res
return tied.o.getUrl(nav=''), '_self'
def getStartNumber(self, render, req, ajaxHookId):
def getStartNumber(self, render, req, hookId):
'''This method returns the index of the first linked object that must be
shown, or None if all linked objects must be shown at once (it
happens when p_render is "menus").'''
@ -968,7 +960,9 @@ class Ref(Field):
if render == 'menus': return
# When using 'list' (=default) render mode, the index of the first
# object to show is in the request.
return int(req.get('%s_startNumber' % ajaxHookId, 0))
key = '%s_startNumber' % hookId
nb = req.has_key(key) and req[key] or req.get('startNumber', 0)
return int(nb)
def getFormattedValue(self, obj, value, showChanges=False, language=None):
return value
@ -1197,14 +1191,13 @@ class Ref(Field):
obj.raiseUnauthorized("User can't write Ref field '%s' (%s)." % \
(self.name, may.msg))
def getOnAdd(self, q, formName, addConfirmMsg, target, navBaseCall,
startNumber):
def getOnAdd(self, q, formName, addConfirmMsg, target, hookId, startNumber):
'''Computes the JS code to execute when button "add" is clicked.'''
if self.noForm:
# Ajax-refresh the Ref with a special param to link a newly created
# object.
res = navBaseCall.replace('**v**',
"%d,'doCreateWithoutForm'" % startNumber)
res = "askAjax('%s', null, {'startNumber':'%d', " \
"'action':'doCreateWithoutForm'})" % (hookId, startNumber)
if self.addConfirm:
res = "askConfirm('script', %s, %s)" % \
(q(res, False), q(addConfirmMsg))
@ -1273,9 +1266,10 @@ class Ref(Field):
p_hook = the whole search result.'''
# Complete params with default parameters
params['ajaxHookId'] = hook;
params = sutils.getStringDict(params)
px = hook.endswith('_poss') and 'pxViewPickList' or 'pxView'
params['scope'] = hook.rsplit('_', 1)[-1]
px = (params['scope'] == 'poss') and 'pxViewPickList' or 'pxView'
px = '%s:%s' % (self.name, px)
params = sutils.getStringDict(params)
return "getAjaxHook('%s',true)['ajax']=new AjaxData('%s', " \
"'%s', %s, null, '%s')" % \
(hook, hook, px, params, zobj.absolute_url())

29
fields/search.py
View file

@ -24,6 +24,7 @@ from group import Group
# ------------------------------------------------------------------------------
class Search:
'''Used for specifying a search for a given class.'''
def __init__(self, name=None, group=None, sortBy='', sortOrder='asc',
maxPerPage=30, default=False, colspan=1, translated=None,
show=True, showActions=True, translatedDescr=None,
@ -158,6 +159,10 @@ class Search:
class UiSearch:
'''Instances of this class are generated on-the-fly for manipulating a
Search from the User Interface.'''
# Default values for request parameters defining query sort and filter
sortFilterDefaults = {'sortKey': '', 'sortOrder': 'asc',
'filterKey': '', 'filterValue': ''}
# Rendering a search
pxView = Px('''
<div class="portletSearch">
@ -240,8 +245,8 @@ class UiSearch:
# Render search results
pxResult = Px('''
<div var="ajaxHookId='queryResult';
className=req['className'];
searchName=req.get('search', '');
className=className|req['className'];
searchName=field.name|req.get('search', '');
uiSearch=field|ztool.getSearch(className, searchName, ui=True);
rootHookId=uiSearch.getRootHookId();
refInfo=ztool.getRefInfo();
@ -264,9 +269,6 @@ class UiSearch:
totalNumber=queryResult.totalNumber;
batchSize=queryResult.batchSize;
batchNumber=len(zobjects);
navBaseCall='askQueryResult(%s,%s,%s,%s,%s,**v**)' % \
(q(ajaxHookId), q(ztool.absolute_url()), q(className), \
q(searchName),int(inPopup));
showNewSearch=showNewSearch|True;
newSearchUrl='%s/search?className=%s%s' % \
(ztool.absolute_url(), className, refUrlPart);
@ -302,7 +304,7 @@ class UiSearch:
<span class="discreet">:uiSearch.translatedDescr</span><br/>
</td>
<!-- (Top) navigation -->
<td align=":dright" width="150px">:tool.pxNavigate</td>
<td align=":dright" width="200px">:tool.pxNavigate</td>
</tr>
</table>
@ -397,13 +399,20 @@ class UiSearch:
def getAjaxData(self, hook, ztool, **params):
'''Initializes an AjaxData object on the DOM node corresponding to
p_hook = the whole search result.'''
# Complete params with default parameters
# Complete params with default ones and optional filter/sort params. For
# performing a complete Ajax request, "className" and "searcName" are
# not needed because included in the PX name. But they are requested by
# sub-Ajax queries at the row level.
params['className'] = self.className
params['searchName'] = self.name
req = ztool.REQUEST
for param, default in UiSearch.sortFilterDefaults.iteritems():
params[param] = req.get(param, default)
# Convert params into a JS dict
params = sutils.getStringDict(params)
return "getAjaxHook('%s',true)['ajax']=new AjaxData('%s', " \
"'pxResult', %s, null, '%s')" % \
(hook, hook, params, ztool.absolute_url())
px = '%s:%s:pxResult' % (self.className, self.name)
return "getAjaxHook('%s',true)['ajax']=new AjaxData('%s', '%s', %s, " \
"null, '%s')" % (hook, hook, px, params, ztool.absolute_url())
def getAjaxDataRow(self, zobj, parentHook, **params):
'''Initializes an AjaxData object on the DOM node corresponding to