Skip to content

Commit 28ac684

Browse files
committed
[REF] continue to refactor the snippet using the new syntaxe
1 parent 5f93cd8 commit 28ac684

File tree

2 files changed

+94
-112
lines changed

2 files changed

+94
-112
lines changed

UltiSnips/python.snippets

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ snippet fint "integer"
109109
endsnippet
110110

111111
snippet ffl "float"
112-
'${1:fieldname}': fields.float('${2:Label}', digits_compute=dp.get_precision('${3:PrecisionName}'), ${5}help='${4:Help note}'),${6}
112+
${1:fieldname} = fields.float(digits_compute=dp.get_precision('${2:PrecisionName}')${3})${4}
113113
endsnippet
114114

115115
snippet fbo "boolean"
@@ -144,7 +144,9 @@ ${1:fieldname}_id = fields.Many2one(
144144
endsnippet
145145

146146
snippet fm2m "many2many"
147-
'${1:fieldname}_ids': fields.many2many('${2:ObjectName}', '${3:TableRel}', '${4:src_id}', '${5:dst_id}', '${6:Label}', ${8}help='${7:Help note}'),${9}
147+
${1:fieldname}_ids = fields.Many2many(
148+
comodel_name='${2:ObjectName}',
149+
string='`!p snip.rv=format_description(t[1])`'${3})${4}
148150
endsnippet
149151

150152
snippet fo2m "one2many"
@@ -160,7 +162,7 @@ snippet fpr "property"
160162
endsnippet
161163

162164
snippet ftx "text"
163-
'${1:fieldname}': fields.text('${2:Label}', ${4}help='${3:Help note}'),${5}
165+
${1:fieldname} = fields.Text(${2})${3}
164166
endsnippet
165167

166168
snippet fbin "binary"

UltiSnips/xml.snippets

Lines changed: 89 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -221,14 +221,14 @@ snippet form
221221
endsnippet
222222

223223
snippet menuitem "Action"
224-
<menuitem id="menu_${1:ir_model_data}"
224+
<menuitem id="menu_${1:ir_model_data}"
225225
parent="menu_${2:menu_parent}"
226226
sequence="${3:20}"
227227
action="action_${4:Action}"/>
228228
endsnippet
229229

230230
snippet menuitem "Name"
231-
<menuitem id="menu_${1:ir_model_data}"
231+
<menuitem id="menu_${1:ir_model_data}"
232232
parent="menu_${2:menu_parent}"
233233
sequence="${3:20}"
234234
name="${4:Label}"/>
@@ -244,7 +244,7 @@ snippet menuitem "Server Action"
244244

245245
<menuitem name="$2"
246246
action="action_$1"
247-
id="menu_$1"
247+
id="menu_$1"
248248
parent="base.menu_config"
249249
type="server" icon="STOCK_EXECUTE" sequence="100" />
250250
endsnippet
@@ -336,193 +336,173 @@ snippet iview
336336
</record>
337337
endsnippet
338338

339-
snippet view "form"
340-
<record id="view_${1:model}_form" model="ir.ui.view">
341-
<field name="model">${2:Model}</field>
339+
snippet view "view"
340+
<record id="`!p snip.rv=format_snake(t[1])`_view_${2:form}" model="ir.ui.view">
341+
<field name="model">${1:model}</field>
342342
<field name="arch" type="xml">
343-
<form string="${3:Label}">
344-
<field name="${4:name}" select="1"/>
345-
</form>
343+
<$2 string="${3:Label}">
344+
<field name="${4:name}"/>
345+
</$2>
346346
</field>
347347
</record>
348348
endsnippet
349349

350-
snippet view "tree"
351-
<record id="view_${1:model}_tree" model="ir.ui.view">
352-
<field name="model">${2:Model}</field>
350+
snippet view_tf "both (tree, form)"
351+
<record id="`!p snip.rv=format_snake(t[1])`_view_tree" model="ir.ui.view">
352+
<field name="model">${1:model}</field>
353353
<field name="arch" type="xml">
354-
<tree string="${3:Label}">
355-
<field name="${4:name}"/>
356-
</tree>
354+
<tree string="${2:Label}">
355+
<field name="${3:name}"/>
356+
</tree>
357357
</field>
358358
</record>
359-
endsnippet
360359

361-
snippet view "search"
362-
<record id="view_${1:model}_search" model="ir.ui.view">
363-
<field name="model">${2:Model}</field>
360+
<record id="`!p snip.rv=format_snake(t[1])`_view_form" model="ir.ui.view">
361+
<field name="model">$1</field>
364362
<field name="arch" type="xml">
365-
<search string="${3:Label}">
366-
<field name="${4:name}" select="True"/>
367-
</search>
363+
<form string="$2">
364+
<field name="$3"/>
365+
</form>
368366
</field>
369367
</record>
370368
endsnippet
371369

372-
snippet view "both (tree, form)"
373-
<record id="view_${1:model}_tree" model="ir.ui.view">
374-
<field name="model">${2:Model}</field>
375-
<field name="arch" type="xml">
376-
<tree string="${3:Label}">
377-
<field name="${4:name}"/>
378-
</tree>
379-
</field>
380-
</record>
381-
382-
<record id="view_$1_form" model="ir.ui.view">
383-
<field name="model">$2</field>
370+
snippet view_tfs "both (tree, form, search)"
371+
<record id="`!p snip.rv=format_snake(t[1])`_view_tree" model="ir.ui.view">
372+
<field name="model">${1:model}</field>
384373
<field name="arch" type="xml">
385-
<form string="$3">
386-
<field name="$4" select="1"/>
387-
</form>
374+
<tree string="${2:Label}">
375+
<field name="${3:name}"/>
376+
</tree>
388377
</field>
389378
</record>
390-
endsnippet
391379

392-
snippet view "both (tree, form, search)"
393-
<record id="view_${1:model}_tree" model="ir.ui.view">
394-
<field name="model">${2:Model}</field>
380+
<record id="`!p snip.rv=format_snake(t[1])`_view_form" model="ir.ui.view">
381+
<field name="model">$1</field>
395382
<field name="arch" type="xml">
396-
<tree string="${3:Label}">
397-
<field name="${4:name}"/>
398-
</tree>
383+
<form string="$2">
384+
<field name="$3"/>
385+
</form>
399386
</field>
400387
</record>
401388

402-
<record id="view_$1_form" model="ir.ui.view">
403-
<field name="model">$2</field>
404-
<field name="arch" type="xml">
405-
<form string="$3">
406-
<field name="$4" select="1"/>
407-
</form>
408-
</field>
409-
</record>
410-
<record id="view_$1_search" model="ir.ui.view">
411-
<field name="model">$2</field>
389+
<record id="`!p snip.rv=format_snake(t[1])`_view_search" model="ir.ui.view">
390+
<field name="model">$1</field>
412391
<field name="arch" type="xml">
413-
<search string="$3">
414-
<field name="$4" select="True"/>
415-
</search>
392+
<search string="$2">
393+
<field name="$3"/>
394+
</search>
416395
</field>
417396
</record>
418397
endsnippet
419398

420-
snippet view "both (tree, form) + Action + Menu"
421-
<record id="view_${1:model}_tree" model="ir.ui.view">
422-
<field name="model">${2:Model}</field>
399+
snippet view_tfa "both (tree, form) + Action + Menu"
400+
<record id="`!p snip.rv=format_snake(t[1])`_view_tree" model="ir.ui.view">
401+
<field name="model">${1:model}</field>
423402
<field name="arch" type="xml">
424-
<tree string="${3:Label}">
425-
<field name="${4:name}"/>
426-
</tree>
403+
<tree string="${2:Label}">
404+
<field name="${3:name}"/>
405+
</tree>
427406
</field>
428407
</record>
429408

430-
<record id="view_$1_form" model="ir.ui.view">
431-
<field name="model">$2</field>
409+
<record id="`!p snip.rv=format_snake(t[1])`_view_form" model="ir.ui.view">
410+
<field name="model">$1</field>
432411
<field name="arch" type="xml">
433-
<form string="$3">
434-
<field name="$4" select="1"/>
435-
</form>
412+
<form string="$2">
413+
<field name="$3"/>
414+
</form>
436415
</field>
437416
</record>
438417

439-
<record model="ir.actions.act_window" id="act_open_$1_view">
440-
<field name="name">$3</field>
418+
<record model="ir.actions.act_window" id="act_open_`!p snip.rv=format_snake(t[1])`_view">
419+
<field name="name">$2</field>
441420
<field name="type">ir.actions.act_window</field>
442-
<field name="res_model">$2</field>
421+
<field name="res_model">$1</field>
443422
<field name="view_type">form</field>
444423
<field name="view_mode">tree,form</field>
445424
<field name="domain">[]</field>
446425
<field name="context">{}</field>
447426
</record>
448427

449-
<record model="ir.actions.act_window.view" id="act_open_$1_view_form">
450-
<field name="act_window_id" ref="act_open_$1_view"/>
428+
<record model="ir.actions.act_window.view" id="act_open_`!p snip.rv=format_snake(t[1])`_view_form">
429+
<field name="act_window_id" ref="act_open_`!p snip.rv=format_snake(t[1])`_view"/>
451430
<field name="sequence" eval="20"/>
452431
<field name="view_mode">form</field>
453-
<field name="view_id" ref="view_$1_form"/>
432+
<field name="view_id" ref="`!p snip.rv=format_snake(t[1])`_view_form"/>
454433
</record>
455434

456-
<record model="ir.actions.act_window.view" id="act_open_$1_view_tree">
457-
<field name="act_window_id" ref="act_open_$1_view"/>
435+
<record model="ir.actions.act_window.view" id="act_open_`!p snip.rv=format_snake(t[1])`_view_tree">
436+
<field name="act_window_id" ref="act_open_`!p snip.rv=format_snake(t[1])`_view"/>
458437
<field name="sequence" eval="10"/>
459438
<field name="view_mode">tree</field>
460-
<field name="view_id" ref="view_$1_tree"/>
439+
<field name="view_id" ref="`!p snip.rv=format_snake(t[1])`_view_tree"/>
461440
</record>
462441

463-
<menuitem id="menu_$1"
464-
parent="${5:module.xmlid}"
442+
<menuitem id="menu_`!p snip.rv=format_snake(t[1])`"
443+
parent="${4:module.xmlid}"
465444
sequence="20"
466-
action="act_open_$1_view"/>
445+
action="act_open_`!p snip.rv=format_snake(t[1])`_view"/>
467446
endsnippet
468447

469-
snippet view "both (tree, form, search) + Action + Menu"
470-
<record id="view_${1:model}_tree" model="ir.ui.view">
471-
<field name="model">${2:Model}</field>
448+
449+
snippet view_tfsa "both (tree, form, search) + Action + Menu"
450+
<record id="`!p snip.rv=format_snake(t[1])`_view_tree" model="ir.ui.view">
451+
<field name="model">${1:model}</field>
472452
<field name="arch" type="xml">
473-
<tree string="${3:Label}">
474-
<field name="${4:name}"/>
475-
</tree>
453+
<tree string="${2:Label}">
454+
<field name="${3:name}"/>
455+
</tree>
476456
</field>
477457
</record>
478458

479-
<record id="view_$1_form" model="ir.ui.view">
480-
<field name="model">$2</field>
459+
<record id="`!p snip.rv=format_snake(t[1])`_view_form" model="ir.ui.view">
460+
<field name="model">$1</field>
481461
<field name="arch" type="xml">
482-
<form string="$3">
483-
<field name="$4" select="1"/>
484-
</form>
462+
<form string="$2">
463+
<field name="$3"/>
464+
</form>
485465
</field>
486466
</record>
487467

488-
<record id="view_$1_search" model="ir.ui.view">
489-
<field name="model">$2</field>
468+
<record id="`!p snip.rv=format_snake(t[1])`_view_search" model="ir.ui.view">
469+
<field name="model">$1</field>
490470
<field name="arch" type="xml">
491-
<search string="$3">
492-
<field name="$4" select="True"/>
493-
</search>
471+
<search string="$2">
472+
<field name="$3"/>
473+
</search>
494474
</field>
495475
</record>
496476

497-
<record model="ir.actions.act_window" id="act_open_$1_view">
498-
<field name="name">$3</field>
477+
<record model="ir.actions.act_window" id="act_open_`!p snip.rv=format_snake(t[1])`_view">
478+
<field name="name">$2</field>
499479
<field name="type">ir.actions.act_window</field>
500-
<field name="res_model">$2</field>
480+
<field name="res_model">$1</field>
501481
<field name="view_type">form</field>
502482
<field name="view_mode">tree,form</field>
503-
<field name="search_view_id" ref="view_$1_search"/>
483+
<field name="search_view_id" ref="`!p snip.rv=format_snake(t[1])`_view_search"/>
504484
<field name="domain">[]</field>
505485
<field name="context">{}</field>
506486
</record>
507487

508-
<record model="ir.actions.act_window.view" id="act_open_$1_view_form">
509-
<field name="act_window_id" ref="act_open_$1_view"/>
488+
<record model="ir.actions.act_window.view" id="act_open_`!p snip.rv=format_snake(t[1])`_view_form">
489+
<field name="act_window_id" ref="act_open_`!p snip.rv=format_snake(t[1])`_view"/>
510490
<field name="sequence" eval="20"/>
511491
<field name="view_mode">form</field>
512-
<field name="view_id" ref="view_$1_form"/>
492+
<field name="view_id" ref="`!p snip.rv=format_snake(t[1])`_view_form"/>
513493
</record>
514494

515-
<record model="ir.actions.act_window.view" id="act_open_$1_view_tree">
516-
<field name="act_window_id" ref="act_open_$1_view"/>
495+
<record model="ir.actions.act_window.view" id="act_open_`!p snip.rv=format_snake(t[1])`_view_tree">
496+
<field name="act_window_id" ref="act_open_`!p snip.rv=format_snake(t[1])`_view"/>
517497
<field name="sequence" eval="10"/>
518498
<field name="view_mode">tree</field>
519-
<field name="view_id" ref="view_$1_tree"/>
499+
<field name="view_id" ref="`!p snip.rv=format_snake(t[1])`_view_tree"/>
520500
</record>
521501

522-
<menuitem id="menu_$1"
523-
parent="${5:module.xmlid}"
502+
<menuitem id="menu_`!p snip.rv=format_snake(t[1])`"
503+
parent="${4:module.xmlid}"
524504
sequence="20"
525-
action="act_open_$1_view"/>
505+
action="act_open_`!p snip.rv=format_snake(t[1])`_view"/>
526506
endsnippet
527507

528508
snippet act_window

0 commit comments

Comments
 (0)