Commit Graph

129 Commits

Author SHA1 Message Date
Xavier Morel 724bbffc88 [FIX] Partially revert xmo@openerp.com-20130812074509-yopeb4pxtsads4d9
Change attempted to simplify branding distribution, but based node
branding on final view. To be able to rewrite, node branding must be
based on source views positions before applying inheritance.

Reintroduce manual generation of xpath in distribute_branding as
ElementTree.getpath() can't handle it.

Note: why isn't branding distribution performed during initial views
reading (e.g. inherit_branding)? Surely that would obviate the need
for special casing and manually creating paths no?

bzr revid: xmo@openerp.com-20130919130847-3t8zfpv9m9pcibg0
2013-09-19 15:08:47 +02:00
Xavier Morel 4b89b246a8 [FIX] distribute branding on t-if, t-for and t-att
bzr revid: xmo@openerp.com-20130917163708-u61ol5yqr3nrd9mu
2013-09-17 18:37:08 +02:00
Xavier Morel 47fac4836b [IMP] avoid using Element.attrib when unnecessary
bzr revid: xmo@openerp.com-20130917154505-4kf77rqjrg1bncvk
2013-09-17 17:45:05 +02:00
Xavier Morel 8159503eb1 [FIX] ensure we distribute branding only over actual element, not over e.g. comments
bzr revid: xmo@openerp.com-20130917154414-zdbv7861e9p6mdgi
2013-09-17 17:44:14 +02:00
Xavier Morel cbb5bf3c56 [MERGE] from parent
bzr revid: xmo@openerp.com-20130912141037-xqu3qpcyjph4xltu
2013-09-12 16:10:37 +02:00
Xavier Morel cc187b884b [IMP] re-enable XML check on view arch
bzr revid: xmo@openerp.com-20130912124334-skafqdt0hxna7frx
2013-09-12 14:43:34 +02:00
Xavier Morel bb14116785 [MERGE] from trunk
bzr revid: xmo@openerp.com-20130909095042-zf9p1qybf4f2b7gu
2013-09-09 11:50:42 +02:00
Xavier Morel a61e7b5efa [REM] view.save, move to website module where it belongs
bzr revid: xmo@openerp.com-20130906130905-86ul9efvjt6wo1j2
2013-09-06 15:09:05 +02:00
Xavier Morel 4f6af7f857 [REM] page attribute on views, doesn't belong in server
bzr revid: xmo@openerp.com-20130906091108-gk2biyqyi2xaekxl
2013-09-06 11:11:08 +02:00
Xavier Morel 3d42f63246 [IMP] remove unused imports
bzr revid: xmo@openerp.com-20130906091013-4smmete74hc9kpj1
2013-09-06 11:10:13 +02:00
Christophe Matthieu c36bfe173e [MERGE] from trunk
bzr revid: chm@openerp.com-20130828161130-641xsmbr8xm53xjx
2013-08-28 18:11:30 +02:00
Xavier Morel d8bf3892f3 [ADD] page attribute to views
This can be used to distinguish template views expected to be
available as web pages, and thus directly linkable. By opposition to
non-web views and template sections (reusables).

bzr revid: xmo@openerp.com-20130821121206-ebxsxrmyogcv7pnv
2013-08-21 14:12:06 +02:00
Christophe Simonis 208b697239 [MERGE] forward port of branch saas-1 up to revid 4899 chs@openerp.com-20130821094758-1ae0d1ml5obufzxv
bzr revid: odo@openerp.com-20130820160346-qcdy4kavgm5cb9t6
bzr revid: chs@openerp.com-20130821103139-zqqbrt8dq6iixrny
2013-08-21 12:31:39 +02:00
Olivier Dony fbd0758cb5 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5054 rev-id: odo@openerp.com-20130820091157-e5brwlxuhujf8rrd
bzr revid: chs@openerp.com-20130724085026-525l9apggc9yzx0h
bzr revid: odo@openerp.com-20130730140644-1xih0as5jsks4pub
bzr revid: dle@openerp.com-20130801130723-khgwjkglgsdn34fj
bzr revid: odo@openerp.com-20130820091638-jpbcmh653bpa29em
2013-08-20 11:16:38 +02:00
Xavier Morel de952ae352 [FIX] don't extract the root ir.ui.view as an embedded field
bzr revid: xmo@openerp.com-20130812121121-e3ch0b2u5j1u3ytp
2013-08-12 14:11:21 +02:00
Xavier Morel 212f088aea [MERGE] from trunk-website-al
bzr revid: xmo@openerp.com-20130812075650-sv5v98kuuifaog2z
2013-08-12 09:56:50 +02:00
Xavier Morel db5e36efa3 [FIX] rewrite ir_ui_view.save with new semantics, xpath fixes
since lxml provides built-in tools to generate the path for a node in a tree, don't reimplement it manually

