From 9b447c025d4939d61e69acf1597191ce7af4f405 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Thu, 31 May 2012 19:02:28 +0200 Subject: [PATCH 001/152] search, shared filters bzr revid: mit@openerp.com-20120531170228-sbzxghl9vndntf4k --- addons/web/static/src/css/base.css | 25 ++++++++++++++++++++----- addons/web/static/src/css/base.sass | 25 +++++++++++++++++++++---- addons/web/static/src/js/search.js | 2 +- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index e2879011a72..5fec2078ef7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1485,14 +1485,12 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_opened form { display: block; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete { - position: absolute; - left: 4px; - top: 3px; -} .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete, .openerp .oe_searchview .oe_searchview_drawer .searchview_extended_delete_prop { + display: inline-block; width: 12px; height: 12px; + line-height: 12px; + padding: 1px; color: #8786b7; line-height: 8px; text-align: center; @@ -1508,6 +1506,23 @@ -webkit-border-radius: 2px; border-radius: 2px; } +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_delete { + display: none; + position: absolute; + bottom: 1px; + right: 4px; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_private:hover .oe_searchview_custom_delete, .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_public:hover .oe_searchview_custom_delete { + display: inline-block; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom_public:after { + content: ","; + font-family: "entypoRegular" !important; + font-size: 22px; + font-weight: 300 !important; + margin: 0 0 0 4px; + padding: 0; +} .openerp .oe_view_nocontent > img { float: left; margin: 1.5em; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index eda410aa6ca..3dd7c342f2f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1172,13 +1172,12 @@ $colour4: #8a89ba display: block // delete buttons - .oe_searchview_custom_delete - position: absolute - left: 4px - top: 3px .oe_searchview_custom_delete, .searchview_extended_delete_prop + display: inline-block width: 12px height: 12px + line-height: 12px + padding: 1px color: #8786b7 line-height: 8px text-align: center @@ -1190,6 +1189,24 @@ $colour4: #8a89ba background: #8786b7 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) @include radius(2px) + .oe_searchview_custom_delete + display: none + position: absolute + bottom: 1px + right: 4px + .oe_searchview_custom_private, .oe_searchview_custom_public + &:hover + .oe_searchview_custom_delete + display: inline-block + .oe_searchview_custom_public:after + content: "," + font-family: "entypoRegular" !important + font-size: 22px + font-weight: 300 !important + margin: 0 0 0 4px + padding: 0 + + // }}} // Views Common {{{ .oe_view_nocontent diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index f9e737471ae..85521a14651 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1571,7 +1571,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ $filter.remove(); }); }) - .prependTo($filter); + .appendTo($filter); } $filter.unbind('click').click(function () { From 53087f5639cd828e8068b068111893d31c27139e Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 4 Jun 2012 11:30:11 +0200 Subject: [PATCH 002/152] Customized partner view to have a cool kanban view bzr revid: nicolas.vanhoren@openerp.com-20120604093011-v9jl101arwk17h4i --- openerp/addons/base/res/res_partner_view.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml index 31e98bef43f..a683c8a4057 100644 --- a/openerp/addons/base/res/res_partner_view.xml +++ b/openerp/addons/base/res/res_partner_view.xml @@ -363,7 +363,7 @@ - + @@ -383,7 +383,8 @@ -
+
+ X
@@ -401,6 +402,7 @@ + From 9d13b9e60e3fef8eed0bfdff16d23499a26eeb62 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 4 Jun 2012 12:38:01 +0200 Subject: [PATCH 003/152] Switched members in project to m2m_kanban bzr revid: nicolas.vanhoren@openerp.com-20120604103801-zzdqoqim55ecwpkd --- addons/project/project_view.xml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index d5aff449816..8037abce643 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -64,11 +64,22 @@ - - + + - - + + +
+ X +
+
+ +
+
+
+ + + From d2252dba054941be0326c624347013e6967d5e13 Mon Sep 17 00:00:00 2001 From: Vo Minh Thu Date: Mon, 4 Jun 2012 18:01:24 +0200 Subject: [PATCH 004/152] [IMP] rng validation: remove call to rng validation, replace it with calls to fields_view_get. bzr revid: vmt@openerp.com-20120604160124-uz4q4aim6sl9wckm --- openerp/addons/base/ir/ir_ui_view.py | 20 +++++++++++++++++-- .../base/module/wizard/base_module_upgrade.py | 1 + openerp/addons/base/res/res_config.xml | 1 - 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 2baf988297f..a7614ab496c 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -74,10 +74,26 @@ class view(osv.osv): _order = "priority,name" def _check_xml(self, cr, uid, ids, context=None): + def root_view(record): + if not record.inherit_id: + return record + else: + parent = self.browse(cr, uid, record.inherit_id.id, context) + return root_view(parent) + def call_view(record): + try: + root = root_view(record) + self.pool.get(root.model).fields_view_get(cr, uid, view_id=root.id, view_type=root.type, context=context) + return True + except: + _logger.exception("Can't obtain view description for model: %s (view id: %s).", record.model, record.id) + return False for view in self.browse(cr, uid, ids, context): + return call_view(view) + + # TODO The following code should be executed (i.e. no early return above). + # TODO The view.rng file can be read only once! eview = etree.fromstring(view.arch.encode('utf8')) - if eview.get('layout') or eview.get('validate'): - continue frng = tools.file_open(os.path.join('base','rng','view.rng')) try: relaxng_doc = etree.parse(frng) diff --git a/openerp/addons/base/module/wizard/base_module_upgrade.py b/openerp/addons/base/module/wizard/base_module_upgrade.py index 3b7df0016bd..a9486a9a929 100644 --- a/openerp/addons/base/module/wizard/base_module_upgrade.py +++ b/openerp/addons/base/module/wizard/base_module_upgrade.py @@ -38,6 +38,7 @@ class base_module_upgrade(osv.osv_memory): if view_type != 'form': return res + context = {} if context is None else context record_id = context and context.get('active_id', False) or False active_model = context.get('active_model') if (not record_id) or (not active_model): diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml index 2da5dc32e8e..136b2e89a7c 100644 --- a/openerp/addons/base/res/res_config.xml +++ b/openerp/addons/base/res/res_config.xml @@ -41,7 +41,6 @@ -
+
+
- - - - - - - - - - - - - - - - - - - - -
- + + - - - - - + - - - + + + - + + + diff --git a/openerp/addons/base/res/res_config.xml b/openerp/addons/base/res/res_config.xml index 2da5dc32e8e..8abda1313aa 100644 --- a/openerp/addons/base/res/res_config.xml +++ b/openerp/addons/base/res/res_config.xml @@ -5,29 +5,15 @@ res.config form -
- - - - - - - - - - - - - - - -
+ + + - - - - - - - - - - - - - - - - -