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

[IMP] do_action on controller 

bzr revid: al@openerp.com-20110719102707-qfy1lz5mjj006ok1
This commit is contained in:
Antony Lesuisse 2011-07-19 12:27:07 +02:00
parent e4b1ae8c1a
commit 906a94c3c7
6 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/base/static/src/base.html
View File

@ -31,8 +31,8 @@
<script type="text/javascript" src="/base/static/src/js/form.js"></script>
<script type="text/javascript" src="/base/static/src/js/list.js"></script>
<script type="text/javascript" src="/base/static/src/js/list-editable.js"></script>
<script type="text/javascript" src="/base/static/src/js/tree.js"></script>
<script type="text/javascript" src="/base/static/src/js/search.js"></script>
<script type="text/javascript" src="/base/static/src/js/view_tree.js"></script>
<link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css" />
<link rel="stylesheet" type="text/css" media="screen" href="/base/static/lib/jquery.ui.notify/css/ui.notify.css" />

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

@ -72,9 +72,6 @@ openerp.base = function(instance) {
if (openerp.base.list) {
openerp.base.list(instance);
}
if (openerp.base.tree) {
openerp.base.tree(instance);
}
if (openerp.base. m2o) {
openerp.base.m2o(instance);
}
@ -87,6 +84,9 @@ openerp.base = function(instance) {
if (openerp.web_mobile) {
openerp.web_mobile(instance);
}
if (openerp.base.view_tree) {
openerp.base.view_tree(instance);
}
};
// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

3
addons/base/static/src/js/chrome.js
View File

@ -467,6 +467,9 @@ openerp.base.Controller = openerp.base.BasicController.extend( /** @lends opener
*/
rpc: function(url, data, success, error) {
return this.session.rpc(url, data, success, error);
},
do_action: function(action, on_finished) {
return this.parent.do_action(action, on_finished);
}
});

15
addons/base/static/src/js/view_help.js Normal file
View File

@ -0,0 +1,15 @@
/*---------------------------------------------------------
* OpenERP base library
*---------------------------------------------------------*/
openerp.base.view_help = function(openerp) {
openerp.base.ProcessView = openerp.base.Controller.extend({
});
openerp.base.HelpView = openerp.base.Controller.extend({
});
};
// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax:

2
addons/base/static/src/js/tree.js → addons/base/static/src/js/view_tree.js
View File

@ -2,7 +2,7 @@
* OpenERP base library
*---------------------------------------------------------*/
openerp.base.tree = function(openerp) {
openerp.base.view_tree = function(openerp) {
openerp.base.views.add('tree', 'openerp.base.TreeView');
openerp.base.TreeView = openerp.base.Controller.extend({

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

@ -81,6 +81,19 @@ openerp.base.ActionManager = openerp.base.Controller.extend({
}
});
openerp.base.ActionDialog = openerp.base.Dialog.extend({
identifier_prefix: 'action_dialog',
stop: function() {
this._super(this, arguments);
if (this.close_callback) {
this.close_callback();
}
if (this.viewmanager) {
this.viewmanager.stop();
}
}
});
openerp.base.ViewManager = openerp.base.Controller.extend({
init: function(parent, element_id, dataset, views) {
this._super(parent, element_id);
@ -333,19 +346,6 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
}
});
openerp.base.ActionDialog = openerp.base.Dialog.extend({
identifier_prefix: 'action_dialog',
stop: function() {
this._super(this, arguments);
if (this.close_callback) {
this.close_callback();
}
if (this.viewmanager) {
this.viewmanager.stop();
}
}
});
openerp.base.Sidebar = openerp.base.BaseWidget.extend({
template: "ViewManager.sidebar",
init: function(parent, view_manager) {
@ -490,12 +490,6 @@ openerp.base.View = openerp.base.Controller.extend({
*/
openerp.base.views = new openerp.base.Registry();
openerp.base.ProcessView = openerp.base.Controller.extend({
});
openerp.base.HelpView = openerp.base.Controller.extend({
});
openerp.base.json_node_to_xml = function(node, single_quote, indent) {
// For debugging purpose, this function will convert a json node back to xml
// Maybe usefull for xml view editor