[tryton-debian-vcs] tryton-server branch debian-stretch-3.6 updated. debian/3.6.7-1-3-gf6c27c6

[Mathias Behrle]

The following commit has been merged in the debian-stretch-3.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/3.6.7-1-3-gf6c27c6

commit f6c27c6146cab54c535642837b3b0fe14abf1b0c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 15 21:12:36 2016 +0100

    Releasing debian version 3.6.8-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 912f5fd..95e9c14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tryton-server (3.6.8-1) unstable; urgency=medium
+
+  * Updating signing-key.asc with the actual upstream maintainer keys.
+  * Merging upstream version 3.6.8.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Tue, 15 Mar 2016 21:12:36 +0100
+
 tryton-server (3.6.7-1) unstable; urgency=medium
 
   * Merging upstream version 3.6.7.
commit 6fe01c02ca1b336ff5e0b152f1e578a6060bc004
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Mar 15 21:12:36 2016 +0100

    Merging upstream version 3.6.8.

diff --git a/CHANGELOG b/CHANGELOG
index 8f80168..5d543fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 3.6.8 - 2016-03-14
+* Bug fixes (see mercurial logs for details)
+* Limit the login size in LoginAttempt
+
 Version 3.6.7 - 2016-02-06
 * Bug fixes (see mercurial logs for details)
 * Don't read historized user when evaluating record rules as it could lead to
diff --git a/PKG-INFO b/PKG-INFO
index f70441a..9db3fc5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.6.7
+Version: 3.6.8
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index f70441a..9db3fc5 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.6.7
+Version: 3.6.8
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/__init__.py b/trytond/__init__.py
index 7db9720..233ef19 100644
--- a/trytond/__init__.py
+++ b/trytond/__init__.py
@@ -4,7 +4,7 @@ import os
 import time
 from email import charset
 
-__version__ = "3.6.7"
+__version__ = "3.6.8"
 
 os.environ['TZ'] = 'UTC'
 if hasattr(time, 'tzset'):
diff --git a/trytond/ir/rule.py b/trytond/ir/rule.py
index 4fadc62..d8bfdac 100644
--- a/trytond/ir/rule.py
+++ b/trytond/ir/rule.py
@@ -114,6 +114,7 @@ class Rule(ModelSQL, ModelView):
 
         # Migration from 2.6: replace field, operator and operand by domain
         table.not_null_action('field', action='remove')
+        table.drop_fk('field')
         table.not_null_action('operator', action='remove')
         table.not_null_action('operand', action='remove')
 
diff --git a/trytond/model/modelsql.py b/trytond/model/modelsql.py
index 366239d..e53598e 100644
--- a/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
@@ -639,7 +639,7 @@ class ModelSQL(ModelStorage):
                             _datetime=row[field.datetime_field]):
                         date_result = field.get([row['id']], cls, fname,
                             values=[row])
-                    row[field] = date_result[row['id']]
+                    row[fname] = date_result[row['id']]
             else:
                 # get the value of that field for all records/ids
                 getter_result = field.get(ids, cls, fname, values=result)
diff --git a/trytond/res/user.py b/trytond/res/user.py
index 662d77b..a61afc6 100644
--- a/trytond/res/user.py
+++ b/trytond/res/user.py
@@ -7,6 +7,7 @@ import random
 import hashlib
 import time
 import datetime
+from functools import wraps
 from itertools import groupby, ifilter
 from operator import attrgetter
 from ast import literal_eval
@@ -540,7 +541,7 @@ class LoginAttempt(ModelSQL):
     the res.user table when in a long running process.
     """
     __name__ = 'res.user.login.attempt'
-    login = fields.Char('Login')
+    login = fields.Char('Login', size=512)
 
     @classmethod
     def __register__(cls, module_name):
@@ -556,7 +557,14 @@ class LoginAttempt(ModelSQL):
         return (datetime.datetime.now()
             - datetime.timedelta(seconds=config.getint('session', 'timeout')))
 
+    def _login_size(func):
+        @wraps(func)
+        def wrapper(cls, login, *args, **kwargs):
+            return func(cls, login[:cls.login.size], *args, **kwargs)
+        return wrapper
+
     @classmethod
+    @_login_size
     def add(cls, login):
         cls.delete(cls.search([
                     ('create_date', '<', cls.delay()),
@@ -564,12 +572,14 @@ class LoginAttempt(ModelSQL):
         cls.create([{'login': login}])
 
     @classmethod
+    @_login_size
     def remove(cls, login):
         cursor = Transaction().cursor
         table = cls.__table__()
         cursor.execute(*table.delete(where=table.login == login))
 
     @classmethod
+    @_login_size
     def count(cls, login):
         cursor = Transaction().cursor
         table = cls.__table__()
@@ -578,6 +588,8 @@ class LoginAttempt(ModelSQL):
                 & (table.create_date >= cls.delay())))
         return cursor.fetchone()[0]
 
+    del _login_size
+
 
 class UserAction(ModelSQL):
     'User - Action'
-- 
tryton-server