Browse Source

[FIX][mis_builder] Fix the creation of a new mis.report.instance.

pull/189/head
Adrien Peiffer (ACSONE) 9 years ago
committed by Stéphane Bidoul
parent
commit
cafbdda1c0
  1. 4
      mis_builder/models/mis_builder.py
  2. 15
      mis_builder/static/src/js/mis_builder.js

4
mis_builder/models/mis_builder.py

@ -629,12 +629,12 @@ class MisReportInstance(models.Model):
@api.multi
def display_settings(self):
self.ensure_one()
assert len(self.ids) <= 1
view_id = self.env.ref('mis_builder.mis_report_instance_view_form')
return {
'type': 'ir.actions.act_window',
'res_model': 'mis.report.instance',
'res_id': self.id,
'res_id': self.id if self.id else False,
'view_mode': 'form',
'view_type': 'form',
'views': [(view_id.id, 'form')],

15
mis_builder/static/src/js/mis_builder.js

@ -24,14 +24,23 @@ var MisReport = form_common.FormWidget.extend({
reload_widget: function() {
var self = this
self.mis_report_instance_id = self.getParent().datarecord.id
self.generate_content();
if (self.mis_report_instance_id) {
self.generate_content();
} else {
self.display_settings();
}
},
start: function() {
this._super.apply(this, arguments);
var self = this;
self.mis_report_instance_id = self.getParent().datarecord.id
self.generate_content();
if (self.mis_report_instance_id) {
self.getParent().dataset.context['no_destroy'] = true;
self.generate_content();
} else {
self.display_settings();
}
},
get_context: function() {
@ -94,7 +103,7 @@ var MisReport = form_common.FormWidget.extend({
self.$(".oe_mis_builder_print").click(_.bind(this.print, this));
self.$(".oe_mis_builder_export").click(_.bind(this.export_pdf, this));
self.$(".oe_mis_builder_settings").click(_.bind(this.display_settings, this));
var Users = new instance.web.Model('res.users');
var Users = new Model('res.users');
Users.call('has_group', ['account.group_account_user']).done(function (res) {
if (res) {
self.$(".oe_mis_builder_settings").show();

Loading…
Cancel
Save