From ba0d6ac4c5486892058a503f701ebf84b24d7a30 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 17:01:46 +0530 Subject: [PATCH 1/7] [IMP] bzr revid: apa@tinyerp.com-20120404113146-ls123w7pp1uvokzs --- addons/project/project_view.xml | 2 +- addons/project_issue/project_issue_view.xml | 2 +- addons/project_long_term/project_long_term_view.xml | 2 +- addons/project_timesheet/project_timesheet_view.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 2d08757a167..728aea70456 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -196,7 +196,7 @@

- +

diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index c8ef4913c81..618dccea705 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -392,7 +392,7 @@ - + diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index c850ee27c43..84995f0c82f 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -123,7 +123,7 @@ - + diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 8e49a19cf0f..5f425d40ea7 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -39,7 +39,7 @@ - + From 9cee7d8b8e3fcc63a7d86df535173bc2b868bb35 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 17:54:35 +0530 Subject: [PATCH 2/7] [IMP] bzr revid: apa@tinyerp.com-20120404122435-321j5dapi882s830 --- addons/project/static/src/js/project.js | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 8ce27661788..eb69002d28e 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,16 +1,14 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { - self = this - self._super() - if(this.view.dataset.model == 'project.project') { - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - $('.dropdown-toggle').dropdown(); - } + self = this; + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.dropdown-toggle').dropdown(); + self._super(); } }); } From 9c0f7a28360b04c831583c7279d4853bc36c4982 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 18:01:05 +0530 Subject: [PATCH 3/7] [IMP] bzr revid: apa@tinyerp.com-20120404123105-oe7jqrs7ym2uy2r7 --- addons/project/static/src/js/project.js | 14 ++++++++------ .../project_timesheet/project_timesheet_view.xml | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index eb69002d28e..e23e873a05f 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -2,12 +2,14 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { self = this; - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - $('.dropdown-toggle').dropdown(); + if(this.view.dataset.model == 'project.project') { + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.dropdown-toggle').dropdown(); + } self._super(); } }); diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 5f425d40ea7..ae40cc1b9d8 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -39,7 +39,7 @@ - + From 0f4e225260ec16abeada70e15b5bb5924fc2b763 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 18:40:16 +0530 Subject: [PATCH 4/7] [IMP] bzr revid: apa@tinyerp.com-20120404131016-hnqqpeude9893co3 --- addons/project/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index eb55e552259..488a1c2ee70 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -29,7 +29,7 @@ "sequence": 8, 'complexity': "easy", "images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"], - "depends": ["base_setup", "product", "analytic", "board", "mail", "resource"], + "depends": ["base_setup", "product", "analytic", "board", "mail", "resource","web_kanban"], "description": """ Project management module tracks multi-level projects, tasks, work done on tasks, eso. ====================================================================================== From d81e6c2c531f26b364f5057607bbc8a49e3b9601 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 18:43:30 +0530 Subject: [PATCH 5/7] [IMP] bzr revid: apa@tinyerp.com-20120404131330-w2kzw1tz2gdh407b --- addons/project/static/src/js/project.js | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index e23e873a05f..1a444441016 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,16 +1,13 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { - self = this; - if(this.view.dataset.model == 'project.project') { - $('.oe_project_kanban_vignette').mouseover(function() { - return $(this).find('.oe_project_kanban_action').show(); - }).mouseout(function() { - return $(this).find('.oe_project_kanban_action').hide(); - }); - $('.dropdown-toggle').dropdown(); - } - self._super(); + $('.oe_project_kanban_vignette').mouseover(function() { + return $(this).find('.oe_project_kanban_action').show(); + }).mouseout(function() { + return $(this).find('.oe_project_kanban_action').hide(); + }); + $('.dropdown-toggle').dropdown(); + this._super(); } }); } From 47811aeb883d679572981775e53fc92600283775 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 18:46:39 +0530 Subject: [PATCH 6/7] [IMP] bzr revid: apa@tinyerp.com-20120404131639-cmaibsfn7wj2kkx5 --- addons/project/static/src/js/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 1a444441016..ea30b556f46 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,12 +1,12 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { + $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_vignette').mouseover(function() { return $(this).find('.oe_project_kanban_action').show(); }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - $('.dropdown-toggle').dropdown(); this._super(); } }); From 161633386248bfeab3c09dd97061564fc9f22688 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Thu, 5 Apr 2012 13:01:08 +0530 Subject: [PATCH 7/7] [IMP] bzr revid: apa@tinyerp.com-20120405073108-yhlqao1nrm3casck --- addons/project/project_view.xml | 9 ++++----- addons/project/static/src/js/project.js | 13 ++++++++++++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 728aea70456..456c9c33c42 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -216,18 +216,17 @@ - - + - +

- + - + diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index ea30b556f46..6fcb9586222 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,13 +1,24 @@ openerp.project = function(openerp) { openerp.web_kanban.ProjectKanban = openerp.web_kanban.KanbanRecord.include({ bind_events: function() { + self = this; + self._super(); $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_vignette').mouseover(function() { return $(this).find('.oe_project_kanban_action').show(); }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); - this._super(); + _.each($('.oe_project_kanban_vignette'),function(record){ + _.each(record.getElementsByTagName('img'),function(img){ + var domain = [['id','=',img.getAttribute("id")]]; + var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, domain); + dataset.read_slice([]).then(function(result){ + img.setAttribute("title",result[0].name) + }); + }); + + }); } }); }