diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:23:09 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-01-27 12:23:09 +0100 |
| commit | 7e44ddcda3f21c7e6401173539dc0fe93f9a7dd2 (patch) | |
| tree | 322d7f2ce86ce328c27197c5c1b31c9f4a2b2c5c /addons/base_import_module | |
| parent | 3c7b08c030daf84323279b3d87361214e4f1b729 (diff) | |
| parent | 6f923cbdcdc9a78d1999999b3bbd917eb8b4e921 (diff) | |
[MERGE] forward port of branch saas-7 up to 6f923cb
Diffstat (limited to 'addons/base_import_module')
| -rw-r--r-- | addons/base_import_module/controllers/main.py | 6 | ||||
| -rw-r--r-- | addons/base_import_module/i18n/nb.po | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/addons/base_import_module/controllers/main.py b/addons/base_import_module/controllers/main.py index 0d2cdc1ab5b..4b51e69f096 100644 --- a/addons/base_import_module/controllers/main.py +++ b/addons/base_import_module/controllers/main.py @@ -21,7 +21,7 @@ class ImportModule(Controller): if not is_admin: raise openerp.exceptions.AccessError("Only administrators can upload a module") - @route('/base_import_module/login', type='http', auth='none', methods=['POST']) + @route('/base_import_module/login', type='http', auth='none', methods=['POST'], csrf=False) @webservice def login(self, login, password, db=None): if db and db != request.db: @@ -30,7 +30,9 @@ class ImportModule(Controller): if not uid: return Response(response="Wrong login/password", status=401) self.check_user(uid) - return "ok" + return Response(headers={ + 'X-CSRF-TOKEN': request.csrf_token(), + }) @route('/base_import_module/upload', type='http', auth='user', methods=['POST']) @webservice diff --git a/addons/base_import_module/i18n/nb.po b/addons/base_import_module/i18n/nb.po index 673a1d1b7d2..cbd6f8a7d0a 100644 --- a/addons/base_import_module/i18n/nb.po +++ b/addons/base_import_module/i18n/nb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-09-07 16:38+0000\n" +"PO-Revision-Date: 2016-01-15 07:59+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/odoo/odoo-9/language/nb/)\n" "MIME-Version: 1.0\n" @@ -101,7 +101,7 @@ msgstr "" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module___last_update msgid "Last Modified on" -msgstr "" +msgstr "Sist oppdatert " #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module_write_uid |