--- a/.hgtags Wed Mar 15 12:01:14 2017 +0100
+++ b/.hgtags Mon Mar 20 10:28:01 2017 +0100
@@ -596,3 +596,6 @@
70d28e632206aa1a3d3654f52468deccd2451f4c 3.24.5
70d28e632206aa1a3d3654f52468deccd2451f4c debian/3.24.5-1
70d28e632206aa1a3d3654f52468deccd2451f4c centos/3.24.5-1
+4029fb83a67d0b1ac0e73985426a83373721a4b2 3.24.6
+4029fb83a67d0b1ac0e73985426a83373721a4b2 debian/3.24.6-1
+4029fb83a67d0b1ac0e73985426a83373721a4b2 centos/3.24.6-1
--- a/cubicweb.spec Wed Mar 15 12:01:14 2017 +0100
+++ b/cubicweb.spec Mon Mar 20 10:28:01 2017 +0100
@@ -8,7 +8,7 @@
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: cubicweb
-Version: 3.24.5
+Version: 3.24.6
Release: logilab.1%{?dist}
Summary: CubicWeb is a semantic web application framework
Source0: https://pypi.python.org/packages/source/c/cubicweb/cubicweb-%{version}.tar.gz
--- a/cubicweb/misc/migration/3.24.0_Any.py Wed Mar 15 12:01:14 2017 +0100
+++ b/cubicweb/misc/migration/3.24.0_Any.py Mon Mar 20 10:28:01 2017 +0100
@@ -1,11 +1,6 @@
from base64 import b64decode
-# Check the CW versions and add the entity only if needed ?
-add_entity_type('CWSession')
-rql('DELETE CWProperty X WHERE X pkey "system.version.pyramid"',
- ask_confirm=False)
-
# before removing extid, ensure it's coherent with cwuri
for eid, etype, encoded_extid in sql(
"SELECT eid, type, extid FROM entities, cw_CWSource "
@@ -21,3 +16,8 @@
# force cw_schema deletion before CWSourceSchemaConfig to avoid nasty bug
drop_relation_type('cw_schema')
drop_entity_type('CWSourceSchemaConfig')
+
+# Check the CW versions and add the entity only if needed ?
+add_entity_type('CWSession')
+rql('DELETE CWProperty X WHERE X pkey "system.version.pyramid"',
+ ask_confirm=False)
--- a/cubicweb/web/data/cubicweb.ajax.js Wed Mar 15 12:01:14 2017 +0100
+++ b/cubicweb/web/data/cubicweb.ajax.js Mon Mar 20 10:28:01 2017 +0100
@@ -461,7 +461,9 @@
}
for (var i = 0; i < fragments.length; i++) {
var fragment = fragments[i];
- fragment.innerHTML = '<h3>' + LOADING_MSG + ' ... <img src="data/loading.gif" /></h3>';
+ fragment.innerHTML = (
+ '<h3>' + LOADING_MSG +
+ ' ... <img src="' + BASE_URL + 'data/loading.gif" /></h3>');
var $fragment = jQuery(fragment);
// if cubicweb:loadurl is set, just pick the url et send it to loadxhtml
var url = $fragment.attr('cubicweb:loadurl');
--- a/debian/changelog Wed Mar 15 12:01:14 2017 +0100
+++ b/debian/changelog Mon Mar 20 10:28:01 2017 +0100
@@ -1,3 +1,9 @@
+cubicweb (3.24.6-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Denis Laxalde <denis.laxalde@logilab.fr> Mon, 20 Mar 2017 08:57:32 +0100
+
cubicweb (3.24.5-1) unstable; urgency=medium
* New upstream release.