From 4989aadc90baf74160b5a2bbd672390991caf5cf Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 5 Sep 2011 15:44:57 +0200 Subject: [PATCH] rename base to web part4 xmo review fixes bzr revid: al@openerp.com-20110905134457-6y16fe1m6u22ggeq --- addons/web/__openerp__.py | 2 +- addons/web/common/dispatch.py | 1 - addons/web_default_home/static/src/js/home.js | 4 ++-- addons/web_diagram/__openerp__.py | 2 +- addons/web_gantt/static/src/js/gantt.js | 2 +- addons/web_hello/static/openerp/base_hello.js | 4 ++-- addons/web_mobile/static/src/js/chrome_mobile.js | 4 ++-- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index 7688f467c0a..290bca17464 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -1,5 +1,5 @@ { - "name" : "OpenERP Web web", + "name" : "web", "version" : "2.0", "depends" : [], 'active': True, diff --git a/addons/web/common/dispatch.py b/addons/web/common/dispatch.py index 97fa50cbf48..e4ed31e9947 100644 --- a/addons/web/common/dispatch.py +++ b/addons/web/common/dispatch.py @@ -412,7 +412,6 @@ 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_default_home/static/src/js/home.js b/addons/web_default_home/static/src/js/home.js index 9acafdf6a8d..0d7386f14d6 100644 --- a/addons/web_default_home/static/src/js/home.js +++ b/addons/web_default_home/static/src/js/home.js @@ -58,7 +58,7 @@ openerp.web_default_home = function (openerp) { // like that) old_home = this._super; var Installer = new openerp.web.DataSet( - this, 'web.setup.installer'); + this, 'base.setup.installer'); Installer.call('already_installed', [], function (installed_modules) { if (!_(installed_modules).isEmpty()) { return old_home.call(self); @@ -95,7 +95,7 @@ openerp.web_default_home = function (openerp) { install_module: function (module_name) { var Modules = new openerp.web.DataSetSearch( this, 'ir.module.module', null, [['name', '=', module_name], ['state', '=', 'uninstalled']]); - var Upgrade = new openerp.web.DataSet(this, 'web.module.upgrade'); + var Upgrade = new openerp.web.DataSet(this, 'base.module.upgrade'); $.blockUI({message:''}); Modules.read_slice(['id'], {}, function (records) { diff --git a/addons/web_diagram/__openerp__.py b/addons/web_diagram/__openerp__.py index cb3ff1cfe48..50b159982ac 100644 --- a/addons/web_diagram/__openerp__.py +++ b/addons/web_diagram/__openerp__.py @@ -1,5 +1,5 @@ { - "name" : "OpenERP Web web Diagram", + "name" : "OpenERP Web Diagram", "version" : "2.0", "depends" : [], 'active': False, diff --git a/addons/web_gantt/static/src/js/gantt.js b/addons/web_gantt/static/src/js/gantt.js index b437e190fa9..a6d000737b4 100644 --- a/addons/web_gantt/static/src/js/gantt.js +++ b/addons/web_gantt/static/src/js/gantt.js @@ -67,7 +67,7 @@ init: function(parent, element_id, dataset, view_id) { create_gantt: function() { ganttChartControl = new GanttChart(this.day_length); - ganttChartControl.setImagePath("/web_gantt/static/lib/dhtmlxGantt/codeweb/imgs/"); + ganttChartControl.setImagePath("/web_gantt/static/lib/dhtmlxGantt/codebase/imgs/"); ganttChartControl.setEditable(true); ganttChartControl.showTreePanel(true); ganttChartControl.showContextMenu(true); diff --git a/addons/web_hello/static/openerp/base_hello.js b/addons/web_hello/static/openerp/base_hello.js index 5d6a02d355b..99c97006eac 100644 --- a/addons/web_hello/static/openerp/base_hello.js +++ b/addons/web_hello/static/openerp/base_hello.js @@ -2,9 +2,9 @@ * OpenERP base_hello (Example module) *---------------------------------------------------------*/ -openerp.base_hello = function(openerp) { +openerp.web_hello = function(openerp) { -openerp.base.SearchView = openerp.base.SearchView.extend({ +openerp.web.SearchView = openerp.web.SearchView.extend({ init:function() { this._super.apply(this,arguments); this.on_search.add(function(){console.log('hello');}); diff --git a/addons/web_mobile/static/src/js/chrome_mobile.js b/addons/web_mobile/static/src/js/chrome_mobile.js index ad604cd3232..6c99ffe3740 100644 --- a/addons/web_mobile/static/src/js/chrome_mobile.js +++ b/addons/web_mobile/static/src/js/chrome_mobile.js @@ -36,7 +36,7 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({ start: function() { var self = this; jQuery("#oe_header").children().remove(); - this.rpc("/web/dataweb/get_list", {}, function(result) { + this.rpc("/web/database/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.web.Widget.extend({ ev.preventDefault(); var self = this; var $e = this.$element; - var db = $e.find("div select[name=dataweb]").val(); + var db = $e.find("div select[name=database]").val(); var login = $e.find("div input[name=login]").val(); var password = $e.find("div input[name=password]").val(); //$e.hide();