From 9241bce4156129737fd7702afcd39dc55f6efe9c Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Wed, 9 May 2012 11:42:01 +0530 Subject: [PATCH 1/4] [IMP] Title improvement. bzr revid: tta@openerp.com-20120509061201-tcq537146cbvxwyp --- addons/web/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 6c540fd6957..07b41cf1a2e 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -368,7 +368,7 @@
- Activate the developper mode + Activate the developer mode

OpenERP

Version

From 195cb2811dbce3bdbbfd4c470b581c3871fbdbf1 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Wed, 9 May 2012 19:12:00 +0530 Subject: [PATCH 2/4] Improve the Title bzr revid: tta@openerp.com-20120509134200-byd11lj0eokr6gpy --- addons/web/static/src/js/view_form.js | 1 + addons/web/static/src/js/views.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b1289512f4f..d0eda645196 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2930,6 +2930,7 @@ instance.web.form.One2ManyListView = instance.web.ListView.extend({ _template: 'One2Many.listview', do_add_record: function () { if (this.options.editable) { + console.log("this.options :: ",this.options); this._super.apply(this, arguments); } else { var self = this; diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 798c5bb1493..c4ff0efd70c 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -730,7 +730,7 @@ instance.web.Sidebar = instance.web.Widget.extend({ var view = this.getParent(); this.sections = [ { 'name' : 'print', 'label' : _t('Print'), }, - { 'name' : 'files', 'label' : _t('Attachement'), }, + { 'name' : 'files', 'label' : _t('Attachment'), }, { 'name' : 'other', 'label' : _t('More'), } ]; this.items = { From 7bfa84837251ca8f2248d818b7d2bea3931017c2 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 22 May 2012 18:11:33 +0200 Subject: [PATCH 3/4] [IMP] chrome webclient and login refactoring bzr revid: al@openerp.com-20120522161133-kjhhbl636evacnau --- addons/web/static/src/js/chrome.js | 82 +++++++++++++----------------- 1 file changed, 36 insertions(+), 46 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 47983ed322d..a16b8e22edc 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -521,14 +521,7 @@ instance.web.Login = instance.web.Widget.extend({ do_login: function (db, login, password) { var self = this; this.$element.removeClass('oe_login_invalid'); - this.session.on_session_invalid.add({ - callback: function () { - self.$element.addClass("oe_login_invalid"); - }, - unique: true - }); this.session.session_authenticate(db, login, password).then(function() { - self.$element.removeClass("oe_login_invalid"); if (self.has_local_storage) { if(self.remember_credentials) { localStorage.setItem('last_db_login_success', db); @@ -542,6 +535,9 @@ instance.web.Login = instance.web.Widget.extend({ localStorage.setItem('last_password_login_success', ''); } } + self.trigger("login"); + },function () { + self.$element.addClass("oe_login_invalid"); }); } }); @@ -849,47 +845,53 @@ instance.web.WebClient = instance.web.Widget.extend({ var self = this; this.$element.addClass("openerp openerp-web-client-container"); if (jQuery.param !== undefined && jQuery.deparam(jQuery.param.querystring()).kitten !== undefined) { - this.$element.addClass("kitten-mode-activated"); - this.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) { + self.$element.addClass("kitten-mode-activated"); + self.$element.delegate('img.oe-record-edit-link-img', 'hover', function(e) { self.$element.toggleClass('clark-gable'); }); } this.session.session_bind().then(function() { + self.destroy_content(); + self.show_common(); if (!self.session.session_is_valid()) { self.show_login(); - } - }); - this.session.on_session_valid.add(function() { - self.show_application(); - - if(self.action_manager) - self.action_manager.destroy(); - self.action_manager = new instance.web.ActionManager(self); - self.action_manager.appendTo(self.$element.find('.oe_application')); - self.bind_hashchange(); - var version_label = _t("OpenERP - Unsupported/Community Version"); - if (!self.session.openerp_entreprise) { - self.$element.find('.oe_footer_powered').append(_.str.sprintf(' - %s', version_label)); - document.title = version_label; + } else { + self.show_application(); } }); this.$element.on('mouseenter', '.oe_systray > div:not([data-tipsy=true])', function() { $(this).attr('data-tipsy', 'true').tipsy().trigger('mouseenter'); }); }, + show_common: function() { + var self = this; + this.crashmanager = new instance.web.CrashManager(); + instance.connection.on_rpc_error.add(this.crashmanager.on_rpc_error); + window.onerror = function (message, file, line) { + self.crashmanager.on_traceback({ + type: _t("Client Error"), + message: message, + data: {debug: file + ':' + line} + }); + }; + self.notification = new instance.web.Notification(this); + self.notification.appendTo(self.$element); + self.loading = new instance.web.Loading(self); + self.loading.appendTo(self.$element); + self.login = new instance.web.Login(self); + self.login.on("login",self,self.show_application); + self.$table = $(QWeb.render("WebClient", {})); + self.action_manager = new instance.web.ActionManager(self); + self.action_manager.appendTo(self.$table.find('.oe_application')); + }, show_login: function() { var self = this; - this.destroy_content(); - this.show_common(); - self.login = new instance.web.Login(self); self.login.appendTo(self.$element); }, show_application: function() { var self = this; - this.destroy_content(); - this.show_common(); - self.$table = $(QWeb.render("WebClient", {})); self.$element.append(self.$table); + self.login.$element.hide(); self.menu = new instance.web.Menu(self); self.menu.replace(this.$element.find('.oe_menu_placeholder')); self.menu.on('menu_click', this, this.on_menu_action); @@ -898,24 +900,12 @@ instance.web.WebClient = instance.web.Widget.extend({ self.user_menu.on_menu_logout.add(this.proxy('on_logout')); self.user_menu.on_action.add(this.proxy('on_menu_action')); self.user_menu.do_update(); - }, - show_common: function() { - var self = this; - if (!this.crashmanager) { - this.crashmanager = new instance.web.CrashManager(); - instance.connection.on_rpc_error.add(this.crashmanager.on_rpc_error); - window.onerror = function (message, file, line) { - self.crashmanager.on_traceback({ - type: _t("Client Error"), - message: message, - data: {debug: file + ':' + line} - }); - }; + self.bind_hashchange(); + var version_label = _t("OpenERP - Unsupported/Community Version"); + if (!self.session.openerp_entreprise) { + self.$element.find('.oe_footer_powered').append(_.str.sprintf(' - %s', version_label)); + document.title = version_label; } - this.notification = new instance.web.Notification(this); - this.notification.appendTo(this.$element); - this.loading = new instance.web.Loading(this); - this.loading.appendTo(this.$element); }, destroy_content: function() { _.each(_.clone(this.getChildren()), function(el) { From af78ec90eb9124f6ff4ecfb5bd9c95143978a177 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 22 May 2012 18:20:54 +0200 Subject: [PATCH 4/4] [IMP] login fadeout on sucess bzr revid: al@openerp.com-20120522162054-yul76usv01918qqj --- addons/web/static/src/js/chrome.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index a16b8e22edc..eb2dcad8624 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -535,6 +535,7 @@ instance.web.Login = instance.web.Widget.extend({ localStorage.setItem('last_password_login_success', ''); } } + self.$(".oe_login_pane").fadeOut("slow"); self.trigger("login"); },function () { self.$element.addClass("oe_login_invalid");