[tryton-debian-vcs] tryton-server branch upstream-3.2 updated. upstream/3.2.13-1-gf01417a

[Mathias Behrle]

The following commit has been merged in the upstream-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=upstream/3.2.13-1-gf01417a

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

    Adding upstream version 3.2.14.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index 759bf68..b43ee9a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 3.2.14 - 2016-03-14
+* Bug fixes (see mercurial logs for details)
+* Limit the login size in LoginAttempt
+
 Version 3.2.13 - 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 ecb743a..2a70b12 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.2.13
+Version: 3.2.14
 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 ecb743a..2a70b12 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.2.13
+Version: 3.2.14
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/ir/rule.py b/trytond/ir/rule.py
index 3837c11..aa92f4e 100644
--- a/trytond/ir/rule.py
+++ b/trytond/ir/rule.py
@@ -116,6 +116,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 daf8e4b..a009a91 100644
--- a/trytond/model/modelsql.py
+++ b/trytond/model/modelsql.py
@@ -632,7 +632,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 78bea12..dc6ce65 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
@@ -544,7 +545,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):
@@ -560,7 +561,14 @@ class LoginAttempt(ModelSQL):
         return (datetime.datetime.now()
             - datetime.timedelta(seconds=int(CONFIG['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()),
@@ -568,12 +576,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__()
@@ -582,6 +592,8 @@ class LoginAttempt(ModelSQL):
                 & (table.create_date >= cls.delay())))
         return cursor.fetchone()[0]
 
+    del _login_size
+
 
 class UserAction(ModelSQL):
     'User - Action'
diff --git a/trytond/version.py b/trytond/version.py
index 690151c..8d92264 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "trytond"
-VERSION = "3.2.13"
+VERSION = "3.2.14"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server