From 5c5edd965f7db39e8657cde66a5d3393cda2c829 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 4 Apr 2012 14:11:44 +0530 Subject: [PATCH 1/7] [IMP]kannban view extends bzr revid: kbh@tinyerp.com-20120404084144-1t9fs970zbztpv7p --- addons/project/__openerp__.py | 2 +- addons/project/static/src/js/project.js | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 addons/project/static/src/js/project.js diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index f438102d599..eb55e552259 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -71,7 +71,7 @@ Dashboard for project members that includes: 'auto_install': False, 'application': True, 'css': ['static/src/css/project.css'], - 'js': ['static/src/js/dropdown.js'], + 'js': ['static/src/js/dropdown.js','static/src/js/project.js'], 'certificate': '0075116868317', } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js new file mode 100644 index 00000000000..ba9372ba937 --- /dev/null +++ b/addons/project/static/src/js/project.js @@ -0,0 +1,11 @@ +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') { + console.log("this"); + } + } + }); +} From 7a42d939a34a5252cbe0e94ecc82ba03524ad111 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 4 Apr 2012 14:25:52 +0530 Subject: [PATCH 2/7] [IMP]dropdown menu bzr revid: kbh@tinyerp.com-20120404085552-5ykkcivzdpowarnn --- addons/project/project_view.xml | 8 +------- addons/project/static/src/js/project.js | 9 ++++++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index f070082378c..db4f2a78c7e 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -175,15 +175,9 @@ -
  • - B + B
    • Edit...
    • Delete
      • diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index ba9372ba937..ae1ecbaaa91 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -4,7 +4,14 @@ openerp.project = function(openerp) { self = this self._super() if(this.view.dataset.model == 'project.project') { - console.log("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(); + }); + $('.oe_project_kanban_action').click(function(){ + $('.dropdown-toggle').dropdown(); + }) } } }); From ec5524fb8c4cf735fb0240c0ba0fc9f18090e643 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 14:26:22 +0530 Subject: [PATCH 3/7] [IMP] bzr revid: apa@tinyerp.com-20120404085622-ryzy25okk8x2ravu --- addons/project/project_view.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index f070082378c..932a9991956 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -221,13 +221,16 @@ + +

      + From 4aa31f8f13cc84fa59dab9184f4619a362c87f31 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 15:02:54 +0530 Subject: [PATCH 4/7] [IMP] bzr revid: apa@tinyerp.com-20120404093254-uuxban3da1sugg1w --- addons/project/static/src/css/project.css | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index b17094902ca..2fd4e2bd369 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -111,6 +111,7 @@ table { a.oe_project_kanban_action { position: absolute; right: 0; + display: none; } a.oe_project_kanban_action:hover { text-decoration: none; } From 419b4cb926cbc6b35bb5bb6ec568d5460e386bb1 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 15:05:39 +0530 Subject: [PATCH 5/7] [IMP] bzr revid: apa@tinyerp.com-20120404093539-6zvauic4qy4v11l6 --- addons/project/static/src/js/project.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index ae1ecbaaa91..1a5f3088a9a 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -9,6 +9,7 @@ openerp.project = function(openerp) { }).mouseout(function() { return $(this).find('.oe_project_kanban_action').hide(); }); + $('.dropdown-toggle').dropdown(); $('.oe_project_kanban_action').click(function(){ $('.dropdown-toggle').dropdown(); }) From a8f8ad68229b3ca0d8badac922f637dc3b3294e0 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 15:06:20 +0530 Subject: [PATCH 6/7] [IMP] bzr revid: apa@tinyerp.com-20120404093620-pspxexidgf2jy21d --- addons/project/static/src/js/project.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 1a5f3088a9a..8ce27661788 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -10,9 +10,6 @@ openerp.project = function(openerp) { return $(this).find('.oe_project_kanban_action').hide(); }); $('.dropdown-toggle').dropdown(); - $('.oe_project_kanban_action').click(function(){ - $('.dropdown-toggle').dropdown(); - }) } } }); From 1f520a1c6f5041a365977f936184b6908dc3f9a5 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Wed, 4 Apr 2012 15:11:51 +0530 Subject: [PATCH 7/7] [IMP] bzr revid: apa@tinyerp.com-20120404094151-9tsdlsylu33l8941 --- addons/project/project_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 27a79c242aa..c19624173e0 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -218,14 +218,14 @@ - +

      - +