--- a/.hgtags Fri Apr 30 19:58:17 2010 +0200
+++ b/.hgtags Tue May 04 14:16:04 2010 +0200
@@ -119,6 +119,8 @@
44c7bf90df71dd562e5a7be5ced3019da603d24f cubicweb-debian-version-3.7.3-1
ec23f3ebcd34a92b9898b312f44d56cca748d0d6 cubicweb-version-3.7.4
fefeda65bb83dcc2d775255fe69fdee0e793d135 cubicweb-debian-version-3.7.4-1
+c476d106705ebdd9205d97e64cafa72707acabe7 cubicweb-version-3.7.5
+2d0982252e8d780ba964f293a0e691d48070db6d cubicweb-debian-version-3.7.5-1
3c703f3245dc7696341ae1d66525554d9fa2d11d cubicweb-version-3.8.0
24cc65ab2eca05729d66cef3de6f69bb7f9dfa35 cubicweb-debian-version-3.8.0-1
1e074c6150fe00844160986852db364cc5992848 cubicweb-version-3.8.1
--- a/cwconfig.py Fri Apr 30 19:58:17 2010 +0200
+++ b/cwconfig.py Tue May 04 14:16:04 2010 +0200
@@ -363,7 +363,7 @@
'default': False,
'help': "don't display actual email addresses but mangle them if \
this option is set to yes",
- 'group': 'email', 'level': 2,
+ 'group': 'email', 'level': 3,
}),
)
# static and class methods used to get instance independant resources ##
--- a/debian/changelog Fri Apr 30 19:58:17 2010 +0200
+++ b/debian/changelog Tue May 04 14:16:04 2010 +0200
@@ -10,6 +10,12 @@
-- Sylvain Thénault <sylvain.thenault@logilab.fr> Tue, 20 Apr 2010 16:31:44 +0200
+cubicweb (3.7.5-1) unstable; urgency=low
+
+ * new upstream release on the 3.7 branch
+
+ -- Alexandre Fayolle <afayolle@debian.org> Thu, 29 Apr 2010 13:51:52 +0200
+
cubicweb (3.7.4-1) unstable; urgency=low
* new upstream release
--- a/devtools/devctl.py Fri Apr 30 19:58:17 2010 +0200
+++ b/devtools/devctl.py Tue May 04 14:16:04 2010 +0200
@@ -175,9 +175,10 @@
'inlined:%s.%s.%s' % (etype, rschema, role))
add_msg(w, str(tschema),
'inlined:%s.%s.%s' % (etype, rschema, role))
- if appearsin_addmenu.etype_get(eschema, rschema, role, tschema) and \
- (libconfig is None or not
- libappearsin_addmenu.etype_get(eschema, rschema, role, tschema)):
+ if appearsin_addmenu.etype_get(eschema, rschema, role, tschema):
+ if libconfig is not None and libappearsin_addmenu.etype_get(eschema, rschema, role, tschema):
+ if eschema in libschema and tschema in libschema:
+ continue
if role == 'subject':
label = 'add %s %s %s %s' % (eschema, rschema,
tschema, role)
--- a/etwist/twconfig.py Fri Apr 30 19:58:17 2010 +0200
+++ b/etwist/twconfig.py Tue May 04 14:16:04 2010 +0200
@@ -80,7 +80,7 @@
{'type' : 'string',
'default': None,
'help': 'profile code and use the specified file to store stats if this option is set',
- 'group': 'main', 'level': 2,
+ 'group': 'main', 'level': 3,
}),
('pyro-server',
{'type' : 'yn',
--- a/server/serverconfig.py Fri Apr 30 19:58:17 2010 +0200
+++ b/server/serverconfig.py Tue May 04 14:16:04 2010 +0200
@@ -125,20 +125,20 @@
{'type' : 'time',
'default': '30min',
'help': 'session expiration time, default to 30 minutes',
- 'group': 'main', 'level': 1,
+ 'group': 'main', 'level': 3,
}),
('connections-pool-size',
{'type' : 'int',
'default': 4,
'help': 'size of the connections pools. Each source supporting multiple \
connections will have this number of opened connections.',
- 'group': 'main', 'level': 1,
+ 'group': 'main', 'level': 3,
}),
('rql-cache-size',
{'type' : 'int',
'default': 300,
'help': 'size of the parsed rql cache size.',
- 'group': 'main', 'level': 1,
+ 'group': 'main', 'level': 3,
}),
('undo-support',
{'type' : 'string', 'default': '',
@@ -146,20 +146,20 @@
[C]reate [U]pdate [D]elete entities / [A]dd [R]emove relation. Leave it empty \
for no undo support, set it to CUDAR for full undo support, or to DR for \
support undoing of deletion only.',
- 'group': 'main', 'level': 1,
+ 'group': 'main', 'level': 3,
}),
('keep-transaction-lifetime',
{'type' : 'int', 'default': 7,
'help': 'number of days during which transaction records should be \
kept (hence undoable).',
- 'group': 'main', 'level': 1,
+ 'group': 'main', 'level': 3,
}),
('multi-sources-etypes',
{'type' : 'csv', 'default': (),
'help': 'defines which entity types from this repository are used \
by some other instances. You should set this properly so those instances to \
detect updates / deletions.',
- 'group': 'main', 'level': 1,
+ 'group': 'main', 'level': 3,
}),
('delay-full-text-indexation',
@@ -168,7 +168,7 @@
' to be done when entity are added/modified by users, activate this '
'option and setup a job using cubicweb-ctl db-rebuild-fti on your '
'system (using cron for instance).',
- 'group': 'main', 'level': 1,
+ 'group': 'main', 'level': 3,
}),
# email configuration
@@ -181,7 +181,7 @@
modes are "default-dest-addrs" (emails specified in the configuration \
variable with the same name), "users" (every users which has activated \
account with an email set), "none" (no notification).',
- 'group': 'email', 'level': 1,
+ 'group': 'email', 'level': 2,
}),
('default-dest-addrs',
{'type' : 'csv',
@@ -189,7 +189,7 @@
'help': 'comma separated list of email addresses that will be used \
as default recipient when an email is sent and the notification has no \
specific recipient rules.',
- 'group': 'email', 'level': 1,
+ 'group': 'email', 'level': 2,
}),
('supervising-addrs',
{'type' : 'csv',
@@ -205,7 +205,7 @@
'help': 'Pyro server host, if not detectable correctly through \
gethostname(). It may contains port information using <host>:<port> notation, \
and if not set, it will be choosen randomly',
- 'group': 'pyro', 'level': 2,
+ 'group': 'pyro', 'level': 3,
}),
) + CubicWebConfiguration.options)
--- a/server/sources/ldapuser.py Fri Apr 30 19:58:17 2010 +0200
+++ b/server/sources/ldapuser.py Tue May 04 14:16:04 2010 +0200
@@ -44,6 +44,7 @@
from ldap.filter import filter_format, escape_filter_chars
from ldapurl import LDAPUrl
+from logilab.common.configuration import time_validator
from cubicweb import AuthenticationError, UnknownEid, RepositoryError
from cubicweb.server.utils import cartesian_product
from cubicweb.server.sources import (AbstractSource, TrFunc, GlobTrFunc,
@@ -85,13 +86,13 @@
'default': 'simple',
'choices': ('simple', 'cram_md5', 'digest_md5', 'gssapi'),
'help': 'authentication mode used to authenticate user to the ldap.',
- 'group': 'ldap-source', 'level': 1,
+ 'group': 'ldap-source', 'level': 3,
}),
('auth-realm',
{'type' : 'string',
'default': None,
'help': 'realm to use when using gssapi/kerberos authentication.',
- 'group': 'ldap-source', 'level': 1,
+ 'group': 'ldap-source', 'level': 3,
}),
('data-cnx-dn',
@@ -152,13 +153,13 @@
'default': '1d',
'help': 'interval between synchronization with the ldap \
directory (default to once a day).',
- 'group': 'ldap-source', 'level': 2,
+ 'group': 'ldap-source', 'level': 3,
}),
('cache-life-time',
{'type' : 'time',
'default': '2h',
'help': 'life time of query cache in minutes (default to two hours).',
- 'group': 'ldap-source', 'level': 2,
+ 'group': 'ldap-source', 'level': 3,
}),
)
@@ -186,9 +187,11 @@
for o in self.user_classes]
self._conn = None
self._cache = {}
- ttlm = int(source_config.get('cache-life-type', 2*60))
+ ttlm = time_validator(None, None,
+ source_config.get('cache-life-time', 2*60))
self._query_cache = TimedCache(ttlm)
- self._interval = int(source_config.get('synchronization-interval',
+ self._interval = time_validator(None, None,
+ source_config.get('synchronization-interval',
24*60*60))
def reset_caches(self):
--- a/web/webconfig.py Fri Apr 30 19:58:17 2010 +0200
+++ b/web/webconfig.py Tue May 04 14:16:04 2010 +0200
@@ -96,7 +96,7 @@
{'type' : 'string',
'default': None,
'help': 'web instance query log file',
- 'group': 'main', 'level': 2,
+ 'group': 'main', 'level': 3,
}),
# web configuration
('https-url',
@@ -110,20 +110,20 @@
'differentiate between http vs https access. For instance: \n'\
'RewriteRule ^/demo/(.*) http://127.0.0.1:8080/https/$1 [L,P]\n'\
'where the cubicweb web server is listening on port 8080.',
- 'group': 'main', 'level': 2,
+ 'group': 'main', 'level': 3,
}),
('auth-mode',
{'type' : 'choice',
'choices' : ('cookie', 'http'),
'default': 'cookie',
'help': 'authentication mode (cookie / http)',
- 'group': 'web', 'level': 1,
+ 'group': 'web', 'level': 3,
}),
('realm',
{'type' : 'string',
'default': 'cubicweb',
'help': 'realm to use on HTTP authentication mode',
- 'group': 'web', 'level': 2,
+ 'group': 'web', 'level': 3,
}),
('http-session-time',
{'type' : 'time',
@@ -142,7 +142,7 @@
'So even if http-session-time is 0 and the user don\'t close his '
'browser, he will have to reauthenticate after this time of '
'inactivity. Default to 24h.',
- 'group': 'web', 'level': 2,
+ 'group': 'web', 'level': 3,
}),
('cleanup-anonymous-session-time',
{'type' : 'time',
@@ -150,14 +150,14 @@
'help': 'Same as cleanup-session-time but specific to anonymous '
'sessions. You can have a much smaller timeout here since it will be '
'transparent to the user. Default to 5min.',
- 'group': 'web', 'level': 2,
+ 'group': 'web', 'level': 3,
}),
('force-html-content-type',
{'type' : 'yn',
'default': False,
'help': 'force text/html content type for your html pages instead of cubicweb user-agent based'\
'deduction of an appropriate content type',
- 'group': 'web', 'level': 2,
+ 'group': 'web', 'level': 3,
}),
('embed-allowed',
{'type' : 'regexp',
@@ -165,7 +165,7 @@
'help': 'regular expression matching URLs that may be embeded. \
leave it blank if you don\'t want the embedding feature, or set it to ".*" \
if you want to allow everything',
- 'group': 'web', 'level': 1,
+ 'group': 'web', 'level': 3,
}),
('submit-mail',
{'type' : 'string',
@@ -195,14 +195,14 @@
'default': join(CubicWebConfiguration.shared_dir(), 'data', 'porkys.ttf'),
'help': 'True type font to use for captcha image generation (you \
must have the python imaging library installed to use captcha)',
- 'group': 'web', 'level': 2,
+ 'group': 'web', 'level': 3,
}),
('captcha-font-size',
{'type' : 'int',
'default': 25,
'help': 'Font size to use for captcha image generation (you must \
have the python imaging library installed to use captcha)',
- 'group': 'web', 'level': 2,
+ 'group': 'web', 'level': 3,
}),
))