From 344a48ab55e29e5bcef33273403da079cdf3c64f Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Fri, 15 Jul 2011 18:35:40 +0530 Subject: [PATCH 01/13] [FIX] Fixed DATA_ERROR, dhtmlx is not supported datetime formate, Then when render parent task it reduce the hours. bzr revid: sma@tinyerp.com-20110715130540-y7par5uca2xxmlpp --- addons/base_gantt/static/src/js/gantt.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index cf0ce449d60..6d8db18b5bd 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -246,7 +246,7 @@ init: function(view_manager, session, element_id, dataset, view_id) { for (i in all_events){ res = all_events[i]; if ((typeof(res['evt'][3])) == "object"){ - res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3]); + res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3], true); } k = res['evt'][0].toString().indexOf('_'); @@ -356,14 +356,14 @@ init: function(view_manager, session, element_id, dataset, view_id) { return dat; }, - hours_between: function(date1, date2) { + hours_between: function(date1, date2, parent_task) { var ONE_DAY = 1000 * 60 * 60 * 24; var date1_ms = date1.getTime(); var date2_ms = date2.getTime(); var difference_ms = Math.abs(date1_ms - date2_ms); - d = Math.floor(difference_ms / ONE_DAY); + d = parent_task? Math.ceil(difference_ms / ONE_DAY) : Math.floor(difference_ms / ONE_DAY); h = (difference_ms % ONE_DAY)/(1000 * 60 * 60); num = (d * this.day_length) + h; return parseFloat(num.toFixed(2)); From ff5acb435146bff358b98a93374b4d967397bd90 Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Mon, 18 Jul 2011 11:47:22 +0530 Subject: [PATCH 02/13] [IMP] Improve edit, when open popup on dblclick of tasks. bzr revid: sma@tinyerp.com-20110718061722-8uy5eqw9tzu04bqg --- addons/base_gantt/static/src/js/gantt.js | 62 +++++++++++++++++------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index 6d8db18b5bd..c68e704a14e 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -289,7 +289,7 @@ init: function(view_manager, session, element_id, dataset, view_id) { ganttChartControl.attachEvent("onTaskStartDrag", function(task) {self.on_drag_start(task);}); ganttChartControl.attachEvent("onTaskEndResize", function(task) {self.on_resize_drag_end(task, "resize");}); ganttChartControl.attachEvent("onTaskEndDrag", function(task) {self.on_resize_drag_end(task, "drag");}); - ganttChartControl.attachEvent("onTaskDblClick", function(task) {self.open_popup(task);}); + ganttChartControl.attachEvent("onTaskDblClick", function(task, evt) {self.open_popup(task); evt.stopPropagation(); evt.preventDefault();}); taskdiv = jQuery("div.taskPanel").parent(); taskdiv.addClass('ganttTaskPanel'); @@ -372,27 +372,53 @@ init: function(view_manager, session, element_id, dataset, view_id) { open_popup : function(task) { var event_id = task.getId(); - if(event_id.toString().search("_") != -1) return; - if (event_id) { - event_id = parseInt(event_id, 10); - var dataset_event_index = jQuery.inArray(event_id, this.ids); - } else { - var dataset_event_index = null; + if(event_id) event_id = parseInt(event_id, 10); + + var action = { + "res_model": this.dataset.model, + "res_id": event_id, + "views":[[false,"form"]], + "type":"ir.actions.act_window", + "view_type":"form", + "view_mode":"form" } - this.dataset.index = dataset_event_index; + + action.flags = { + search_view: false, + sidebar : false, + views_switcher : false, + action_buttons : false, + pager: false + } var element_id = _.uniqueId("act_window_dialog"); - var dialog = jQuery('
', - {'id': element_id - }).dialog({ - title: 'Gantt Chart', - modal: true, - minWidth: 800, - position: 'top' - }); - var event_form = new openerp.base.FormView(this.view_manager, this.session, element_id, this.dataset, false); - event_form.start(); + var dialog = jQuery('
', { + 'id': element_id + }).dialog({ + modal: true, + width: 'auto', + height: 'auto', + buttons: { + Cancel: function() { + $(this).dialog("destroy"); + }, + Save: function() { + var view_manager = action_manager.viewmanager; + var _dialog = this; + view_manager.views[view_manager.active_view].controller.do_save(function(r) { + $(_dialog).dialog("destroy"); + self.reload_gantt(); + }) + } + } + }); + var action_manager = new openerp.base.ActionManager(this.session, element_id); + action_manager.start(); + action_manager.do_action(action); + + //Default_get + if(!event_id) action_manager.viewmanager.dataset.index = null; }, on_drag_start : function(task){ From 9ed55ee3f545029143bed141fbce788701ba8db5 Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Wed, 27 Jul 2011 12:32:20 +0530 Subject: [PATCH 03/13] [FIX] Show Save/Edit and New buttons in popups. bzr revid: sma@tinyerp.com-20110727070220-vyk3w7001lpi7l04 --- addons/base_gantt/static/src/js/gantt.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index c68e704a14e..e3c2b79fc58 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -389,7 +389,6 @@ init: function(view_manager, session, element_id, dataset, view_id) { search_view: false, sidebar : false, views_switcher : false, - action_buttons : false, pager: false } var element_id = _.uniqueId("act_window_dialog"); From f61dadb8490a45e9b9cf07384fb65c1e9cb2e8af Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Tue, 2 Aug 2011 11:22:16 +0530 Subject: [PATCH 04/13] [IMP] Use parent and remove session from ganttview. bzr revid: sma@tinyerp.com-20110802055216-0t9fq66nmthdwzyp --- addons/base_gantt/static/src/js/gantt.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index 06ec4be2634..cde8cd18b9d 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -1,16 +1,14 @@ /*--------------------------------------------------------- * OpenERP base_gantt *---------------------------------------------------------*/ - openerp.base_gantt = function (openerp) { QWeb.add_template('/base_gantt/static/src/xml/base_gantt.xml'); openerp.base.views.add('gantt', 'openerp.base_gantt.GanttView'); -openerp.base_gantt.GanttView = openerp.base.Widget.extend({ +openerp.base_gantt.GanttView = openerp.base.View.extend({ -init: function(view_manager, session, element_id, dataset, view_id) { - - this._super(session, element_id); - this.view_manager = view_manager; +init: function(parent, element_id, dataset, view_id) { + this._super(parent, element_id); + this.view_manager = parent || new openerp.base.NullViewManager(); this.dataset = dataset; this.model = dataset.model; this.view_id = view_id; @@ -29,7 +27,7 @@ init: function(view_manager, session, element_id, dataset, view_id) { this.calendar_fields = {}; this.info_fields = []; this.domain = this.dataset._domain ? this.dataset._domain: []; - this.context = {}; + this.context = this.dataset.context || {}; }, start: function() { From 72f7aa772edfae4162ba450db5b57229df49d631 Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Tue, 2 Aug 2011 11:40:30 +0530 Subject: [PATCH 05/13] [FIX] Need to load all js files for calendar, gantt, graph view. bzr revid: sma@tinyerp.com-20110802061030-eqvqab8ruwxjhpuy --- addons/base/static/src/js/chrome.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index ed84c32071b..50d4c6e418e 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -250,9 +250,9 @@ openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Sessi if ( (tag.readyState && tag.readyState != "loaded" && tag.readyState != "complete") || tag.onload_done ) return; tag.onload_done = true; - self.do_load_js(files); }; - document.head.appendChild(tag); + $('head').append(tag); + self.do_load_js(files); } else { this.on_modules_loaded(); } From 5075601ddc655111b41bb34b6daec2e646a6aa4d Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Tue, 2 Aug 2011 12:00:45 +0530 Subject: [PATCH 06/13] [FIX] Fixed session. bzr revid: sma@tinyerp.com-20110802063045-4q4c3rf45tqdf25l --- addons/base_gantt/static/src/js/gantt.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index cde8cd18b9d..dc31eb0a9d7 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -410,10 +410,10 @@ init: function(parent, element_id, dataset, view_id) { } } }); - var action_manager = new openerp.base.ActionManager(this.session, element_id); + var action_manager = new openerp.base.ActionManager(this, element_id); action_manager.start(); action_manager.do_action(action); - + //Default_get if(!event_id) action_manager.viewmanager.dataset.index = null; }, From e0a7ee0df10db7df30c72e10312abe74730ee9fd Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Tue, 2 Aug 2011 12:03:14 +0530 Subject: [PATCH 07/13] [FIX] Fixed click events. bzr revid: sma@tinyerp.com-20110802063314-yb41yj6m53tobpso --- addons/base_gantt/static/src/js/gantt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index dc31eb0a9d7..7513948125a 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -287,7 +287,7 @@ init: function(parent, element_id, dataset, view_id) { ganttChartControl.attachEvent("onTaskStartDrag", function(task) {self.on_drag_start(task);}); ganttChartControl.attachEvent("onTaskEndResize", function(task) {self.on_resize_drag_end(task, "resize");}); ganttChartControl.attachEvent("onTaskEndDrag", function(task) {self.on_resize_drag_end(task, "drag");}); - ganttChartControl.attachEvent("onTaskDblClick", function(task, evt) {self.open_popup(task); evt.stopPropagation(); evt.preventDefault();}); + ganttChartControl.attachEvent("onTaskDblClick", function(task) {self.open_popup(task);}); taskdiv = jQuery("div.taskPanel").parent(); taskdiv.addClass('ganttTaskPanel'); From d70785e2e8abef875a18a9e983f1938decfe2990 Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Fri, 5 Aug 2011 12:52:34 +0530 Subject: [PATCH 08/13] [FIX] Replace group name False to Undefined. bzr revid: sma@tinyerp.com-20110805072234-f4zvl4fnzhiewkcv --- addons/base_gantt/static/src/js/gantt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index 7513948125a..9b86f791f32 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -173,7 +173,7 @@ init: function(parent, element_id, dataset, view_id) { } if (grp_key == false){ - grp_key = "False"; + grp_key = "Undefined"; } if (j == 0){ From 5be9b44ac8c77e6eb56296e83b5932cc325c25bf Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Wed, 10 Aug 2011 14:15:28 +0530 Subject: [PATCH 09/13] [IMP] Consider to remove level tag from xml and display first time without group_by. bzr revid: sma@tinyerp.com-20110810084528-059auhvl25neb63p --- addons/base_gantt/static/src/js/gantt.js | 84 ++++++++++++++---------- 1 file changed, 50 insertions(+), 34 deletions(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index 9b86f791f32..b31e02eeb78 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -50,8 +50,7 @@ init: function(parent, element_id, dataset, view_id) { this.color_field = this.fields_view.arch.attrs.color; this.day_length = this.fields_view.arch.attrs.day_length || 8; this.colors = this.fields_view.arch.attrs.colors; - - this.text = this.fields_view.arch.children[0].children[0].attrs.name; + this.text = this.fields_view.arch.children[0].attrs.name; this.parent = this.fields_view.arch.children[0].attrs.link; this.format = "yyyy-MM-dd"; @@ -98,7 +97,7 @@ init: function(parent, element_id, dataset, view_id) { if (result.length != 0){ var show_event = []; - for (i in result){ + for (var i in result){ var res = result[i]; if (res[this.date_start] != false){ @@ -130,7 +129,7 @@ init: function(parent, element_id, dataset, view_id) { var child_event = {}; var temp_id = ""; var final_events = []; - for (i in show_event) { + for (var i in show_event) { var res = show_event[i]; @@ -159,11 +158,8 @@ init: function(parent, element_id, dataset, view_id) { if (duration == false) duration = 0 - if (self.grp.length == 0){ - self.grp.push({'group_by' : this.parent}) - } - if (self.grp != undefined){ - for (j in self.grp){ + if (self.grp.length){ + for (var j in self.grp){ var grp_key = res[self.grp[j]['group_by']]; if (typeof(grp_key) == "object"){ grp_key = res[self.grp[j]['group_by']][1]; @@ -205,9 +201,18 @@ init: function(parent, element_id, dataset, view_id) { all_events[id] = {'parent': temp_id, 'evt':[id , text, start_date, duration, 100, "", color_box[color]]}; final_events.push(id); } + else { + if (i == 0) { + var mod_id = "_" + i; + child_event[mod_id] = {}; + all_events[mod_id] = {'parent': "", 'evt': [mod_id, this.name, start_date, start_date, 100, "", "white"]}; + } + all_events[id] = {'parent': mod_id, 'evt':[id , text, start_date, duration, 100, "", color_box[color]]}; + final_events.push(id); + } } - for (i in final_events){ + for (var i in final_events){ var evt_id = final_events[i]; var evt_date = all_events[evt_id]['evt'][2]; while (all_events[evt_id]['parent'] != "") { @@ -223,7 +228,7 @@ init: function(parent, element_id, dataset, view_id) { var evt_duration = ""; var evt_end_date = ""; - for (i in final_events){ + for (var i in final_events){ evt_id = final_events[i]; evt_date = all_events[evt_id]['evt'][2]; evt_duration = all_events[evt_id]['evt'][3]; @@ -240,32 +245,17 @@ init: function(parent, element_id, dataset, view_id) { } } - for (j in self.grp){ - for (i in all_events){ - res = all_events[i]; - if ((typeof(res['evt'][3])) == "object"){ - res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3], true); - } - - k = res['evt'][0].toString().indexOf('_'); - if (k != -1){ - if (res['evt'][0].substring(k) == "_"+j){ - if (j == 0){ - task = new GanttTaskInfo(res['evt'][0], res['evt'][1], res['evt'][2], res['evt'][3], res['evt'][4], "",res['evt'][6]); - project.addTask(task); - } else { - task = new GanttTaskInfo(res['evt'][0], res['evt'][1], res['evt'][2], res['evt'][3], res['evt'][4], "",res['evt'][6]); - prt = project.getTaskById(res['parent']); - prt.addChildTask(task); - } - } - } - } + for (var j in self.grp) { + self.render_events(all_events, j); } - for (i in final_events){ + + if (!self.grp.length) { + self.render_events(all_events, 0); + } + + for (var i in final_events){ evt_id = final_events[i]; res = all_events[evt_id]; - task=new GanttTaskInfo(res['evt'][0], res['evt'][1], res['evt'][2], res['evt'][3], res['evt'][4], "",res['evt'][6]); prt = project.getTaskById(res['parent']); prt.addChildTask(task); @@ -368,6 +358,32 @@ init: function(parent, element_id, dataset, view_id) { }, + render_events : function(all_events, j) { + + var self = this; + for (var i in all_events){ + var res = all_events[i]; + if ((typeof(res['evt'][3])) == "object"){ + res['evt'][3] = self.hours_between(res['evt'][2],res['evt'][3], true); + } + + k = res['evt'][0].toString().indexOf('_'); + + if (k != -1) { + if (res['evt'][0].substring(k) == "_"+j){ + if (j == 0){ + task = new GanttTaskInfo(res['evt'][0], res['evt'][1], res['evt'][2], res['evt'][3], res['evt'][4], "",res['evt'][6]); + project.addTask(task); + } else { + task = new GanttTaskInfo(res['evt'][0], res['evt'][1], res['evt'][2], res['evt'][3], res['evt'][4], "",res['evt'][6]); + prt = project.getTaskById(res['parent']); + prt.addChildTask(task); + } + } + } + } + }, + open_popup : function(task) { var event_id = task.getId(); if(event_id.toString().search("_") != -1) From 15aef31efd1f6f2a92cf3ac5c822eba08b8c28b3 Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Wed, 10 Aug 2011 15:11:38 +0530 Subject: [PATCH 10/13] [FIX] Initialize implicit globals. bzr revid: sma@tinyerp.com-20110810094138-sb0ed029xsfrs239 --- addons/base_gantt/static/src/js/gantt.js | 39 ++++++++++++------------ 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index b31e02eeb78..18c8617022c 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -50,7 +50,8 @@ init: function(parent, element_id, dataset, view_id) { this.color_field = this.fields_view.arch.attrs.color; this.day_length = this.fields_view.arch.attrs.day_length || 8; this.colors = this.fields_view.arch.attrs.colors; - this.text = this.fields_view.arch.children[0].attrs.name; + var arch_children = this.fields_view.arch.children[0]; + this.text = arch_children.children[0] ? arch_children.children[0].attrs.name : arch_children.attrs.name; this.parent = this.fields_view.arch.children[0].attrs.link; this.format = "yyyy-MM-dd"; @@ -65,7 +66,7 @@ init: function(parent, element_id, dataset, view_id) { create_gantt: function() { - ganttChartControl = new GanttChart(this.day_length); + var ganttChartControl = new GanttChart(this.day_length); ganttChartControl.setImagePath("/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/"); ganttChartControl.setEditable(true); ganttChartControl.showTreePanel(true); @@ -204,7 +205,6 @@ init: function(parent, element_id, dataset, view_id) { else { if (i == 0) { var mod_id = "_" + i; - child_event[mod_id] = {}; all_events[mod_id] = {'parent': "", 'evt': [mod_id, this.name, start_date, start_date, 100, "", "white"]}; } all_events[id] = {'parent': mod_id, 'evt':[id , text, start_date, duration, 100, "", color_box[color]]}; @@ -261,11 +261,11 @@ init: function(parent, element_id, dataset, view_id) { prt.addChildTask(task); } - oth_hgt = 264; - min_hgt = 150; - name_min_wdt = 150; - gantt_hgt = jQuery(window).height() - oth_hgt; - search_wdt = jQuery("#oe_app_search").width(); + var oth_hgt = 264; + var min_hgt = 150; + var name_min_wdt = 150; + var gantt_hgt = jQuery(window).height() - oth_hgt; + var search_wdt = jQuery("#oe_app_search").width(); if (gantt_hgt > min_hgt){ jQuery('#GanttDiv').height(gantt_hgt).width(search_wdt); @@ -279,13 +279,13 @@ init: function(parent, element_id, dataset, view_id) { ganttChartControl.attachEvent("onTaskEndDrag", function(task) {self.on_resize_drag_end(task, "drag");}); ganttChartControl.attachEvent("onTaskDblClick", function(task) {self.open_popup(task);}); - taskdiv = jQuery("div.taskPanel").parent(); + var taskdiv = jQuery("div.taskPanel").parent(); taskdiv.addClass('ganttTaskPanel'); taskdiv.prev().addClass('ganttDayPanel'); - $gantt_panel = jQuery(".ganttTaskPanel , .ganttDayPanel"); + var $gantt_panel = jQuery(".ganttTaskPanel , .ganttDayPanel"); - ganttrow = jQuery('.taskPanel').closest('tr'); - gtd = ganttrow.children(':first-child'); + var ganttrow = jQuery('.taskPanel').closest('tr'); + var gtd = ganttrow.children(':first-child'); gtd.children().addClass('task-name'); jQuery(".toggle-sidebar").click(function(e) { @@ -307,9 +307,8 @@ init: function(parent, element_id, dataset, view_id) { $gantt_panel.width(1); jQuery(".ganttTaskPanel").parent().width(1); - search_wdt = jQuery("#oe_app_search").width(); - day_wdt = jQuery(".ganttDayPanel").children().children().width(); - name_wdt = jQuery('.task-name').width(); + var search_wdt = jQuery("#oe_app_search").width(); + var day_wdt = jQuery(".ganttDayPanel").children().children().width(); jQuery('#GanttDiv').css('width','100%'); if (search_wdt - day_wdt <= name_min_wdt){ @@ -333,7 +332,7 @@ init: function(parent, element_id, dataset, view_id) { var self = this; - dat = this.convert_str_date(dat); + var dat = this.convert_str_date(dat); var day = Math.floor(duration/self.day_length); var hrs = duration % self.day_length; @@ -351,9 +350,9 @@ init: function(parent, element_id, dataset, view_id) { var date2_ms = date2.getTime(); var difference_ms = Math.abs(date1_ms - date2_ms); - d = parent_task? Math.ceil(difference_ms / ONE_DAY) : Math.floor(difference_ms / ONE_DAY); - h = (difference_ms % ONE_DAY)/(1000 * 60 * 60); - num = (d * this.day_length) + h; + var d = parent_task? Math.ceil(difference_ms / ONE_DAY) : Math.floor(difference_ms / ONE_DAY); + var h = (difference_ms % ONE_DAY)/(1000 * 60 * 60); + var num = (d * this.day_length) + h; return parseFloat(num.toFixed(2)); }, @@ -435,7 +434,7 @@ init: function(parent, element_id, dataset, view_id) { }, on_drag_start : function(task){ - st_date = task.getEST(); + var st_date = task.getEST(); if(st_date.getHours()){ self.hh = st_date.getHours(); self.mm = st_date.getMinutes(); From 33f984d056f6fc367ed1194f7e81aba4c0deca3e Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Thu, 11 Aug 2011 12:49:34 +0530 Subject: [PATCH 11/13] [FIX] Minor changes. bzr revid: sma@tinyerp.com-20110811071934-adjiwyspxegdpzk5 --- addons/base_gantt/static/src/js/gantt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_gantt/static/src/js/gantt.js b/addons/base_gantt/static/src/js/gantt.js index 18c8617022c..61f9a443d56 100644 --- a/addons/base_gantt/static/src/js/gantt.js +++ b/addons/base_gantt/static/src/js/gantt.js @@ -66,7 +66,7 @@ init: function(parent, element_id, dataset, view_id) { create_gantt: function() { - var ganttChartControl = new GanttChart(this.day_length); + ganttChartControl = new GanttChart(this.day_length); ganttChartControl.setImagePath("/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/"); ganttChartControl.setEditable(true); ganttChartControl.showTreePanel(true); From 2c2fe7a691fb31a72a19662750dda0422105c4e5 Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Fri, 12 Aug 2011 16:08:18 +0530 Subject: [PATCH 12/13] [FIX] Remove conflicts. bzr revid: sma@tinyerp.com-20110812103818-q8wet6opinckiv1a --- addons/base/static/src/js/chrome.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index 1ff49eb773a..92e3c298420 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -4,7 +4,7 @@ openerp.base.chrome = function(openerp) { -<<<<<<< TREE + openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Session# */{ /** * @constructs @@ -273,8 +273,6 @@ openerp.base.Session = openerp.base.Widget.extend( /** @lends openerp.base.Sessi } }); -======= ->>>>>>> MERGE-SOURCE openerp.base.Notification = openerp.base.Widget.extend({ init: function(parent, element_id) { this._super(parent, element_id); From ee581f8247fa3d0df9ace2505f6977f48fcd0257 Mon Sep 17 00:00:00 2001 From: "sma (Tiny)" Date: Fri, 12 Aug 2011 17:14:02 +0530 Subject: [PATCH 13/13] [IMP] simplify code of padding function in date formatting. bzr revid: sma@tinyerp.com-20110812114402-u9u8vxxp1fnonq3m --- addons/base/static/src/js/formats.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/src/js/formats.js b/addons/base/static/src/js/formats.js index fb1ada544a4..eb5ff6d8368 100644 --- a/addons/base/static/src/js/formats.js +++ b/addons/base/static/src/js/formats.js @@ -83,7 +83,7 @@ openerp.base.parse_time = function(str) { */ var zpad = function(str, size) { str = "" + str; - return new Array(size - str.length).join('0') + str; + return new Array(_.range(size - str.length)).join('0') + str; }; /**