odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[fix] al forgot view page 

bzr revid: nicolas.vanhoren@openerp.com-20120410142901-9x3f0if342z922bu
This commit is contained in:
niv-openerp 2012-04-10 16:29:01 +02:00
parent e922d9df97
commit 4d9b3be656
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
addons/web/static/src/js/view_form.js
View File

@ -2687,10 +2687,9 @@ openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
this.viewmanager = new openerp.web.ViewManager(this, this.dataset, views, {});
this.viewmanager.template = 'One2Many.viewmanager';
this.viewmanager.fields_registry = openerp.web.views.extend({
this.viewmanager.registry = openerp.web.views.extend({
list: 'openerp.web.form.One2ManyListView',
form: 'openerp.web.form.One2ManyFormView',
page: 'openerp.web.PageView',
kanban: 'openerp.web.form.One2ManyKanbanView',
});
var once = $.Deferred().then(function() {
@ -2704,8 +2703,8 @@ openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
if (view_type == "list") {
if (self.get("effective_readonly"))
controller.set_editable(false);
} else if (view_type == "form" || view_type == 'form') {
if (view_type == 'page' || self.get("effective_readonly")) {
} else if (view_type === "form") {
if (self.get("effective_readonly")) {
$(".oe_form_buttons", controller.$element).children().remove();
}
controller.on_record_loaded.add_last(function() {
@ -2739,7 +2738,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.AbstractField.extend({
var view = self.viewmanager.views[active_view].controller;
if(active_view === "list") {
return view.reload_content();
} else if (active_view === "form" || active_view === 'page') {
} else if (active_view === "form") {
if (self.dataset.index === null && self.dataset.ids.length >= 1) {
self.dataset.index = 0;
}
@ -3409,9 +3408,7 @@ openerp.web.form.FormOpenPopup = openerp.web.OldWidget.extend(/** @lends openerp
on_write_completed: function() {},
setup_form_view: function() {
var self = this;
var FormClass = this.options.readonly
? openerp.web.views.get_object('page')
: openerp.web.views.get_object('form');
var FormClass = openerp.web.views.get_object('form');
this.view_form = new FormClass(this, this.dataset, false, self.options.form_view_options);
if (this.options.alternative_form_view) {
this.view_form.set_embedded_view(this.options.alternative_form_view);

2
addons/web/static/src/xml/base.xml
View File

@ -444,7 +444,7 @@
</t>
<t t-name="ViewManagerDebug">
<option value="">Debug View#<t t-esc="view.fields_view.view_id"/></option>
<option t-if="_.indexOf(['form', 'page'], view_manager.active_view) gt -1" value="perm_read" data-views="form,page">View Log (perm_read)</option>
<option t-if="view_manager.active_view === 'form'" value="perm_read" data-views="form,page">View Log (perm_read)</option>
<option t-if="view_manager.active_view === 'form'" value="toggle_layout_outline">Toggle Form Layout Outline</option>
<option value="fields">View Fields</option>
<option value="fvg">Fields View Get</option>

2
addons/web_calendar/static/src/js/calendar.js
View File

@ -344,7 +344,7 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
var index = this.dataset.get_id_index(event_id);
if (index !== null) {
this.dataset.index = index;
this.do_switch_view('page');
this.do_switch_view('form');
} else if (scheduler.getState().mode === 'month') {
var event_obj = scheduler.getEvent(event_id);
if (event_obj._length === 1) {

2
addons/web_process/static/src/js/process.js
View File

@ -28,7 +28,7 @@ openerp.web_process = function (openerp) {
initialize_process_view: function() {
var self = this;
this.record_id = false;
if(this.active_view == 'page' || this.active_view == 'form') {
if(this.active_view == 'form') {
this.record_id = this.views[this.active_view].controller.datarecord.id;
}