# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1252562598 -7200
# Node ID d6ae24439beecc4ccf9b58bfaeb0a5ed0ce71e2a
# Parent  cd56d5c379cb9acd480006e9fa598ce1385a8a40# Parent  005f745315b0ddf80cd8d16a5501ba4f0374ea44
merge

diff -r cd56d5c379cb -r d6ae24439bee .hgtags
--- a/.hgtags	Wed Sep 09 19:06:35 2009 +0200
+++ b/.hgtags	Thu Sep 10 08:03:18 2009 +0200
@@ -62,3 +62,5 @@
 7fd294cbf6ff3cf34475cc50e972f650a34ae6e8 cubicweb-debian-version-3.4.5-1
 921fdbf8b3038dc27a2ec5398a0fbcbc5b9ba4be cubicweb-version-3.4.6
 52dba800ca4d4b82c47f3befb824bd91ef015368 cubicweb-debian-version-3.4.6-1
+0e549b299f0b357837ea620c561aa843f46de17a cubicweb-version-3.4.7
+ebb92e62eb040a070deb1f2d2434734cfac3af01 cubicweb-debian-version-3.4.7-1
diff -r cd56d5c379cb -r d6ae24439bee _exceptions.py
--- a/_exceptions.py	Wed Sep 09 19:06:35 2009 +0200
+++ b/_exceptions.py	Thu Sep 10 08:03:18 2009 +0200
@@ -117,7 +117,7 @@
 
 class NoSelectableObject(RegistryException):
     """some views with the given vid have been found but no
-    one is applyable to the result set
+    one is applicable to the result set
     """
 
 class UnknownProperty(RegistryException):
