From 7327d3d946b9bc93f9ac3a9d8d454ec493fc1ed8 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 25 Apr 2016 16:02:26 -0300 Subject: [PATCH 1/5] Mode server in login --- server_mode/controllers/main.py | 17 +++++++++++++++++ server_mode/oerp_develope_js.xml | 17 +++++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/server_mode/controllers/main.py b/server_mode/controllers/main.py index 62b9899..2eda612 100644 --- a/server_mode/controllers/main.py +++ b/server_mode/controllers/main.py @@ -5,6 +5,11 @@ ############################################################################## from openerp.addons.web import http from openerp.addons.server_mode import mode as custom_mode +from openerp.addons.web.controllers.main import Home +import openerp.tools as tools +from openerp.http import request +from openerp import http +from random import choice openerpweb = http @@ -17,4 +22,16 @@ def get_mode(self, req, db=False): return custom_mode.get_mode().upper() return False + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +# +class Mode_Server(Home): + + @http.route('/web/login', type='http', auth="none") + def web_login(self, redirect=None, **kw): + modet = tools.config.get('server_mode') + if modet: + request.params['mode'] = modet.upper() + + return super(Mode_Server, self).web_login(**kw) + diff --git a/server_mode/oerp_develope_js.xml b/server_mode/oerp_develope_js.xml index 4e39bd7..31fbca6 100644 --- a/server_mode/oerp_develope_js.xml +++ b/server_mode/oerp_develope_js.xml @@ -2,15 +2,24 @@ - + - + + + From 9f8c4c9d32389ed96d2ed73814e4ab6d167f5f52 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 25 Apr 2016 16:13:48 -0300 Subject: [PATCH 2/5] mode server in website login --- server_mode/oerp_develope_js.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/server_mode/oerp_develope_js.xml b/server_mode/oerp_develope_js.xml index 31fbca6..d2d7fab 100644 --- a/server_mode/oerp_develope_js.xml +++ b/server_mode/oerp_develope_js.xml @@ -18,6 +18,21 @@ + + From fde55e769fd1eaf403770c4eaf11760a92d20636 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 25 Apr 2016 16:46:59 -0300 Subject: [PATCH 3/5] not website install --- server_mode/oerp_develope_js.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/server_mode/oerp_develope_js.xml b/server_mode/oerp_develope_js.xml index d2d7fab..fc12ca1 100644 --- a/server_mode/oerp_develope_js.xml +++ b/server_mode/oerp_develope_js.xml @@ -18,20 +18,20 @@ - + + + + + + + + + + + + + + From 96dccc44215fb9fd2292e202100bc6553b63373d Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 25 Apr 2016 19:57:52 -0300 Subject: [PATCH 4/5] add server_mode_website --- server_mode/oerp_develope_js.xml | 15 +----- server_mode_website/__init__.py | 6 +++ server_mode_website/__openerp__.py | 59 +++++++++++++++++++++ server_mode_website/oerp_wb_develope_js.xml | 23 ++++++++ 4 files changed, 89 insertions(+), 14 deletions(-) create mode 100644 server_mode_website/__init__.py create mode 100644 server_mode_website/__openerp__.py create mode 100644 server_mode_website/oerp_wb_develope_js.xml diff --git a/server_mode/oerp_develope_js.xml b/server_mode/oerp_develope_js.xml index fc12ca1..feda6ba 100644 --- a/server_mode/oerp_develope_js.xml +++ b/server_mode/oerp_develope_js.xml @@ -18,20 +18,7 @@ - - - - - - - - - - - - - - + diff --git a/server_mode_website/__init__.py b/server_mode_website/__init__.py new file mode 100644 index 0000000..dfdb471 --- /dev/null +++ b/server_mode_website/__init__.py @@ -0,0 +1,6 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# For copyright and license notices, see __openerp__.py file in module root +# directory +############################################################################## + diff --git a/server_mode_website/__openerp__.py b/server_mode_website/__openerp__.py new file mode 100644 index 0000000..dc53a00 --- /dev/null +++ b/server_mode_website/__openerp__.py @@ -0,0 +1,59 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# Copyright (C) 2015 ADHOC SA (http://www.adhoc.com.ar) +# All Rights Reserved. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## +{ + 'name': 'Server Mode Website', + 'version': '8.0.0.1.3', + "author": "ADHOC SA", + "website": "www.adhoc.com.ar", + 'license': 'AGPL-3', + "category": "GenericModules", + 'sequence': 10, + 'description': """ +Server Mode +=========== +This modules disable some functions when running databases on odoo servers with +parameter server_mode = "some value" +This module is also inherited by other modules so that you can disable +functionalities depending on server mode. To use it: +* import with: from openerp.addons.server_mode.mode import get_mode +* use it like following: + * if mode() == 'test': + * if mode() == 'develop' + * if mode(): + ... etc + + """, + 'images': [], + 'depends': [ + "server_mode", + "website", + ], + 'data': [ + "oerp_wb_develope_js.xml", + ], + 'demo': [], + 'test': [], + 'installable': True, + 'auto_install': True, + 'application': False, + 'qweb': [], +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/server_mode_website/oerp_wb_develope_js.xml b/server_mode_website/oerp_wb_develope_js.xml new file mode 100644 index 0000000..f8b24d0 --- /dev/null +++ b/server_mode_website/oerp_wb_develope_js.xml @@ -0,0 +1,23 @@ + + + + + + + + + + From 64cdd3cad90e64bf9bf20bf4a7aea22485f1c746 Mon Sep 17 00:00:00 2001 From: Juan Jose Scarafia Date: Tue, 26 Apr 2016 12:27:03 -0300 Subject: [PATCH 5/5] IMP server mode --- server_mode/__openerp__.py | 2 +- .../migrations/8.0.0.2.0/post-migration.py | 37 +++++++++++++++++++ server_mode/static/src/css/ribbon.css | 6 +-- .../__init__.py | 0 .../__openerp__.py | 20 +++------- .../oerp_wb_develope_js.xml | 0 6 files changed, 46 insertions(+), 19 deletions(-) create mode 100644 server_mode/migrations/8.0.0.2.0/post-migration.py rename {server_mode_website => website_server_mode}/__init__.py (100%) rename {server_mode_website => website_server_mode}/__openerp__.py (75%) rename {server_mode_website => website_server_mode}/oerp_wb_develope_js.xml (100%) diff --git a/server_mode/__openerp__.py b/server_mode/__openerp__.py index cc6acc1..bb1489f 100644 --- a/server_mode/__openerp__.py +++ b/server_mode/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { 'name': 'Server Mode', - 'version': '8.0.0.1.3', + 'version': '8.0.0.2.0', "author": "ADHOC SA", "website": "www.adhoc.com.ar", 'license': 'AGPL-3', diff --git a/server_mode/migrations/8.0.0.2.0/post-migration.py b/server_mode/migrations/8.0.0.2.0/post-migration.py new file mode 100644 index 0000000..e69adcf --- /dev/null +++ b/server_mode/migrations/8.0.0.2.0/post-migration.py @@ -0,0 +1,37 @@ +# -*- encoding: utf-8 -*- +from openerp import SUPERUSER_ID +from openerp.modules.registry import RegistryManager + + +def migrate(cr, version): + print 'Migrating product_uom_prices' + if not version: + return + # registry = RegistryManager.get(cr.dbname) + if module_is_installed(cr, 'website'): + install_module(cr, 'website_server_mode') + + +def module_is_installed(cr, module): + registry = RegistryManager.get(cr.dbname) + model = registry['ir.module.module'] + module_ids = model.search( + cr, SUPERUSER_ID, + [('name', '=', module), ('state', '=', 'installed')], {}) + if module_ids: + return True + else: + return False + + +def install_module(cr, module): + registry = RegistryManager.get(cr.dbname) + model = registry['ir.module.module'] + module_ids = model.search( + cr, SUPERUSER_ID, + [('name', '=', module)], {}) + print 'install module %s' % module + print 'ids for module: %s' % module_ids + model.button_install( + cr, SUPERUSER_ID, module_ids, {}) + print 'module installed' diff --git a/server_mode/static/src/css/ribbon.css b/server_mode/static/src/css/ribbon.css index 627bd85..05d72c6 100644 --- a/server_mode/static/src/css/ribbon.css +++ b/server_mode/static/src/css/ribbon.css @@ -1,9 +1,9 @@ .test-ribbon{ - width: 200px; + width: 250px; background: #e43; position: absolute; - top: 50px; - left: -50px; + top: 40px; + left: -60px; text-align: center; line-height: 50px; letter-spacing: 1px; diff --git a/server_mode_website/__init__.py b/website_server_mode/__init__.py similarity index 100% rename from server_mode_website/__init__.py rename to website_server_mode/__init__.py diff --git a/server_mode_website/__openerp__.py b/website_server_mode/__openerp__.py similarity index 75% rename from server_mode_website/__openerp__.py rename to website_server_mode/__openerp__.py index dc53a00..92b56b5 100644 --- a/server_mode_website/__openerp__.py +++ b/website_server_mode/__openerp__.py @@ -19,7 +19,7 @@ # ############################################################################## { - 'name': 'Server Mode Website', + 'name': 'Website Server Mode', 'version': '8.0.0.1.3', "author": "ADHOC SA", "website": "www.adhoc.com.ar", @@ -27,25 +27,15 @@ "category": "GenericModules", 'sequence': 10, 'description': """ -Server Mode -=========== -This modules disable some functions when running databases on odoo servers with -parameter server_mode = "some value" -This module is also inherited by other modules so that you can disable -functionalities depending on server mode. To use it: -* import with: from openerp.addons.server_mode.mode import get_mode -* use it like following: - * if mode() == 'test': - * if mode() == 'develop' - * if mode(): - ... etc - +Website Server Mode +=================== +Link bewteen server_mode and website modules """, 'images': [], 'depends': [ "server_mode", "website", - ], + ], 'data': [ "oerp_wb_develope_js.xml", ], diff --git a/server_mode_website/oerp_wb_develope_js.xml b/website_server_mode/oerp_wb_develope_js.xml similarity index 100% rename from server_mode_website/oerp_wb_develope_js.xml rename to website_server_mode/oerp_wb_develope_js.xml