[Openerp-community-reviewer] [Merge] lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools
The proposal to merge lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 -- https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 Your team Server Environment And Tools Core Editors is subscribed to branch lp:server-env-tools. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools
The proposal to merge lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools has been updated. Commit Message changed to: [ADD] Regression Tests; [FIX] Uncaught error is raised when the admin user tries to connect with a bad login and his password; [ADD] Test for the fixed bug; For more details, see: https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 -- https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 Your team Server Environment And Tools Core Editors is subscribed to branch lp:server-env-tools. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools
Already merged -- https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 Your team Server Environment And Tools Core Editors is subscribed to branch lp:server-env-tools. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools
The proposal to merge lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 -- https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 Your team Server Environment And Tools Core Editors is subscribed to branch lp:server-env-tools. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools
Please next time explain what you do in your commit message. Fix bug XY is not really understandable at a first glance. To link the bug --fixes=lp:XY is there -- https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 Your team Server Environment And Tools Core Editors is subscribed to branch lp:server-env-tools. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools
Review: Approve code review, no test LGTM Thanks for the tests -- https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 Your team Server Environment And Tools Core Editors is subscribed to branch lp:server-env-tools. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
[Openerp-community-reviewer] [Merge] lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools
Sylvain LE GAL (GRAP) has proposed merging
lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools.
Commit message:
[FIX] bug #1319391;
[ADD] Tests;
Requested reviews:
Server Environment And Tools Core Editors (server-env-tools-core-editors)
Related bugs:
Bug #1319391 in Server Environment And Tools: |7.0] auth_admin_passkey :
uncaught error with admin password and bad login
https://bugs.launchpad.net/server-env-tools/+bug/1319391
For more details, see:
https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530
Hi all,
I propose for merging this code to fix the bug
https://bugs.launchpad.net/server-env-tools/+bug/1319391.
I added Test files to :
- avoid regressions;
- to give the possibility to the community to test more easily this module with
other 'auth_...' module;
Regards.
--
https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530
Your team Server Environment And Tools Core Editors is requested to review the
proposed merge of lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into
lp:server-env-tools.
=== modified file 'auth_admin_passkey/model/res_users.py'
--- auth_admin_passkey/model/res_users.py 2014-03-31 14:15:32 +
+++ auth_admin_passkey/model/res_users.py 2014-05-14 13:37:38 +
@@ -96,7 +96,7 @@
is admin password. In the second case, send mail to user and admin.
user_id = super(res_users, self).authenticate(
db, login, password, user_agent_env)
-if user_id != SUPERUSER_ID:
+if user_id and (user_id != SUPERUSER_ID):
same_password = False
cr = pooler.get_db(db).cursor()
try:
=== added directory 'auth_admin_passkey/tests'
=== added file 'auth_admin_passkey/tests/__init__.py'
--- auth_admin_passkey/tests/__init__.py 1970-01-01 00:00:00 +
+++ auth_admin_passkey/tests/__init__.py 2014-05-14 13:37:38 +
@@ -0,0 +1,23 @@
+# -*- encoding: utf-8 -*-
+##
+#
+#Admin Passkey module for OpenERP
+#Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
+#@author Sylvain LE GAL (https://twitter.com/legalsylvain)
+#
+#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 http://www.gnu.org/licenses/.
+#
+##
+
+from . import test_auth_admin_passkey
=== added file 'auth_admin_passkey/tests/test_auth_admin_passkey.py'
--- auth_admin_passkey/tests/test_auth_admin_passkey.py 1970-01-01 00:00:00 +
+++ auth_admin_passkey/tests/test_auth_admin_passkey.py 2014-05-14 13:37:38 +
@@ -0,0 +1,99 @@
+# -*- encoding: utf-8 -*-
+##
+#
+#Admin Passkey module for OpenERP
+#Copyright (C) 2013-2014 GRAP (http://www.grap.coop)
+#@author Sylvain LE GAL (https://twitter.com/legalsylvain)
+#
+#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 http://www.gnu.org/licenses/.
+#
+##
+
+import threading
+
+from openerp.tests.common import TransactionCase
+
+
+class TestAuthAdminPasskey(TransactionCase):
+Tests for 'Auth Admin Passkey' Module
+
+# Overload Section
+def setUp(self):
+super(TestAuthAdminPasskey, self).setUp()
+
+# Get Registries
+self.imd_obj = self.registry('ir.model.data')
+self.ru_obj = self.registry('res.users')
+
+# Get Database name
+self.db = threading.current_thread().dbname
+
+# Get ids from xml_ids
+self.admin_user_id = self.imd_obj.get_object_reference(
+self.cr, self.uid, 'base', 'user_root')[1]
+
Re: [Openerp-community-reviewer] [Merge] lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools
Review: Approve -- https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 Your team Server Environment And Tools Core Editors is subscribed to branch lp:server-env-tools. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
Re: [Openerp-community-reviewer] [Merge] lp:~sylvain-legal/server-env-tools/7.0-fix-1319391 into lp:server-env-tools
Review: Approve code review LGTM, thanks. Regards. -- https://code.launchpad.net/~sylvain-legal/server-env-tools/7.0-fix-1319391/+merge/219530 Your team Server Environment And Tools Core Editors is subscribed to branch lp:server-env-tools. -- Mailing list: https://launchpad.net/~openerp-community-reviewer Post to : openerp-community-reviewer@lists.launchpad.net Unsubscribe : https://launchpad.net/~openerp-community-reviewer More help : https://help.launchpad.net/ListHelp
