Merge lp:~syleam/vim-openerp/xml_colors_snippet_fix into lp:vim-openerp

Proposed by Sylvain Garancher
Status: Merged
Merged at revision: 100
Proposed branch: lp:~syleam/vim-openerp/xml_colors_snippet_fix
Merge into: lp:vim-openerp
Diff against target: 32 lines (+4/-4)
1 file modified
vim/snippets/xml.snippets (+4/-4)
To merge this branch: bzr merge lp:~syleam/vim-openerp/xml_colors_snippet_fix
Reviewer Review Type Date Requested Status
Team Pending
Review via email: mp+86929@code.launchpad.net

Description of the change

Fixed separator in "colors" XML snippet.

To post a comment you must log in.
101. By Sylvain Garancher

[FIX] Fixed wizard snippets

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'vim/snippets/xml.snippets'
2--- vim/snippets/xml.snippets 2011-12-22 14:55:50 +0000
3+++ vim/snippets/xml.snippets 2011-12-27 10:48:23 +0000
4@@ -91,7 +91,7 @@
5 snippet col
6 col="4"
7 snippet colors
8- colors="${1:grey}:${2:state}${3:==}'${4:draft}'${5:,}"
9+ colors="${1:grey}:${2:state}${3:==}'${4:draft}'${5:;}"
10 snippet editable top
11 editable="top"
12 snippet editable bottom
13@@ -154,8 +154,8 @@
14 </record>
15
16 <menuitem id="menu_$1_wizard"
17- parent="menu_${2:menu_parent}"
18- sequence="${3:20}"
19+ parent="menu_${6:menu_parent}"
20+ sequence="${7:20}"
21 action="action_$1_view"/>
22 snippet wizard osv_memory toolbar
23 <record id="view_${1:model}_form" model="ir.ui.view">
24@@ -186,7 +186,7 @@
25 <field name="object" eval="1"/>
26 <field name="key">action</field>
27 <field name="key2">client_action_multi</field>
28- <field name="model">${2:Model to launch wizard}</field>
29+ <field name="model">${5:Model to launch wizard}</field>
30 <field name="value" eval="'ir.actions.act_window,' + str(ref('action_$1_view'))" />
31 </record>
32 snippet view form