rename base to web part4 xmo review fixes
bzr revid: al@openerp.com-20110905134457-6y16fe1m6u22ggeq
This commit is contained in:
parent
29dee8243b
commit
4989aadc90
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"name" : "OpenERP Web web",
|
"name" : "web",
|
||||||
"version" : "2.0",
|
"version" : "2.0",
|
||||||
"depends" : [],
|
"depends" : [],
|
||||||
'active': True,
|
'active': True,
|
||||||
|
|
|
@ -412,7 +412,6 @@ class Root(object):
|
||||||
:returns: a callable matching the path sections, or ``None``
|
:returns: a callable matching the path sections, or ``None``
|
||||||
:rtype: ``Controller | None``
|
:rtype: ``Controller | None``
|
||||||
"""
|
"""
|
||||||
print "Find handler",l
|
|
||||||
if len(l) > 1:
|
if len(l) > 1:
|
||||||
for i in range(len(l), 1, -1):
|
for i in range(len(l), 1, -1):
|
||||||
ps = "/" + "/".join(l[0:i])
|
ps = "/" + "/".join(l[0:i])
|
||||||
|
|
|
@ -58,7 +58,7 @@ openerp.web_default_home = function (openerp) {
|
||||||
// like that)
|
// like that)
|
||||||
old_home = this._super;
|
old_home = this._super;
|
||||||
var Installer = new openerp.web.DataSet(
|
var Installer = new openerp.web.DataSet(
|
||||||
this, 'web.setup.installer');
|
this, 'base.setup.installer');
|
||||||
Installer.call('already_installed', [], function (installed_modules) {
|
Installer.call('already_installed', [], function (installed_modules) {
|
||||||
if (!_(installed_modules).isEmpty()) {
|
if (!_(installed_modules).isEmpty()) {
|
||||||
return old_home.call(self);
|
return old_home.call(self);
|
||||||
|
@ -95,7 +95,7 @@ openerp.web_default_home = function (openerp) {
|
||||||
install_module: function (module_name) {
|
install_module: function (module_name) {
|
||||||
var Modules = new openerp.web.DataSetSearch(
|
var Modules = new openerp.web.DataSetSearch(
|
||||||
this, 'ir.module.module', null, [['name', '=', module_name], ['state', '=', 'uninstalled']]);
|
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:'<img src="/web/static/src/img/throbber2.gif">'});
|
$.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'});
|
||||||
Modules.read_slice(['id'], {}, function (records) {
|
Modules.read_slice(['id'], {}, function (records) {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"name" : "OpenERP Web web Diagram",
|
"name" : "OpenERP Web Diagram",
|
||||||
"version" : "2.0",
|
"version" : "2.0",
|
||||||
"depends" : [],
|
"depends" : [],
|
||||||
'active': False,
|
'active': False,
|
||||||
|
|
|
@ -67,7 +67,7 @@ init: function(parent, element_id, dataset, view_id) {
|
||||||
create_gantt: function() {
|
create_gantt: function() {
|
||||||
|
|
||||||
ganttChartControl = new GanttChart(this.day_length);
|
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.setEditable(true);
|
||||||
ganttChartControl.showTreePanel(true);
|
ganttChartControl.showTreePanel(true);
|
||||||
ganttChartControl.showContextMenu(true);
|
ganttChartControl.showContextMenu(true);
|
||||||
|
|
|
@ -2,9 +2,9 @@
|
||||||
* OpenERP base_hello (Example module)
|
* 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() {
|
init:function() {
|
||||||
this._super.apply(this,arguments);
|
this._super.apply(this,arguments);
|
||||||
this.on_search.add(function(){console.log('hello');});
|
this.on_search.add(function(){console.log('hello');});
|
||||||
|
|
|
@ -36,7 +36,7 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({
|
||||||
start: function() {
|
start: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
jQuery("#oe_header").children().remove();
|
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();
|
var selection = new openerp.web_mobile.Selection();
|
||||||
self.db_list = result.db_list;
|
self.db_list = result.db_list;
|
||||||
self.$element.html(QWeb.render("Login", self));
|
self.$element.html(QWeb.render("Login", self));
|
||||||
|
@ -50,7 +50,7 @@ openerp.web_mobile.Login = openerp.web.Widget.extend({
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
var self = this;
|
var self = this;
|
||||||
var $e = this.$element;
|
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 login = $e.find("div input[name=login]").val();
|
||||||
var password = $e.find("div input[name=password]").val();
|
var password = $e.find("div input[name=password]").val();
|
||||||
//$e.hide();
|
//$e.hide();
|
||||||
|
|
Loading…
Reference in New Issue