From d1d7dd6c8709f6ce41db6113c6133e69bfd8a8a3 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 5 Sep 2011 14:28:15 +0200 Subject: [PATCH] renamse base to web part2 bzr revid: al@openerp.com-20110905122815-m99c0w1lkzxxjh8o --- addons/web/__openerp__.py | 2 +- addons/web/common/dispatch.py | 1 + addons/web/controllers/__init__.py | 1 + addons/web/po/base.pot | 14 ++--- addons/web/static/src/js/chrome.js | 6 +- addons/web/static/src/js/data.js | 2 +- addons/web_calendar/__openerp__.py | 4 +- addons/web_calendar/controllers/main.py | 6 +- addons/web_calendar/static/src/js/calendar.js | 42 ++++++------- addons/web_chat/__openerp__.py | 2 +- addons/web_chat/controllers/main.py | 2 +- addons/web_dashboard/__openerp__.py | 4 +- addons/web_dashboard/controllers.py | 4 +- .../web_dashboard/static/src/js/dashboard.js | 62 +++++++++---------- .../static/src/xml/base_dashboard.xml | 14 ++--- addons/web_default_home/__openerp__.py | 2 +- addons/web_default_home/static/src/js/home.js | 26 ++++---- .../static/src/xml/base_default_home.xml | 2 +- addons/web_diagram/__openerp__.py | 2 +- addons/web_diagram/controllers/main.py | 6 +- addons/web_diagram/static/src/js/diagram.js | 12 ++-- addons/web_gantt/__openerp__.py | 4 +- addons/web_gantt/controllers/main.py | 6 +- addons/web_gantt/static/src/js/gantt.js | 32 +++++----- addons/web_graph/__openerp__.py | 4 +- addons/web_graph/controllers/main.py | 6 +- addons/web_graph/static/src/js/graph.js | 14 ++--- .../web_mobile/static/src/js/chrome_mobile.js | 32 +++++----- .../web_mobile/static/src/js/form_mobile.js | 6 +- .../web_mobile/static/src/js/list_mobile.js | 6 +- addons/web_rpc/__openerp__.py | 24 +++---- openerp-web.py | 4 +- 32 files changed, 178 insertions(+), 176 deletions(-) diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index fad4fb7f72d..7688f467c0a 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -43,7 +43,7 @@ "static/lib/jquery.superfish/css/superfish.css", "static/lib/jquery.ui/css/smoothness/jquery-ui-1.8.9.custom.css", "static/lib/jquery.ui.notify/css/ui.notify.css", - "static/src/css/web.css", + "static/src/css/base.css", "static/src/css/data_export.css", ], } diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py index e4ed31e9947..97fa50cbf48 100644 --- a/addons/web/common/dispatch.py +++ b/addons/web/common/dispatch.py @@ -412,6 +412,7 @@ class Root(object): :returns: a callable matching the path sections, or ``None`` :rtype: ``Controller | None`` """ + print "Find handler",l if len(l) > 1: for i in range(len(l), 1, -1): ps = "/" + "/".join(l[0:i]) diff --git a/addons/web/controllers/__init__.py b/addons/web/controllers/__init__.py index e69de29bb2d..8ee9bae18d9 100644 --- a/addons/web/controllers/__init__.py +++ b/addons/web/controllers/__init__.py @@ -0,0 +1 @@ +import main diff --git a/addons/web/po/base.pot b/addons/web/po/base.pot index 1cd3e775a91..d4d23e73c3c 100644 --- a/addons/web/po/base.pot +++ b/addons/web/po/base.pot @@ -83,7 +83,7 @@ msgid "Back to Login" msgstr "" #: addons/web/static/src/xml/web.xml:0 -msgid "CREATE DATAweb" +msgid "CREATE DATABASE" msgstr "" #: addons/web/static/src/xml/web.xml:0 @@ -91,7 +91,7 @@ msgid "Master password:" msgstr "" #: addons/web/static/src/xml/web.xml:0 -msgid "New dataweb name:" +msgid "New database name:" msgstr "" #: addons/web/static/src/xml/web.xml:0 @@ -111,11 +111,11 @@ msgid "Confirm password:" msgstr "" #: addons/web/static/src/xml/web.xml:0 -msgid "DROP DATAweb" +msgid "DROP DATABASE" msgstr "" #: addons/web/static/src/xml/web.xml:0 -msgid "Dataweb:" +msgid "Database:" msgstr "" #: addons/web/static/src/xml/web.xml:0 @@ -123,11 +123,11 @@ msgid "Master Password:" msgstr "" #: addons/web/static/src/xml/web.xml:0 -msgid "BACKUP DATAweb" +msgid "BACKUP DATABASE" msgstr "" #: addons/web/static/src/xml/web.xml:0 -msgid "RESTORE DATAweb" +msgid "RESTORE DATABASE" msgstr "" #: addons/web/static/src/xml/web.xml:0 @@ -155,7 +155,7 @@ msgid "Password:" msgstr "" #: addons/web/static/src/xml/web.xml:0 -msgid "Dataweb" +msgid "Database" msgstr "" #: addons/web/static/src/xml/web.xml:0 diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 153234e9891..9c9063f32c3 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -172,7 +172,7 @@ openerp.web.Loading = openerp.web.Widget.extend({ } }); -openerp.web.Dataweb = openerp.web.Widget.extend({ +openerp.web.Database = openerp.web.Widget.extend({ init: function(parent, element_id, option_id) { this._super(parent, element_id); this.$option_id = $('#' + option_id); @@ -499,7 +499,7 @@ openerp.web.Login = openerp.web.Widget.extend({ this, "oe_database", "oe_db_options"); this.$element.find('#oe-db-config').click(function() { - self.dataweb.start(); + self.database.start(); }); this.$element.find("form").submit(this.on_submit); @@ -825,7 +825,7 @@ openerp.web.WebClient = openerp.web.Widget.extend({ this._super(null, element_id); openerp.webclient = this; - QWeb.add_template("/web/static/src/xml/web.xml"); + QWeb.add_template("/web/static/src/xml/base.xml"); var params = {}; if(jQuery.param != undefined && jQuery.deparam(jQuery.param.querystring()).kitten != undefined) { this.$element.addClass("kitten-mode-activated"); diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index d687cc3c310..c4b489242fa 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -365,7 +365,7 @@ openerp.web.DataSet = openerp.web.Widget.extend( /** @lends openerp.web.DataSet }, callback, error_callback); }, /** - * Deletes an existing record from the dataweb + * Deletes an existing record from the database * * @param {Number|String} ids identifier of the record to delete * @param {Function} callback function called with operation result diff --git a/addons/web_calendar/__openerp__.py b/addons/web_calendar/__openerp__.py index b8f6a954082..ba18ef0490e 100644 --- a/addons/web_calendar/__openerp__.py +++ b/addons/web_calendar/__openerp__.py @@ -1,7 +1,7 @@ { - "name": "Base calendar", + "name": "web calendar", "version": "2.0", - "depends": ['base'], + "depends": ['web'], "js": [ 'static/lib/dhtmlxScheduler/codebase/dhtmlxscheduler_debug.js', 'static/lib/dhtmlxScheduler/codebase/ext/dhtmlxscheduler_minical.js', diff --git a/addons/web_calendar/controllers/main.py b/addons/web_calendar/controllers/main.py index 0211b3e4632..4cf65bae77f 100644 --- a/addons/web_calendar/controllers/main.py +++ b/addons/web_calendar/controllers/main.py @@ -1,9 +1,9 @@ -import base.common as openerpweb +import web.common as openerpweb -from base.controllers.main import View +from web.controllers.main import View class CalendarView(View): - _cp_path = "/base_calendar/calendarview" + _cp_path = "/web_calendar/calendarview" @openerpweb.jsonrequest def load(self, req, model, view_id, toolbar=False): diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js index 808c1ba31ab..b9673b082b2 100644 --- a/addons/web_calendar/static/src/js/calendar.js +++ b/addons/web_calendar/static/src/js/calendar.js @@ -1,11 +1,11 @@ /*--------------------------------------------------------- - * OpenERP base_calendar + * OpenERP web_calendar *---------------------------------------------------------*/ -openerp.base_calendar = function(openerp) { -QWeb.add_template('/base_calendar/static/src/xml/base_calendar.xml'); -openerp.base.views.add('calendar', 'openerp.base_calendar.CalendarView'); -openerp.base_calendar.CalendarView = openerp.base.View.extend({ +openerp.web_calendar = function(openerp) { +QWeb.add_template('/web_calendar/static/src/xml/web_calendar.xml'); +openerp.web.views.add('calendar', 'openerp.web_calendar.CalendarView'); +openerp.web_calendar.CalendarView = openerp.web.View.extend({ // Dhtmlx scheduler ? init: function(parent, element_id, dataset, view_id, options) { this._super(parent, element_id); @@ -19,7 +19,7 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({ this.creating_event_id = null; this.dataset_events = []; if (this.options.action_views_ids.form) { - this.form_dialog = new openerp.base_calendar.CalendarFormDialog(this, {}, this.options.action_views_ids.form, dataset); + this.form_dialog = new openerp.web_calendar.CalendarFormDialog(this, {}, this.options.action_views_ids.form, dataset); this.form_dialog.start(); } this.COLOR_PALETTE = ['#f57900', '#cc0000', '#d400a8', '#75507b', '#3465a4', '#73d216', '#c17d11', '#edd400', @@ -29,7 +29,7 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({ this.color_map = {}; }, start: function() { - this.rpc("/base_calendar/calendarview/load", {"model": this.model, "view_id": this.view_id, 'toolbar': true}, this.on_loaded); + this.rpc("/web_calendar/calendarview/load", {"model": this.model, "view_id": this.view_id, 'toolbar': true}, this.on_loaded); }, stop: function() { scheduler.clearAll(); @@ -75,10 +75,10 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({ this.$element.html(QWeb.render("CalendarView", {"fields_view": this.fields_view})); if (this.options.sidebar && this.options.sidebar_id) { - this.sidebar = new openerp.base.Sidebar(this, this.options.sidebar_id); + this.sidebar = new openerp.web.Sidebar(this, this.options.sidebar_id); this.sidebar.start(); - this.sidebar.navigator = new openerp.base_calendar.SidebarNavigator(this.sidebar, this.sidebar.add_section('navigator', "Navigator"), this); - this.sidebar.responsible = new openerp.base_calendar.SidebarResponsible(this.sidebar, this.sidebar.add_section('responsible', "Responsible"), this); + this.sidebar.navigator = new openerp.web_calendar.SidebarNavigator(this.sidebar, this.sidebar.add_section('navigator', "Navigator"), this); + this.sidebar.responsible = new openerp.web_calendar.SidebarResponsible(this.sidebar, this.sidebar.add_section('responsible', "Responsible"), this); this.sidebar.add_toolbar(data.fields_view.toolbar); this.set_common_sidebar_sections(this.sidebar); this.sidebar.do_unfold(); @@ -180,10 +180,10 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({ } if (this.fields[this.date_start]['type'] == 'date') { - evt[this.date_start] = openerp.base.str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss'); + evt[this.date_start] = openerp.web.str_to_date(evt[this.date_start]).set({hour: 9}).toString('yyyy-MM-dd HH:mm:ss'); } if (this.date_stop && evt[this.date_stop] && this.fields[this.date_stop]['type'] == 'date') { - evt[this.date_stop] = openerp.base.str_to_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss'); + evt[this.date_stop] = openerp.web.str_to_date(evt[this.date_stop]).set({hour: 17}).toString('yyyy-MM-dd HH:mm:ss'); } res_events.push(this.convert_event(evt)); } @@ -195,8 +195,8 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({ } }, convert_event: function(evt) { - var date_start = openerp.base.str_to_datetime(evt[this.date_start]), - date_stop = this.date_stop ? openerp.base.str_to_datetime(evt[this.date_stop]) : null, + var date_start = openerp.web.str_to_datetime(evt[this.date_start]), + date_stop = this.date_stop ? openerp.web.str_to_datetime(evt[this.date_stop]) : null, date_delay = evt[this.date_delay] || null, res_text = '', res_description = []; @@ -280,9 +280,9 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({ var data = { name: event_obj.text }; - data[this.date_start] = openerp.base.datetime_to_str(event_obj.start_date); + data[this.date_start] = openerp.web.datetime_to_str(event_obj.start_date); if (this.date_stop) { - data[this.date_stop] = openerp.base.datetime_to_str(event_obj.end_date); + data[this.date_stop] = openerp.web.datetime_to_str(event_obj.end_date); } if (this.date_delay) { var diff_seconds = Math.round((event_obj.end_date.getTime() - event_obj.start_date.getTime()) / 1000); @@ -294,7 +294,7 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({ var self = this; scheduler.clearAll(); $.when(this.has_been_loaded).then(function() { - self.rpc('/base/session/eval_domain_and_context', { + self.rpc('/web/session/eval_domain_and_context', { domains: domains, contexts: contexts, group_by_seq: groupbys @@ -334,7 +334,7 @@ openerp.base_calendar.CalendarView = openerp.base.View.extend({ } }); -openerp.base_calendar.CalendarFormDialog = openerp.base.Dialog.extend({ +openerp.web_calendar.CalendarFormDialog = openerp.web.Dialog.extend({ init: function(view, options, view_id, dataset) { this._super(view, options); this.dataset = dataset; @@ -343,7 +343,7 @@ openerp.base_calendar.CalendarFormDialog = openerp.base.Dialog.extend({ }, start: function() { this._super(); - this.form = new openerp.base.FormView(this, this.element_id, this.dataset, this.view_id, { + this.form = new openerp.web.FormView(this, this.element_id, this.dataset, this.view_id, { sidebar: false, pager: false }); @@ -368,7 +368,7 @@ openerp.base_calendar.CalendarFormDialog = openerp.base.Dialog.extend({ } }); -openerp.base_calendar.SidebarResponsible = openerp.base.Widget.extend({ +openerp.web_calendar.SidebarResponsible = openerp.web.Widget.extend({ init: function(parent, element_id, view) { this._super(parent, element_id); this.view = view; @@ -394,7 +394,7 @@ openerp.base_calendar.SidebarResponsible = openerp.base.Widget.extend({ } }); -openerp.base_calendar.SidebarNavigator = openerp.base.Widget.extend({ +openerp.web_calendar.SidebarNavigator = openerp.web.Widget.extend({ init: function(parent, element_id, view) { this._super(parent, element_id); this.view = view; diff --git a/addons/web_chat/__openerp__.py b/addons/web_chat/__openerp__.py index 6bd08f81e6a..c5e2fa7fc13 100644 --- a/addons/web_chat/__openerp__.py +++ b/addons/web_chat/__openerp__.py @@ -1,7 +1,7 @@ { "name": "Web Chat", "version": "2.0", - "depends": ['base'], + "depends": ['web'], "js": [ 'static/lib/AjaxIM/js/jquery.jsonp-1.1.0.js', 'static/lib/AjaxIM/js/jquery.jstore-all-min.js', diff --git a/addons/web_chat/controllers/main.py b/addons/web_chat/controllers/main.py index e445eb4be6d..1e0710163f8 100644 --- a/addons/web_chat/controllers/main.py +++ b/addons/web_chat/controllers/main.py @@ -2,7 +2,7 @@ import time import simplejson -import base.common as openerpweb +import web.common as openerpweb #---------------------------------------------------------- # OpenERP Web ajaxim Controllers diff --git a/addons/web_dashboard/__openerp__.py b/addons/web_dashboard/__openerp__.py index e6248c2c515..e4bad9c1eaf 100644 --- a/addons/web_dashboard/__openerp__.py +++ b/addons/web_dashboard/__openerp__.py @@ -1,7 +1,7 @@ { - "name": "Base Dashboard", + "name": "web Dashboard", "version": "2.0", - "depends": ['base'], + "depends": ['web'], "js": [ 'static/src/js/dashboard.js' ], diff --git a/addons/web_dashboard/controllers.py b/addons/web_dashboard/controllers.py index 2ebfefab1e8..80235492c0f 100644 --- a/addons/web_dashboard/controllers.py +++ b/addons/web_dashboard/controllers.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import base.common as openerpweb +import web.common as openerpweb WIDGET_CONTENT_PATTERN = """ @@ -19,7 +19,7 @@ WIDGET_CONTENT_PATTERN = """ """ class Widgets(openerpweb.Controller): - _cp_path = '/base_dashboard/widgets' + _cp_path = '/web_dashboard/widgets' @openerpweb.httprequest def content(self, request, widget_id): diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index f83d841d19a..8b44f05c789 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -1,8 +1,8 @@ -openerp.base_dashboard = function(openerp) { +openerp.web_dashboard = function(openerp) { -QWeb.add_template('/base_dashboard/static/src/xml/base_dashboard.xml'); +QWeb.add_template('/web_dashboard/static/src/xml/web_dashboard.xml'); -openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ +openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ init: function(view, node) { this._super(view, node); this.template = 'DashBoard'; @@ -36,7 +36,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ delete(action.attrs.height); delete(action.attrs.colspan); self.actions_attrs[action.attrs.name] = action.attrs; - self.rpc('/base/action/load', { + self.rpc('/web/action/load', { action_id: parseInt(action.attrs.name, 10) }, self.on_load_action); }); @@ -48,20 +48,20 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ }); }, on_undo: function() { - this.rpc('/base/view/undo_custom', { + this.rpc('/web/view/undo_custom', { view_id: this.view.fields_view.view_id }, this.do_reload); }, on_reset: function() { - this.rpc('/base/view/undo_custom', { + this.rpc('/web/view/undo_custom', { view_id: this.view.fields_view.view_id, reset: true }, this.do_reload); }, on_add_widget: function() { var self = this; - var action_manager = new openerp.base.ActionManager(this); - var dialog = new openerp.base.Dialog(this, { + var action_manager = new openerp.web.ActionManager(this); + var dialog = new openerp.web.Dialog(this, { title : 'Actions', width: 800, height: 600, @@ -97,7 +97,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ qdict = { view : this.view }; // TODO: should load multiple actions at once _.each(actions, function(aid) { - self.rpc('/base/action/load', { + self.rpc('/web/action/load', { action_id: aid }, function(result) { self.actions_attrs[aid] = { @@ -209,7 +209,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ board.columns.push(actions); }); var arch = QWeb.render('DashBoard.xml', board); - this.rpc('/base/view/add_custom', { + this.rpc('/web/view/add_custom', { view_id: this.view.fields_view.view_id, arch: arch }, function() { @@ -225,7 +225,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ action_buttons : false, pager: false }; - var am = new openerp.base.ActionManager(this); + var am = new openerp.web.ActionManager(this); this.action_managers.push(am); am.appendTo($("#"+this.view.element_id + '_action_' + action.id)); am.do_action(action); @@ -250,7 +250,7 @@ openerp.base.form.DashBoard = openerp.base.form.Widget.extend({ this.view.start(); } }); -openerp.base.form.DashBoardLegacy = openerp.base.form.DashBoard.extend({ +openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({ render: function() { if (this.node.tag == 'hpaned') { this.node.attrs.style = '1-1'; @@ -274,21 +274,21 @@ openerp.base.form.DashBoardLegacy = openerp.base.form.DashBoard.extend({ } }); -openerp.base.form.widgets.add('hpaned', 'openerp.base.form.DashBoardLegacy'); -openerp.base.form.widgets.add('vpaned', 'openerp.base.form.DashBoardLegacy'); -openerp.base.form.widgets.add('board', 'openerp.base.form.DashBoard'); +openerp.web.form.widgets.add('hpaned', 'openerp.web.form.DashBoardLegacy'); +openerp.web.form.widgets.add('vpaned', 'openerp.web.form.DashBoardLegacy'); +openerp.web.form.widgets.add('board', 'openerp.web.form.DashBoard'); -openerp.base.client_actions.add( - 'board.config.overview', 'openerp.base_dashboard.ConfigOverview' +openerp.web.client_actions.add( + 'board.config.overview', 'openerp.web_dashboard.ConfigOverview' ); -if (!openerp.base_dashboard) { - openerp.base_dashboard = {}; +if (!openerp.web_dashboard) { + openerp.web_dashboard = {}; } -openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({ +openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({ template: 'ConfigOverview', init: function (parent, element_id) { this._super(parent, element_id); - this.dataset = new openerp.base.DataSetSearch( + this.dataset = new openerp.web.DataSetSearch( this, 'ir.actions.todo'); this.dataset.domain = [['type', '=', 'manual']]; }, @@ -345,13 +345,13 @@ openerp.base_dashboard.ConfigOverview = openerp.base.View.extend({ } }); -openerp.base.client_actions.add( - 'board.home.applications', 'openerp.base_dashboard.ApplicationTiles'); -openerp.base_dashboard.ApplicationTiles = openerp.base.View.extend({ +openerp.web.client_actions.add( + 'board.home.applications', 'openerp.web_dashboard.ApplicationTiles'); +openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({ template: 'ApplicationTiles', start: function () { var self = this; - return new openerp.base.DataSetSearch( + return new openerp.web.DataSetSearch( this, 'ir.ui.menu', null, [['parent_id', '=', false]]) .read_slice( ['name', 'web_icon_data', 'web_icon_hover_data'], {}, function (applications) { // Create a matrix of 3*x applications @@ -371,16 +371,16 @@ openerp.base_dashboard.ApplicationTiles = openerp.base.View.extend({ }); } }); -openerp.base.client_actions.add( - 'board.home.widgets', 'openerp.base_dashboard.Widget'); -openerp.base_dashboard.Widget = openerp.base.View.extend(/** @lends openerp.base_dashboard.Widgets# */{ +openerp.web.client_actions.add( + 'board.home.widgets', 'openerp.web_dashboard.Widget'); +openerp.web_dashboard.Widget = openerp.web.View.extend(/** @lends openerp.web_dashboard.Widgets# */{ template: 'HomeWidget', /** * Initializes a "HomeWidget" client widget: handles the display of a given * res.widget objects in an OpenERP view (mainly a dashboard). * * @constructs - * @extends openerp.base.View + * @extends openerp.web.View * @param {Object} parent * @param {Object} options * @param {Number} options.widget_id @@ -390,13 +390,13 @@ openerp.base_dashboard.Widget = openerp.base.View.extend(/** @lends openerp.base this.widget_id = options.widget_id; }, start: function () { - return new openerp.base.DataSet(this, 'res.widget').read_ids( + return new openerp.web.DataSet(this, 'res.widget').read_ids( [this.widget_id], ['title'], this.on_widget_loaded); }, on_widget_loaded: function (widgets) { var widget = widgets[0]; var url = _.sprintf( - '/base_dashboard/widgets/content?session_id=%s&widget_id=%d', + '/web_dashboard/widgets/content?session_id=%s&widget_id=%d', this.session.session_id, widget.id); this.$element.html(QWeb.render('HomeWidget.content', { widget: widget, diff --git a/addons/web_dashboard/static/src/xml/base_dashboard.xml b/addons/web_dashboard/static/src/xml/base_dashboard.xml index b60e466964b..e03e21b6487 100644 --- a/addons/web_dashboard/static/src/xml/base_dashboard.xml +++ b/addons/web_dashboard/static/src/xml/base_dashboard.xml @@ -2,19 +2,19 @@
@@ -32,7 +32,7 @@

- + @@ -48,9 +48,9 @@

  • - + + src="/web/static/src/img/icons/gtk-apply.png" width="16" height="16" class="oe-selected-layout"/>

diff --git a/addons/web_default_home/__openerp__.py b/addons/web_default_home/__openerp__.py index 097ff0e19c0..2093e6236f0 100644 --- a/addons/web_default_home/__openerp__.py +++ b/addons/web_default_home/__openerp__.py @@ -1,7 +1,7 @@ { "name" : "OpenERP Web installer home", "version" : "2.0", - "depends" : ['base'], + "depends" : ['web'], 'active': True, 'js': ['static/src/js/home.js'], 'css': ['static/src/css/home.css'] diff --git a/addons/web_default_home/static/src/js/home.js b/addons/web_default_home/static/src/js/home.js index 57b5fab71f3..9acafdf6a8d 100644 --- a/addons/web_default_home/static/src/js/home.js +++ b/addons/web_default_home/static/src/js/home.js @@ -1,7 +1,7 @@ -openerp.base_default_home = function (openerp) { - QWeb.add_template('/base_default_home/static/src/xml/base_default_home.xml'); +openerp.web_default_home = function (openerp) { + QWeb.add_template('/web_default_home/static/src/xml/web_default_home.xml'); - openerp.base_default_home = { + openerp.web_default_home = { applications: [ [ { @@ -49,7 +49,7 @@ openerp.base_default_home = function (openerp) { ] }; - openerp.base.WebClient.include({ + openerp.web.WebClient.include({ default_home: function () { var self = this, // resig class can't handle _super in async contexts, by the @@ -57,8 +57,8 @@ openerp.base_default_home = function (openerp) { // reset to a baseline value of this.prototype (or something // like that) old_home = this._super; - var Installer = new openerp.base.DataSet( - this, 'base.setup.installer'); + var Installer = new openerp.web.DataSet( + this, 'web.setup.installer'); Installer.call('already_installed', [], function (installed_modules) { if (!_(installed_modules).isEmpty()) { return old_home.call(self); @@ -74,9 +74,9 @@ openerp.base_default_home = function (openerp) { } }); - openerp.base.client_actions.add( - 'home.default', 'openerp.base_default_home.DefaultHome'); - openerp.base_default_home.DefaultHome = openerp.base.View.extend({ + openerp.web.client_actions.add( + 'home.default', 'openerp.web_default_home.DefaultHome'); + openerp.web_default_home.DefaultHome = openerp.web.View.extend({ template: 'StaticHome', start: function () { var r = this._super(), self = this; @@ -89,15 +89,15 @@ openerp.base_default_home = function (openerp) { return this._super({ url: window.location.protocol + '//' + window.location.host + window.location.pathname, session: this.session, - rows: openerp.base_default_home.applications + rows: openerp.web_default_home.applications }) }, install_module: function (module_name) { - var Modules = new openerp.base.DataSetSearch( + var Modules = new openerp.web.DataSetSearch( this, 'ir.module.module', null, [['name', '=', module_name], ['state', '=', 'uninstalled']]); - var Upgrade = new openerp.base.DataSet(this, 'base.module.upgrade'); + var Upgrade = new openerp.web.DataSet(this, 'web.module.upgrade'); - $.blockUI({message:''}); + $.blockUI({message:''}); Modules.read_slice(['id'], {}, function (records) { if (!(records.length === 1)) { return; } Modules.call('state_update', diff --git a/addons/web_default_home/static/src/xml/base_default_home.xml b/addons/web_default_home/static/src/xml/base_default_home.xml index 9ed7415afb6..5ee11387db9 100644 --- a/addons/web_default_home/static/src/xml/base_default_home.xml +++ b/addons/web_default_home/static/src/xml/base_default_home.xml @@ -14,7 +14,7 @@ diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py index 92b768896f9..cb3ff1cfe48 100644 --- a/addons/web_diagram/__openerp__.py +++ b/addons/web_diagram/__openerp__.py @@ -1,5 +1,5 @@ { - "name" : "OpenERP Web base Diagram", + "name" : "OpenERP Web web Diagram", "version" : "2.0", "depends" : [], 'active': False, diff --git a/addons/web_diagram/controllers/main.py b/addons/web_diagram/controllers/main.py index 8e258810eca..4824a7c530f 100644 --- a/addons/web_diagram/controllers/main.py +++ b/addons/web_diagram/controllers/main.py @@ -1,8 +1,8 @@ -import base.common as openerpweb -from base.controllers.main import View +import web.common as openerpweb +from web.controllers.main import View class DiagramView(View): - _cp_path = "/base_diagram/diagram" + _cp_path = "/web_diagram/diagram" @openerpweb.jsonrequest def load(self, req, model, view_id): diff --git a/addons/web_diagram/static/src/js/diagram.js b/addons/web_diagram/static/src/js/diagram.js index b992b5cbf42..22149be11a0 100644 --- a/addons/web_diagram/static/src/js/diagram.js +++ b/addons/web_diagram/static/src/js/diagram.js @@ -1,11 +1,11 @@ /*--------------------------------------------------------- - * OpenERP base library + * OpenERP web library *---------------------------------------------------------*/ -openerp.base.diagram = function (openerp) { +openerp.web.diagram = function (openerp) { -openerp.base.views.add('diagram', 'openerp.base.DiagramView'); -openerp.base.DiagramView = openerp.base.Widget.extend({ +openerp.web.views.add('diagram', 'openerp.web.DiagramView'); +openerp.web.DiagramView = openerp.web.Widget.extend({ init: function(view_manager, session, element_id, dataset, view_id){ this._super(session, element_id); this.view_manager = view_manager; @@ -20,7 +20,7 @@ openerp.base.DiagramView = openerp.base.Widget.extend({ console.log('data set>>',this.dataset) }, start: function() { - this.rpc("/base_diagram/diagram/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded); + this.rpc("/web_diagram/diagram/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded); }, toTitleCase: function(str) { @@ -99,7 +99,7 @@ openerp.base.DiagramView = openerp.base.Widget.extend({ if(this.id) { this.rpc( - '/base_diagram/diagram/get_diagram_info', + '/web_diagram/diagram/get_diagram_info', { 'id': this.id, 'model': this.model, diff --git a/addons/web_gantt/__openerp__.py b/addons/web_gantt/__openerp__.py index c23f352a4f7..6d857e5dc48 100644 --- a/addons/web_gantt/__openerp__.py +++ b/addons/web_gantt/__openerp__.py @@ -1,7 +1,7 @@ { - "name": "Base Gantt", + "name": "web Gantt", "version": "2.0", - "depends": ['base'], + "depends": ['web'], "js": [ 'static/lib/dhtmlxGantt/sources/dhtmlxcommon.js', 'static/lib/dhtmlxGantt/sources/dhtmlxgantt.js', diff --git a/addons/web_gantt/controllers/main.py b/addons/web_gantt/controllers/main.py index 56fb2b7e79f..4f7e9201b38 100644 --- a/addons/web_gantt/controllers/main.py +++ b/addons/web_gantt/controllers/main.py @@ -1,8 +1,8 @@ -import base.common as openerpweb -from base.controllers.main import View +import web.common as openerpweb +from web.controllers.main import View class GanttView(View): - _cp_path = "/base_gantt/ganttview" + _cp_path = "/web_gantt/ganttview" @openerpweb.jsonrequest def load(self, req, model, view_id): diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index ad44382397b..b437e190fa9 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -1,14 +1,14 @@ /*--------------------------------------------------------- - * OpenERP base_gantt + * OpenERP web_gantt *---------------------------------------------------------*/ -openerp.base_gantt = function (openerp) { -QWeb.add_template('/base_gantt/static/src/xml/base_gantt.xml'); -openerp.base.views.add('gantt', 'openerp.base_gantt.GanttView'); -openerp.base_gantt.GanttView = openerp.base.View.extend({ +openerp.web_gantt = function (openerp) { +QWeb.add_template('/web_gantt/static/src/xml/web_gantt.xml'); +openerp.web.views.add('gantt', 'openerp.web_gantt.GanttView'); +openerp.web_gantt.GanttView = openerp.web.View.extend({ init: function(parent, element_id, dataset, view_id) { this._super(parent, element_id); - this.view_manager = parent || new openerp.base.NullViewManager(); + this.view_manager = parent || new openerp.web.NullViewManager(); this.dataset = dataset; this.model = dataset.model; this.view_id = view_id; @@ -31,7 +31,7 @@ init: function(parent, element_id, dataset, view_id) { }, start: function() { - this.rpc("/base_gantt/ganttview/load", + this.rpc("/web_gantt/ganttview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded); }, @@ -67,7 +67,7 @@ init: function(parent, element_id, dataset, view_id) { create_gantt: function() { ganttChartControl = new GanttChart(this.day_length); - ganttChartControl.setImagePath("/base_gantt/static/lib/dhtmlxGantt/codebase/imgs/"); + ganttChartControl.setImagePath("/web_gantt/static/lib/dhtmlxGantt/codeweb/imgs/"); ganttChartControl.setEditable(true); ganttChartControl.showTreePanel(true); ganttChartControl.showContextMenu(true); @@ -425,7 +425,7 @@ init: function(parent, element_id, dataset, view_id) { } } }); - var action_manager = new openerp.base.ActionManager(this, element_id); + var action_manager = new openerp.web.ActionManager(this, element_id); action_manager.start(); action_manager.do_action(action); @@ -474,24 +474,24 @@ init: function(parent, element_id, dataset, view_id) { convert_str_date: function (str){ if (str.length == 19){ this.format = "yyyy-MM-dd HH:mm:ss"; - return openerp.base.str_to_datetime(str); + return openerp.web.str_to_datetime(str); } else if (str.length == 10){ this.format = "yyyy-MM-dd"; - return openerp.base.str_to_date(str); + return openerp.web.str_to_date(str); } else if (str.length == 8){ this.format = "HH:mm:ss"; - return openerp.base.str_to_time(str); + return openerp.web.str_to_time(str); } throw "Unrecognized date/time format"; }, convert_date_str: function(full_date) { if (this.format == "yyyy-MM-dd HH:mm:ss"){ - return openerp.base.datetime_to_str(full_date); + return openerp.web.datetime_to_str(full_date); } else if (this.format == "yyyy-MM-dd"){ - return openerp.base.date_to_str(full_date); + return openerp.web.date_to_str(full_date); } else if (this.format == "HH:mm:ss"){ - return openerp.base.time_to_str(full_date); + return openerp.web.time_to_str(full_date); } throw "Unrecognized date/time format"; }, @@ -508,7 +508,7 @@ init: function(parent, element_id, dataset, view_id) { do_search: function (domains, contexts, groupbys) { var self = this; this.grp = groupbys; - return this.rpc('/base/session/eval_domain_and_context', { + return this.rpc('/web/session/eval_domain_and_context', { domains: domains, contexts: contexts, group_by_seq: groupbys diff --git a/addons/web_graph/__openerp__.py b/addons/web_graph/__openerp__.py index c393953b9fd..4a1c4a6576f 100644 --- a/addons/web_graph/__openerp__.py +++ b/addons/web_graph/__openerp__.py @@ -1,7 +1,7 @@ { - "name": "Base Graph", + "name": "web Graph", "version": "2.0", - "depends": ['base'], + "depends": ['web'], "js": [ "static/lib/dhtmlxGraph/codebase/dhtmlxchart.js", "static/src/js/graph.js"], diff --git a/addons/web_graph/controllers/main.py b/addons/web_graph/controllers/main.py index f326faf3854..cda868c0809 100644 --- a/addons/web_graph/controllers/main.py +++ b/addons/web_graph/controllers/main.py @@ -1,8 +1,8 @@ -from base.controllers.main import View -import base.common as openerpweb +from web.controllers.main import View +import web.common as openerpweb class GraphView(View): - _cp_path = "/base_graph/graphview" + _cp_path = "/web_graph/graphview" @openerpweb.jsonrequest def load(self, req, model, view_id): diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index e76d38b33bc..f5fd7c1953d 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -1,8 +1,8 @@ /*--------------------------------------------------------- - * OpenERP base_graph + * OpenERP web_graph *---------------------------------------------------------*/ -openerp.base_graph = function (openerp) { +openerp.web_graph = function (openerp) { var COLOR_PALETTE = [ '#cc99ff', '#ccccff', '#48D1CC', '#CFD784', '#8B7B8B', '#75507b', '#b0008c', '#ff0000', '#ff8e00', '#9000ff', '#0078ff', '#00ff00', @@ -12,9 +12,9 @@ var COLOR_PALETTE = [ '#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f', '#f57900', '#cc0000', '#d400a8']; -QWeb.add_template('/base_graph/static/src/xml/base_graph.xml'); -openerp.base.views.add('graph', 'openerp.base_graph.GraphView'); -openerp.base_graph.GraphView = openerp.base.View.extend({ +QWeb.add_template('/web_graph/static/src/xml/web_graph.xml'); +openerp.web.views.add('graph', 'openerp.web_graph.GraphView'); +openerp.web_graph.GraphView = openerp.web.View.extend({ init: function(parent, element_id, dataset, view_id) { this._super(parent, element_id); @@ -32,7 +32,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({ this.$element.hide(); }, start: function() { - return this.rpc("/base_graph/graphview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded); + return this.rpc("/web_graph/graphview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded); }, on_loaded: function(data) { this.all_fields = data.all_fields; @@ -455,7 +455,7 @@ openerp.base_graph.GraphView = openerp.base.View.extend({ do_search: function(domains, contexts, groupbys) { var self = this; - this.rpc('/base/session/eval_domain_and_context', { + this.rpc('/web/session/eval_domain_and_context', { domains: domains, contexts: contexts, group_by_seq: groupbys diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js index 551856e01fb..ad604cd3232 100644 --- a/addons/web_mobile/static/src/js/chrome_mobile.js +++ b/addons/web_mobile/static/src/js/chrome_mobile.js @@ -5,21 +5,21 @@ openerp.web_mobile.chrome_mobile = function(openerp) { openerp.web_mobile.mobilewebclient = function(element_id) { - // TODO Helper to start mobile webclient rename it openerp.base.webclient + // TODO Helper to start mobile webclient rename it openerp.web.webclient var client = new openerp.web_mobile.MobileWebClient(element_id); client.start(); return client; }; -openerp.web_mobile.MobileWebClient = openerp.base.Widget.extend({ +openerp.web_mobile.MobileWebClient = openerp.web.Widget.extend({ init: function(element_id) { var self = this; this._super(null, element_id); QWeb.add_template("xml/web_mobile.xml"); var params = {}; this.$element.html(QWeb.render("WebClient", {})); - this.session = new openerp.base.Session("oe_errors"); - this.crashmanager = new openerp.base.CrashManager(this); + this.session = new openerp.web.Session("oe_errors"); + this.crashmanager = new openerp.web.CrashManager(this); this.login = new openerp.web_mobile.Login(this, "oe_app"); // this.session.on_session_invalid.add(this.login.do_ask_login); }, @@ -29,14 +29,14 @@ openerp.web_mobile.MobileWebClient = openerp.base.Widget.extend({ } }); -openerp.web_mobile.Login = openerp.base.Widget.extend({ +openerp.web_mobile.Login = openerp.web.Widget.extend({ init: function(session, element_id) { this._super(session, element_id); }, start: function() { var self = this; jQuery("#oe_header").children().remove(); - this.rpc("/base/database/get_list", {}, function(result) { + this.rpc("/web/dataweb/get_list", {}, function(result) { var selection = new openerp.web_mobile.Selection(); self.db_list = result.db_list; self.$element.html(QWeb.render("Login", self)); @@ -50,7 +50,7 @@ openerp.web_mobile.Login = openerp.base.Widget.extend({ ev.preventDefault(); var self = this; var $e = this.$element; - var db = $e.find("div select[name=database]").val(); + var db = $e.find("div select[name=dataweb]").val(); var login = $e.find("div input[name=login]").val(); var password = $e.find("div input[name=password]").val(); //$e.hide(); @@ -87,7 +87,7 @@ openerp.web_mobile.Login = openerp.base.Widget.extend({ } }); -openerp.web_mobile.HomePage = openerp.base.Widget.extend({ +openerp.web_mobile.HomePage = openerp.web.Widget.extend({ init: function(session, element_id) { this._super(session, element_id); }, @@ -106,7 +106,7 @@ openerp.web_mobile.HomePage = openerp.base.Widget.extend({ } }); -openerp.web_mobile.Header = openerp.base.Widget.extend({ +openerp.web_mobile.Header = openerp.web.Widget.extend({ init: function(session, element_id) { this._super(session, element_id); }, @@ -125,13 +125,13 @@ openerp.web_mobile.Header = openerp.base.Widget.extend({ } }); -openerp.web_mobile.Shortcuts = openerp.base.Widget.extend({ +openerp.web_mobile.Shortcuts = openerp.web.Widget.extend({ init: function(session, element_id) { this._super(session, element_id); }, start: function() { var self = this; - this.rpc('/base/session/sc_list',{} ,function(res){ + this.rpc('/web/session/sc_list',{} ,function(res){ self.$element.html(QWeb.render("Shortcuts", {'sc' : res})) self.$element.find("a").click(self.on_clicked); }) @@ -146,7 +146,7 @@ openerp.web_mobile.Shortcuts = openerp.base.Widget.extend({ } }); -openerp.web_mobile.Menu = openerp.base.Widget.extend({ +openerp.web_mobile.Menu = openerp.web.Widget.extend({ init: function(session, element_id, secondary_menu_id) { this._super(session, element_id); this.secondary_menu_id = secondary_menu_id; @@ -154,7 +154,7 @@ openerp.web_mobile.Menu = openerp.base.Widget.extend({ this.menu = false; }, start: function() { - this.rpc("/base/menu/load", {}, this.on_loaded); + this.rpc("/web/menu/load", {}, this.on_loaded); }, on_loaded: function(data) { this.data = data; @@ -179,7 +179,7 @@ openerp.web_mobile.Menu = openerp.base.Widget.extend({ } }); -openerp.web_mobile.Secondary = openerp.base.Widget.extend({ +openerp.web_mobile.Secondary = openerp.web.Widget.extend({ init: function(session, element_id, secondary_menu_id) { this._super(session, element_id); this.data = secondary_menu_id; @@ -216,7 +216,7 @@ openerp.web_mobile.Secondary = openerp.base.Widget.extend({ } }); -openerp.web_mobile.Options = openerp.base.Widget.extend({ +openerp.web_mobile.Options = openerp.web.Widget.extend({ init: function(session, element_id) { this._super(session, element_id); }, @@ -232,7 +232,7 @@ openerp.web_mobile.Options = openerp.base.Widget.extend({ } }); -openerp.web_mobile.Selection = openerp.base.Widget.extend({ +openerp.web_mobile.Selection = openerp.web.Widget.extend({ init: function (){ this._super(); }, diff --git a/addons/web_mobile/static/src/js/form_mobile.js b/addons/web_mobile/static/src/js/form_mobile.js index 4a3e2167c02..bfcf3a0c291 100644 --- a/addons/web_mobile/static/src/js/form_mobile.js +++ b/addons/web_mobile/static/src/js/form_mobile.js @@ -4,7 +4,7 @@ openerp.web_mobile.form_mobile = function (openerp) { -openerp.web_mobile.FormView = openerp.base.Widget.extend({ +openerp.web_mobile.FormView = openerp.web.Widget.extend({ init: function(session, element_id, list_id, action) { this._super(session, element_id); this.list_id = list_id; @@ -21,14 +21,14 @@ openerp.web_mobile.FormView = openerp.base.Widget.extend({ id = this.list_id; model = this.action.res_model; view_id = this.action.views[1][0]; - this.dataset = new openerp.base.DataSetSearch(this, this.action.res_model, null, null); + this.dataset = new openerp.web.DataSetSearch(this, this.action.res_model, null, null); this.dataset.read_slice([],{}, function (result) { for (var i = 0; i < result.length; i++) { if (result[i].id == id) { var data = result[i]; } } - self.rpc("/base/formview/load", {"model": model, "view_id": view_id }, function (result) { + self.rpc("/web/formview/load", {"model": model, "view_id": view_id }, function (result) { var fields = result.fields_view.fields; var view_fields = result.fields_view.arch.children; var get_fields = self.get_fields(view_fields); diff --git a/addons/web_mobile/static/src/js/list_mobile.js b/addons/web_mobile/static/src/js/list_mobile.js index b4ba5e08cc3..d168076729c 100644 --- a/addons/web_mobile/static/src/js/list_mobile.js +++ b/addons/web_mobile/static/src/js/list_mobile.js @@ -4,13 +4,13 @@ openerp.web_mobile.list_mobile = function (openerp) { -openerp.web_mobile.ListView = openerp.base.Widget.extend({ +openerp.web_mobile.ListView = openerp.web.Widget.extend({ init: function(session, element_id, list_id) { this._super(session, element_id); this.list_id = list_id; }, start: function() { - this.rpc('/base/menu/action', {'menu_id': this.list_id}, + this.rpc('/web/menu/action', {'menu_id': this.list_id}, this.on_menu_action_loaded); }, on_menu_action_loaded: function(data) { @@ -41,7 +41,7 @@ openerp.web_mobile.ListView = openerp.base.Widget.extend({ } var self = this; - var dataset = new openerp.base.DataSetStatic(this, this.action.res_model, this.action.context); + var dataset = new openerp.web.DataSetStatic(this, this.action.res_model, this.action.context); dataset.domain=[['name','ilike',search_val]]; dataset.name_search(search_val, dataset.domain, 'ilike',false ,function(result){ self.$element.html(QWeb.render("ListView", {'records' : result})); diff --git a/addons/web_rpc/__openerp__.py b/addons/web_rpc/__openerp__.py index c1c744da43b..f0cc1dbdaa8 100644 --- a/addons/web_rpc/__openerp__.py +++ b/addons/web_rpc/__openerp__.py @@ -1,20 +1,20 @@ { - "name" : "OpenERP Web base", + "name" : "OpenERP Web web", "version" : "2.0", "depends" : [], 'active': False, 'js' : [ - "../base/static/lib/datejs/date-en-US.js", - "../base/static/lib/jquery/jquery-1.6.2.js", - "../base/static/lib/json/json2.js", - "../base/static/lib/qweb/qweb2.js", - "../base/static/lib/underscore/underscore.js", - "../base/static/lib/underscore/underscore.string.js", - "../base/static/src/js/boot.js", - "../base/static/src/js/core.js", - "../base/static/src/js/formats.js", - "../base/static/src/js/chrome.js", - "../base/static/src/js/data.js", + "../web/static/lib/datejs/date-en-US.js", + "../web/static/lib/jquery/jquery-1.6.2.js", + "../web/static/lib/json/json2.js", + "../web/static/lib/qweb/qweb2.js", + "../web/static/lib/underscore/underscore.js", + "../web/static/lib/underscore/underscore.string.js", + "../web/static/src/js/boot.js", + "../web/static/src/js/core.js", + "../web/static/src/js/formats.js", + "../web/static/src/js/chrome.js", + "../web/static/src/js/data.js", ], 'css' : [ ], diff --git a/openerp-web.py b/openerp-web.py index ee72c86eaa5..29a958b7834 100755 --- a/openerp-web.py +++ b/openerp-web.py @@ -32,13 +32,13 @@ optparser.add_option('--reloader', dest='reloader', default=False, action='store_true', help="Reload application when python files change") -import base.common.dispatch +import web.common.dispatch if __name__ == "__main__": (options, args) = optparser.parse_args(sys.argv[1:]) os.environ["TZ"] = "UTC" - app = base.common.dispatch.Root(options) + app = web.common.dispatch.Root(options) werkzeug.serving.run_simple( '0.0.0.0', options.socket_port, app,