diff -r cd56d5c379cb -r d6ae24439bee doc/book/en/B0015-define-permissions.en.txt
--- a/doc/book/en/B0015-define-permissions.en.txt	Wed Sep 09 19:06:35 2009 +0200
+++ b/doc/book/en/B0015-define-permissions.en.txt	Thu Sep 10 08:03:18 2009 +0200
@@ -114,7 +114,7 @@
 	require_group = SubjectRelation('EGroup', cardinality='+*',
 					description=_('groups to which the permission is granted'))
 	require_state = SubjectRelation('State',
-				    description=_("entity'state in which the permission is applyable"))
+				    description=_("entity'state in which the permission is applicable"))
 	# can be used on any entity
 	require_permission = ObjectRelation('**', cardinality='*1', composite='subject',
 					    description=_("link a permission to the entity. This "
diff -r cd56d5c379cb -r d6ae24439bee doc/book/en/development/datamodel/definition.rst
--- a/doc/book/en/development/datamodel/definition.rst	Wed Sep 09 19:06:35 2009 +0200
+++ b/doc/book/en/development/datamodel/definition.rst	Thu Sep 10 08:03:18 2009 +0200
@@ -390,7 +390,7 @@
 	require_group = SubjectRelation('CWGroup', cardinality='+*',
 					description=_('groups to which the permission is granted'))
 	require_state = SubjectRelation('State',
-				    description=_("entity'state in which the permission is applyable"))
+                                        description=_("entity's state in which the permission is applicable"))
 	# can be used on any entity
 	require_permission = ObjectRelation('**', cardinality='*1', composite='subject',
 					    description=_("link a permission to the entity. This "
diff -r cd56d5c379cb -r d6ae24439bee i18n/en.po
--- a/i18n/en.po	Wed Sep 09 19:06:35 2009 +0200
+++ b/i18n/en.po	Thu Sep 10 08:03:18 2009 +0200
@@ -608,7 +608,9 @@
 msgid "You can use any of the following substitutions in your text"
 msgstr ""
 
-msgid "You have no access to this view or it's not applyable to current data"
+msgid ""
+"You have no access to this view or it can not be used to display the current "
+"data."
 msgstr ""
 
 msgid ""
@@ -1646,12 +1648,13 @@
 msgid "download"
 msgstr ""
 
+#, python-format
+msgid "download %s"
+msgstr ""
+
 msgid "download icon"
 msgstr ""
 
-msgid "download image"
-msgstr ""
-
 msgid "download schema as owl"
 msgstr ""
 
@@ -2052,6 +2055,12 @@
 msgid "invalid date"
 msgstr ""
 
+msgid "invalid float value"
+msgstr ""
+
+msgid "invalid integer value"
+msgstr ""
+
 msgid "is"
 msgstr ""
 
diff -r cd56d5c379cb -r d6ae24439bee i18n/es.po
--- a/i18n/es.po	Wed Sep 09 19:06:35 2009 +0200
+++ b/i18n/es.po	Thu Sep 10 08:03:18 2009 +0200
@@ -625,8 +625,10 @@
 "Puede realizar cualquiera de las siguientes sustituciones en el contenido de "
 "su email."
 
-msgid "You have no access to this view or it's not applyable to current data"
-msgstr "No tiene acceso a esta vista o No es aplicable a los datos actuales"
+msgid ""
+"You have no access to this view or it can not be used to display the current "
+"data."
+msgstr "No tiene acceso a esta vista o No se puede utilizare para los datos actuales."
 
 msgid ""
 "You're not authorized to access this page. If you think you should, please "
@@ -1708,12 +1710,13 @@
 msgid "download"
 msgstr "Descargar"
 
+#, python-format
+msgid "download %s"
+msgstr ""
+
 msgid "download icon"
 msgstr "ícono de descarga"
 
-msgid "download image"
-msgstr ""
-
 msgid "download schema as owl"
 msgstr "Descargar esquema en OWL"
 
@@ -2128,6 +2131,12 @@
 msgid "invalid date"
 msgstr "Esta fecha no es válida"
 
+msgid "invalid float value"
+msgstr ""
+
+msgid "invalid integer value"
+msgstr ""
+
 msgid "is"
 msgstr "es"
 
@@ -3183,3 +3192,7 @@
 
 msgid "you should probably delete that property"
 msgstr "deberia probablamente suprimir esta propriedad"
+
+#~ msgid ""
+#~ "You have no access to this view or it's not applyable to current data"
+#~ msgstr "No tiene acceso a esta vista o No es aplicable a los datos actuales"
diff -r cd56d5c379cb -r d6ae24439bee i18n/fr.po
--- a/i18n/fr.po	Wed Sep 09 19:06:35 2009 +0200
+++ b/i18n/fr.po	Thu Sep 10 08:03:18 2009 +0200
@@ -624,9 +624,10 @@
 "Vous pouvez utiliser n'importe quelle substitution parmi la liste suivante "
 "dans le contenu de votre courriel."
 
-msgid "You have no access to this view or it's not applyable to current data"
-msgstr ""
-"Vous n'avez pas accès à cette vue ou elle ne s'applique pas aux données"
+msgid ""
+"You have no access to this view or it can not be used to display the current "
+"data."
+msgstr "Vous n'avez pas accès à cette vue ou elle ne peut pas afficher ces données."
 
 msgid ""
 "You're not authorized to access this page. If you think you should, please "
@@ -1721,12 +1722,13 @@
 msgid "download"
 msgstr "télécharger"
 
+#, python-format
+msgid "download %s"
+msgstr "télécharger %s"
+
 msgid "download icon"
 msgstr "icône de téléchargement"
 
-msgid "download image"
-msgstr "image de téléchargement"
-
 msgid "download schema as owl"
 msgstr "télécharger le schéma OWL"
 
@@ -2141,6 +2143,12 @@
 msgid "invalid date"
 msgstr "cette date n'est pas valide"
 
+msgid "invalid float value"
+msgstr "nombre flottant non valide"
+
+msgid "invalid integer value"
+msgstr "nombre entier non valide"
+
 msgid "is"
 msgstr "de type"
 
@@ -3199,3 +3207,11 @@
 
 msgid "you should probably delete that property"
 msgstr "vous devriez probablement supprimer cette propriété"
+
+#~ msgid ""
+#~ "You have no access to this view or it's not applyable to current data"
+#~ msgstr ""
+#~ "Vous n'avez pas accès à cette vue ou elle ne s'applique pas aux données"
+
+#~ msgid "download image"
+#~ msgstr "image de téléchargement"
diff -r cd56d5c379cb -r d6ae24439bee server/session.py
--- a/server/session.py	Wed Sep 09 19:06:35 2009 +0200
+++ b/server/session.py	Thu Sep 10 08:03:18 2009 +0200
@@ -81,7 +81,7 @@
     def hijack_user(self, user):
         """return a fake request/session using specified user"""
         session = Session(user, self.repo)
-        session._threaddata = self._threaddata
+        session._threaddata = self.actual_session()._threaddata
         return session
 
     def _change_relation(self, cb, fromeid, rtype, toeid):
diff -r cd56d5c379cb -r d6ae24439bee web/data/cubicweb.python.js
--- a/web/data/cubicweb.python.js	Wed Sep 09 19:06:35 2009 +0200
+++ b/web/data/cubicweb.python.js	Thu Sep 10 08:03:18 2009 +0200
@@ -83,10 +83,10 @@
     var skip0 = new RegExp('^0*[0-9]+');
     var parsed = {};
     for (var i1=0,i2=0;i1<format.length;i1++,i2++) {
-	var c1 = format[i1];
-	var c2 = datestring[i2];
+	var c1 = format.charAt(i1);
+	var c2 = datestring.charAt(i2);
 	if (c1 == '%') {
-	    c1 = format[++i1];
+	    c1 = format.charAt(++i1);
 	    var data = _DATE_FORMAT_REGXES[c1].exec(datestring.substring(i2));
 	    if (!data.length) {
 		return null;
diff -r cd56d5c379cb -r d6ae24439bee web/views/basecontrollers.py
--- a/web/views/basecontrollers.py	Wed Sep 09 19:06:35 2009 +0200
+++ b/web/views/basecontrollers.py	Thu Sep 10 08:03:18 2009 +0200
@@ -129,7 +129,8 @@
             if rset:
                 req.set_message(req._("The view %s can not be applied to this query") % vid)
             else:
-                req.set_message(req._("You have no access to this view or it's not applyable to current data"))
+                req.set_message(req._("You have no access to this view or it can not "
+                                      "be used to display the current data."))
             self.warning("the view %s can not be applied to this query", vid)
             vid = vid_from_rset(req, rset, self.schema)
             view = self.vreg['views'].select(vid, req, rset=rset)
diff -r cd56d5c379cb -r d6ae24439bee web/views/editcontroller.py
--- a/web/views/editcontroller.py	Wed Sep 09 19:06:35 2009 +0200
+++ b/web/views/editcontroller.py	Thu Sep 10 08:03:18 2009 +0200
@@ -194,13 +194,13 @@
         # NOTE: raising ValidationError here is not a good solution because
         #       we can't gather all errors at once. Hopefully, the new 3.6.x
         #       form handling will fix that
-        if attrtype == 'Int':
+        if value and attrtype == 'Int':
             try:
                 value = int(value)
             except ValueError:
                 raise ValidationError(entity.eid,
                                       {attr: self.req._("invalid integer value")})
-        elif attrtype == 'Float':
+        elif value and attrtype == 'Float':
             try:
                 value = float(value)
             except ValueError: