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

[IMP] Listview open in new window & Searchview is hide 

bzr revid: bth@tinyerp.com-20110629114652-n3psw2n6lw9zxwsu
This commit is contained in:
Bhumi Thakkar (Open ERP) 2011-06-29 17:16:52 +05:30
parent ce9563869b
commit 0244a92802
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
addons/base/static/src/js/tree.js
View File

@ -5,13 +5,19 @@ openerp.base.views.add('tree', 'openerp.base.TreeView');
* Genuine tree view (the one displayed as a tree, not the list)
*/
openerp.base.TreeView = openerp.base.View.extend({
/**
* Indicates that this view is not searchable, and thus that no search
* view should be displayed (if there is one active).
*/
searchable : false,
init: function(view_manager, session, element_id, dataset, view_id, options) {
this._super(session, element_id);
this.view_manager = view_manager || new openerp.base.NullViewManager();
this.dataset = dataset;
this.model = dataset.model;
this.view_id = view_id;
this.session = session;
this.columns = [];
this.options = _.extend({}, this.defaults, options || {});
@ -31,6 +37,7 @@ openerp.base.TreeView = openerp.base.View.extend({
var self = this;
this.fields_view = data.field_parent;
this.fields = data.fields;
this.dataset.read_slice([], 0, false, function (response) {
self.$element.html(QWeb.render('TreeView', {'field_data' : response}));
self.$element.find('#parent_id').bind('change', function(){
@ -63,6 +70,7 @@ openerp.base.TreeView = openerp.base.View.extend({
padding = curr_node.find('td').css('paddingLeft');
padd = parseInt(padding.replace('px',''), 10);
for (var i = 0; i < response.length; i++) {
row_id = $('tr #treerow_' + response[i].id);
if (row_id) {
@ -105,11 +113,6 @@ openerp.base.TreeView = openerp.base.View.extend({
});
self.$element.find('tr[id ^= treerow_]').find('td').children(':first-child').click( function() {
if ($(this).is('span')) {
row_id = $(this).parent().parent().attr('id');
rowid = row_id.split('_')[1];
self.showrecord(rowid);
}
is_loaded = 0;
if ($(this).length == 1) {
rowid = (this.id).split('_')[1];
@ -138,29 +141,20 @@ openerp.base.TreeView = openerp.base.View.extend({
}
});
self.$element.find('tr[id^=treerow_]').find('td').children(':last-child').click(function(){
self.$element.find('tr[id ^= treerow_]').find('td').children(':last-child').click( function(e) {
row_id = $(this).parent().parent().attr('id');
rowid = row_id.split('_')[1];
self.showrecord(rowid);
self.showrecord(rowid, self.model);
e.stopImmediatePropagation();
});
});
},
// Get details in listview
showrecord: function(id){
showrecord: function(id, model){
var self = this;
this.dataset = new openerp.base.DataSetStatic(self.session, self.fields.relation);
this.dataset.on_unlink.add_last(function(ids) {
var view = self.viewmanager.views[self.viewmanager.active_view].controller;
view.reload_content();
});
self.dataset.model = 'product.product';
self.dataset.domain = [['categ_id', 'child_of', parseInt(id, 10)]];
var modes = !!modes ? modes.split(",") : ["tree", "form"];
var views = [];
_.each(modes, function(mode) {
@ -170,29 +164,29 @@ openerp.base.TreeView = openerp.base.View.extend({
}
views.push(view);
});
this.viewmanager = new openerp.base.ViewManager(self.session, self.element_id, self.dataset, views);
this.viewmanager.on_controller_inited.add_last( function(view_type, controller) {
if (view_type == "list") {
} else if (view_type == "form") {
}
});
this.viewmanager.start();
var action = {
"res_model" : this.viewmanager.model,
"domain" : this.viewmanager.dataset.domain,
"res_model" : self.dataset.model,
"domain" : self.dataset.domain,
"views" : views,
"type" : "ir.actions.act_window",
"auto_search" : true,
"view_type" : "list",
"view_mode" : "list"
}
action.flags = {
search_view: true,
sidebar : true,
views_switcher : true,
action_buttons : true,
pager: true,
new_window : true
}
this.viewmanageraction = new openerp.base.ViewManagerAction(self.session, self.element_id, action);
this.viewmanageraction.start();
this.actionmanager = new openerp.base.ActionManager(self.session, self.element_id);
this.actionmanager.start()
this.actionmanager.do_action(action);
self.dataset.model = model;
},
// show & hide the contents
@ -261,6 +255,14 @@ openerp.base.TreeView = openerp.base.View.extend({
self.reload_view(!!results.group_by).then(
$.proxy(self, 'reload_content'));
});
}
},
do_show: function () {
this.$element.show();
this.view_manager.sidebar.do_refresh(true);
},
do_hide: function () {
this.$element.hide();
this.hidden = true;
},
});
}

6
addons/base/static/src/js/views.js
View File

@ -112,6 +112,10 @@ openerp.base.ViewManager = openerp.base.Controller.extend({
* @returns {jQuery.Deferred} new view loading promise
*/
on_mode_switch: function(view_type) {
if(view_type == "tree"){
this.searchview = new openerp.base.SearchView(null, this.session,
this.element_id + "_search", this.dataset, false, {});
}
var view_promise;
this.active_view = view_type;
var view = this.views[view_type];
@ -156,7 +160,6 @@ openerp.base.ViewManager = openerp.base.Controller.extend({
},
/**
* Event launched when a controller has been inited.
*
* @param {String} view_type type of view
* @param {String} view the inited controller
*/
@ -403,7 +406,6 @@ openerp.base.View = openerp.base.Controller.extend({
* Directly set a view to use instead of calling fields_view_get. This method must
* be called before start(). When an embedded view is set, underlying implementations
* of openerp.base.View must use the provided view instead of any other one.
*
* @param embedded_view A view.
*/
set_embedded_view: function(embedded_view) {