Merge lp:~therp-nl/therp-addons/6.1-web_mode_visibility_separator_use_override into lp:~therp-nl/therp-addons/6.1-web_mode_visibility_separator

[Holger Brunn (Therp)]

[Stefan Rijnhart (Opener) (stefan-opener)]

lgtm.

review: Approve

=== modified file 'web_mode_visibility_separator/__init__.py'
--- web_mode_visibility_separator/__init__.py	2013-05-16 09:33:02 +0000
+++ web_mode_visibility_separator/__init__.py	2013-10-15 15:16:18 +0000
@@ -1,1 +1,5 @@
-import model
+try:
+    from openerp.addons.override_import_xml_schema import overrides_view
+    overrides_view.append('web_mode_visibility_separator/view.rng.xsl')
+except:
+    pass
 
=== modified file 'web_mode_visibility_separator/__openerp__.py'
--- web_mode_visibility_separator/__openerp__.py	2013-05-16 09:33:02 +0000
+++ web_mode_visibility_separator/__openerp__.py	2013-10-15 15:16:18 +0000
@@ -24,7 +24,7 @@
     "version": "6.1.1.0r1",
     "author": "Therp BV",
     "category": "Tools",
-    "depends": ['web_mode_visibility'],
+    "depends": ['web_mode_visibility', 'override_import_xml_schema'],
     "description": """
 Use the following options keys on separator tags and other form widget
 to hide them in either page or form mode:
@@ -32,26 +32,6 @@
 - page_invisible
 - form_invisible
 
-Please note that you need to allow the use of the options dictionary
-on separators in openobject-server/openerp/addons/base/rng/view.rng,
-or you will get view validation errors in modules that try to use
-this functionality:
-
---- openerp/addons/base/rng/view.rng2012-02-13 10:17:58 +0000
-+++ openerp/addons/base/rng/view.rng2013-05-07 09:40:10 +0000
-@@ -442,6 +442,7 @@
-             <rng:optional><rng:attribute name="col"/></rng:optional>
-             <rng:optional><rng:attribute name="select"/></rng:optional>
-             <rng:optional><rng:attribute name="orientation"/></rng:optional>
-+            <rng:optional><rng:attribute name="options"/></rng:optional>
-             <rng:zeroOrMore>
-                 <rng:choice>
-                     <rng:ref name="separator"/>
-
-You do not need this module to simply hide fields. This can be
-done solely with the 'web_mode_visibility' module, without changes to the
-rng file.
-
 This module is compatible with OpenERP 6.1.
     """,
     'js': [
 
=== removed directory 'web_mode_visibility_separator/model'
=== removed file 'web_mode_visibility_separator/model/__init__.py'
--- web_mode_visibility_separator/model/__init__.py	2013-05-16 09:33:02 +0000
+++ web_mode_visibility_separator/model/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-import ir_ui_view
 
=== removed file 'web_mode_visibility_separator/model/ir_ui_view.py'
--- web_mode_visibility_separator/model/ir_ui_view.py	2013-05-16 09:33:02 +0000
+++ web_mode_visibility_separator/model/ir_ui_view.py	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    This module copyright (C) 2013 Therp BV (<http://therp.nl>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import os
-from lxml import etree
-from openerp.osv import orm
-from openerp.tools import file_open
-from openerp.tools.translate import _
-from openerp.modules import get_module_path
-
-class ir_ui_view(orm.Model):
-    _inherit = 'ir.ui.view'
-    
-    def _auto_init(self, cr, context=None):
-        """ Check for the necessary intervention in the rng file """
-        relaxng_doc = etree.parse(
-            file_open(os.path.join(
-                    get_module_path('base'),'rng','view.rng')))
-        if not relaxng_doc.xpath(
-                '//rng:define[@name="separator"]'
-                '/rng:element[@name="separator"]'
-                '/rng:optional'
-                '/rng:attribute[@name="options"]',
-                namespaces={'rng': 'http://relaxng.org/ns/structure/1.0'}):
-            raise orm.except_orm(
-                _("Installation error"),
-                _("Please adapt file 'view.rng' to allow the options attribute "
-                  "on separator elements"))
-        return super(ir_ui_view, self)._auto_init(cr, context=context)
 
=== added file 'web_mode_visibility_separator/view.rng.xsl'
--- web_mode_visibility_separator/view.rng.xsl	1970-01-01 00:00:00 +0000
+++ web_mode_visibility_separator/view.rng.xsl	2013-10-15 15:16:18 +0000
@@ -0,0 +1,15 @@
+<xsl:stylesheet version="1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:rng="http://relaxng.org/ns/structure/1.0">
+    <xsl:template match="@*|node()">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+        </xsl:copy>
+    </xsl:template>
+    <xsl:template match="rng:element[@name='separator']">
+        <xsl:copy>
+            <xsl:apply-templates select="@*|node()"/>
+            <rng:optional><rng:attribute name="options"/></rng:optional>
+        </xsl:copy>
+    </xsl:template>
+</xsl:stylesheet>