bzr revid: xmo@openerp.com-20130812074509-yopeb4pxtsads4d9
2013-08-12 09:45:09 +02:00
Fabien Pinckaers 0c768d8703 [IMP] Added one2many symetry
bzr revid: fp@tinyerp.com-20130811102831-x5jvza7oi69ck2sx
2013-08-11 12:28:31 +02:00
Fabien Pinckaers 14e555d920 [IMP] support for inherit_option_id, <template> for inherited views
bzr revid: fp@tinyerp.com-20130810132449-tckikyrtqcawnzor
2013-08-10 15:24:49 +02:00
Fabien Meghazi a467b2d0ef [IMP] Qweb, use undefined handler
bzr revid: fme@openerp.com-20130808182218-3a9vb97gx49alyzz
2013-08-08 20:22:18 +02:00
Fabien Pinckaers b8f5817c8b [IMP] branding distribution in views
bzr revid: fp@openerp.com-20130804205215-0g8fvzy8aducrc3v
2013-08-04 22:52:15 +02:00
Xavier Morel bfd97c110f [FIX] typo in attribute name, don't distribute on t-field
bzr revid: xmo@openerp.com-20130802114606-ef0pddt2uhc4ghlj
2013-08-02 13:46:06 +02:00
Xavier Morel 4cc13f0625 [IMP] branding distribution
* don't serialize subtrees to string all the time
* don't add XML root and prefix by string munging
* extract trigger and moved branding attributes to constants
* reduce unnecessary nesting
* don't brand sub-elements of head

bzr revid: xmo@openerp.com-20130802104208-rirrsgtxp2lydd7m
2013-08-02 12:42:08 +02:00
Fabien Pinckaers 402907df8d [FIX] removed print statement that crashes on runbot ascii
bzr revid: fp@openerp.com-20130731191544-nbyrlxz2xzycammn
2013-07-31 21:15:44 +02:00
Fabien Meghazi 390c968e17 [FIX] fix t-ignore
bzr revid: fme@openerp.com-20130731150422-p48vmtulerqqa4b9
2013-07-31 17:04:22 +02:00
Fabien Meghazi a17606df0f [ADD] t-ignore branding opt-out
bzr revid: fme@openerp.com-20130731123603-y7dmh6rxr2lq9bcw
2013-07-31 14:36:03 +02:00
Fabien Meghazi 81ec0dbc1e [REM] Removed arch_file from ir.ui.view
bzr revid: fme@openerp.com-20130718170314-f6g6topynizgnwl6
2013-07-18 19:03:14 +02:00
Fabien Pinckaers 726b333148 [FIX] copy() on ir.ui.view
bzr revid: fp@tinyerp.com-20130702190301-oh7kj8iatbij3bm1
2013-07-02 21:03:01 +02:00
Christophe Simonis 0a5b3c9fd7 [FIX] views: correct distribute branding
bzr revid: chs@openerp.com-20130702181439-4ghn4ciz5efmzumk
2013-07-02 20:14:39 +02:00
Christophe Simonis 906da9b7ef [FIX] views: correct distribute branding
bzr revid: chs@openerp.com-20130702173648-96mxveli0eh1hzcj
2013-07-02 19:36:48 +02:00
Christophe Simonis 25388630cc [FIX] views: distribute branding only if not t-* attributes
bzr revid: chs@openerp.com-20130702164157-nsfq9xpswj0r56ry
2013-07-02 18:41:57 +02:00
Antony Lesuisse 2bac4d24c4 distribute branding take care of call and t
bzr revid: al@openerp.com-20130702160750-0yv4g6bcnh4v80rp
2013-07-02 18:07:50 +02:00
Antony Lesuisse d346320699 distribute branding for fields
bzr revid: al@openerp.com-20130702154446-7fpel212amdwmmjz
2013-07-02 17:44:46 +02:00
Antony Lesuisse 8f25c9bdae be xml in the db
bzr revid: al@openerp.com-20130702145605-nkzjall1msp6ggsa
2013-07-02 16:56:05 +02:00
Martin Trigaux 641c4fe784 ir_ui_view: parse using lxml.html instead of etree
bzr revid: mat@openerp.com-20130702125916-ahk6jkim08j2voam
2013-07-02 14:59:16 +02:00
Fabien Meghazi 1e303767ee m
bzr revid: fme@openerp.com-20130702124313-cuehsln93w7mzhqx
2013-07-02 14:43:13 +02:00
Martin Trigaux e372cbbce4 add t-field and t-record in rendering
bzr revid: mat@openerp.com-20130701155541-20plkar9a89qosij
2013-07-01 17:55:41 +02:00
Vo Minh Thu 7786d96095 [FIX] ir_ui_view: restore the inheritance mechanism for model-specific inheritance:
A view for a given model can inherit from a root view specified for
another model. When applying the modifying views to the root view,
only the views with the same model as the child view must be
considered. This patch restore that behavior.

