From 05be8f7cc57f168feb598d66dda5fad2873e42b9 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 5 Sep 2011 17:14:20 +0200 Subject: [PATCH] [imp] added creation of about message bzr revid: nicolas.vanhoren@openerp.com-20110905151420-nnjh005ol8dsouhx --- addons/web/controllers/main.py | 7 +++++++ addons/web/static/src/js/chrome.js | 8 ++++++++ addons/web/static/src/xml/base.xml | 2 +- webrelease.py | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index aa8dc6397c3..77d40733b83 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -11,6 +11,7 @@ import simplejson import textwrap import xmlrpclib import time +import webrelease from xml.etree import ElementTree from cStringIO import StringIO @@ -193,6 +194,12 @@ class WebClient(openerpweb.Controller): return {"modules": transs, "lang_parameters": lang_obj} + @openerpweb.jsonrequest + def version_info(self, req): + return { + "version": webrelease.version + } + class Database(openerpweb.Controller): _cp_path = "/web/database" diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 1f6baf79c9a..11950cd0520 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -545,9 +545,17 @@ openerp.web.Header = openerp.web.Widget.extend({ self.$content.appendTo(self.$element); self.$element.find(".logout").click(self.on_logout); self.$element.find("a.preferences").click(self.on_preferences); + self.$element.find(".about").click(self.on_about); self.shortcut_load(); }); }, + on_about: function() { + var self = this; + self.rpc("/web/webclient/version_info", {}).then(function(res) { + var $help = $(QWeb.render("About-Page", {version_info: res})); + debugger; + }); + }, do_reset: function() { this.$content.remove(); }, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 51b98807705..a9e2bc66b9d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1361,7 +1361,7 @@

OpenERP Web

-

Version 6.0.2

+

Version

Copyright © 2006-TODAY OpenERP SA. All Rights Reserved.
OpenERP is a trademark of the OpenERP SA Company. diff --git a/webrelease.py b/webrelease.py index e002ef32976..77eb46dd2c3 100644 --- a/webrelease.py +++ b/webrelease.py @@ -1,6 +1,6 @@ name = 'openerp-web-proto' -version = '6.0.1' +version = '6.1.0 alpha' description = "Web Client of OpenERP, the Enterprise Management Software" long_description = "OpenERP Web is the web client of the OpenERP, a free enterprise management software" author = "OpenERP S.A."