Christophe (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-version-chs into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-version-chs/+merge/116227
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-version-chs/+merge/116227
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-version-chs.
=== modified file 'addons/web/common/session.py'
--- addons/web/common/session.py 2012-02-10 16:43:09 +0000
+++ addons/web/common/session.py 2012-07-23 09:58:45 +0000
@@ -54,6 +54,9 @@
else:
return self.model('publisher_warranty.contract').status()['status'] == 'full'
+ def openerp_version(self):
+ return self.proxy('common').version()['server']
+
def build_connection(self):
conn = openerplib.Connection(self.config.connector, database=self._db, login=self._login,
user_id=self._uid, password=self._password)
=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py 2012-07-16 14:29:18 +0000
+++ addons/web/controllers/main.py 2012-07-23 09:58:45 +0000
@@ -374,9 +374,7 @@
@openerpweb.jsonrequest
def version_info(self, req):
- return {
- "version": common.release.version
- }
+ return req.session.openerp_version()
class Proxy(openerpweb.Controller):
_cp_path = '/web/proxy'
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