bzr revid: vmt@openerp.com-20130701145334-ojp1plqjveym7cj7
2013-07-01 16:53:34 +02:00
Martin Trigaux a7b0a0379c add save method for javascript call
bzr revid: mat@openerp.com-20130701135313-absej6vq16aztrc8
2013-07-01 15:53:13 +02:00
Martin Trigaux b4e6c6e22d add count for inherit_branding
bzr revid: mat@openerp.com-20130701112309-hf3rarslfc2hhvr4
2013-07-01 13:23:09 +02:00
Antony Lesuisse df01c096ec branding temp fix for comment in xml
main company demo data

bzr revid: al@openerp.com-20130701002424-ojr6yzlr9m0xv6vi
2013-07-01 02:24:24 +02:00
Antony Lesuisse 05c9b607f8 fix rng validation, fields_view_get, qweb t-esc t-raw default
bzr revid: al@openerp.com-20130630213515-go5qr2dmo0xlazvr
2013-06-30 23:35:15 +02:00
Antony Lesuisse 54a41790a0 distribute branding xpath count
bzr revid: al@openerp.com-20130630015800-gln7j46ume1h536k
2013-06-30 03:58:00 +02:00
Antony Lesuisse 0963443691 correct distribution of branded tags
bzr revid: al@openerp.com-20130630010941-t922sz1smwi6jnni
2013-06-30 03:09:41 +02:00
Antony Lesuisse 4aa13cf591 correct inheritance branding
bzr revid: al@openerp.com-20130629234158-ttav8rypjrkxvctf
2013-06-30 01:41:58 +02:00
Antony Lesuisse 932efea388 untangle inheritance and postprocessing
bzr revid: al@openerp.com-20130629213516-pqcl6oz1g3o5tpgn
2013-06-29 23:35:16 +02:00
Martin Trigaux ad9f8a9fa1 [ADD] ir_ui_view: add tags to tree
bzr revid: mat@openerp.com-20130627171027-j3t7l8dadm8cohvx
2013-06-27 19:10:27 +02:00
Christophe Simonis d84c90b41d [FIX] views: correct type detection
bzr revid: chs@openerp.com-20130627153758-1yhk7d79is5c707r
2013-06-27 17:37:58 +02:00
Christophe Simonis 0ed83c3cec [FIX] view creation
bzr revid: chs@openerp.com-20130627143639-nxurinzeqqjqdiam
2013-06-27 16:36:39 +02:00
Christophe Simonis 4efebc6fd0 [FIX] ir.ui.view:render() can render view by xmlid/path
bzr revid: chs@openerp.com-20130627142506-gdmre0jj36v5inc0
2013-06-27 16:25:06 +02:00