Vaibhav (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-bug-911850-vda into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
Related bugs:
Bug #911850 in OpenERP Web: "button 'Create' in gantt view does not work"
https://bugs.launchpad.net/openerp-web/+bug/911850
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-911850-vda/+merge/87574
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-911850-vda/+merge/87574
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-bug-911850-vda.
=== modified file 'addons/web_gantt/static/src/js/gantt.js'
--- addons/web_gantt/static/src/js/gantt.js 2012-01-04 16:16:15 +0000
+++ addons/web_gantt/static/src/js/gantt.js 2012-01-05 08:29:46 +0000
@@ -111,7 +111,7 @@
var name = started_projects[0][self.parent];
self.name = name instanceof Array? name[name.length - 1] : name;
}
- this.$element.find('#add_task').click(function(){
+ this.$element.find('#add_task').click(function() {
self.editTask();
});
@@ -364,19 +364,38 @@
}
if(event_id) event_id = parseInt(event_id, 10);
- var pop = new openerp.web.form.FormOpenPopup(this);
-
- pop.show_element(this.model, event_id, this.context || this.dataset.context, {});
-
- pop.on_write.add(function(id, data) {
- var get_project = _.find(self.database_projects, function(project){ return project.id == id});
- if (get_project) {
- _.extend(get_project, data);
- } else {
- _.extend(self.database_projects, _.extend(data, {'id': id}));
- }
- self.reloadView();
- });
+ if (!event_id) {
+ var pop = new openerp.web.form.SelectCreatePopup(this);
+ pop.select_element(
+ this.model,
+ {
+ title: _t("Create: ") + this.name,
+ initial_view: 'form',
+ disable_multiple_selection: true
+ },
+ this.dataset.domain,
+ this.context || this.dataset.context
+ )
+ pop.on_select_elements.add_last(function(element_ids) {
+ self.dataset.read_ids(element_ids,[]).done(function(projects) {
+ self.database_projects.concat(projects);
+ self.reloadView();
+ });
+ });
+ }
+ else {
+ var pop = new openerp.web.form.FormOpenPopup(this);
+ pop.show_element(this.model, event_id, this.context || this.dataset.context, {});
+ pop.on_write.add(function(id, data) {
+ var get_project = _.find(self.database_projects, function(project){ return project.id == id});
+ if (get_project) {
+ _.extend(get_project, data);
+ } else {
+ _.extend(self.database_projects, _.extend(data, {'id': id}));
+ }
+ self.reloadView();
+ });
+ }
},
set_width: function() {
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
