R&D
', + content_format=u'text/html') + tidy = lambda x: x.replace('\n', '') + self.assertEquals(tidy(e.printable_value('content')), + '

R&D

') + e['content'] = u'yo !! R&D

pas fermé' + self.assertEquals(tidy(e.printable_value('content')), + u'yo !! R&D

pas fermé

') + e['content'] = u'R&D' + self.assertEquals(tidy(e.printable_value('content')), u'R&D') + e['content'] = u'R&D;' + self.assertEquals(tidy(e.printable_value('content')), u'R&D;') + e['content'] = u'yo !! R&D

pas fermé' + self.assertEquals(tidy(e.printable_value('content')), + u'yo !! R&D

pas fermé

') + e['content'] = u'été

été' + self.assertEquals(tidy(e.printable_value('content')), + u'été

été

') + e['content'] = u'C'est un exemple sérieux' + self.assertEquals(tidy(e.printable_value('content')), + u"C'est un exemple sérieux") + # make sure valid xhtml is left untouched + e['content'] = u'

R&D

' + self.assertEquals(e.printable_value('content'), e['content']) + e['content'] = u'

été

' + self.assertEquals(e.printable_value('content'), e['content']) + e['content'] = u'été' + self.assertEquals(e.printable_value('content'), e['content']) + + + def test_fulltextindex(self): + e = self.etype_instance('File') + e['name'] = 'an html file' + e['description'] = 'du html' + e['description_format'] = 'text/html' + e['data'] = Binary('some data') + e['data_format'] = 'text/html' + e['data_encoding'] = 'ascii' + self.assertEquals(set(e.get_words()), + set(['an', 'html', 'file', 'du', 'html', 'some', 'data'])) + + + def test_nonregr_relation_cache(self): + p1 = self.add_entity('Personne', nom=u'di mascio', prenom=u'adrien') + p2 = self.add_entity('Personne', nom=u'toto') + self.execute('SET X evaluee Y WHERE X nom "di mascio", Y nom "toto"') + self.assertEquals(p1.evaluee[0].nom, "toto") + self.failUnless(not p1.reverse_evaluee) + + def test_complete_relation(self): + self.execute('SET RT add_permission G WHERE RT name "wf_info_for", G name "managers"') + self.commit() + try: + eid = self.execute('INSERT TrInfo X: X comment "zou", X wf_info_for U,' + 'X from_state S1, X to_state S2 WHERE ' + 'U login "admin", S1 name "activated", S2 name "deactivated"')[0][0] + trinfo = self.entity('Any X WHERE X eid %(x)s', {'x': eid}, 'x') + trinfo.complete() + self.failUnless(trinfo.relation_cached('from_state', 'subject')) + self.failUnless(trinfo.relation_cached('to_state', 'subject')) + self.failUnless(trinfo.relation_cached('wf_info_for', 'subject')) + # check with a missing relation + eid = self.execute('INSERT TrInfo X: X comment "zou", X wf_info_for U,' + 'X to_state S2 WHERE ' + 'U login "admin", S2 name "activated"')[0][0] + trinfo = self.entity('Any X WHERE X eid %(x)s', {'x': eid}, 'x') + trinfo.complete() + self.failUnless(isinstance(trinfo.creation_date, datetime)) + self.failUnless(trinfo.relation_cached('from_state', 'subject')) + self.failUnless(trinfo.relation_cached('to_state', 'subject')) + self.failUnless(trinfo.relation_cached('wf_info_for', 'subject')) + self.assertEquals(trinfo.from_state, []) + finally: + self.rollback() + self.execute('DELETE RT add_permission G WHERE RT name "wf_info_for", G name "managers"') + self.commit() + + def test_request_cache(self): + req = self.request() + user = self.entity('CWUser X WHERE X login "admin"', req=req) + state = user.in_state[0] + samestate = self.entity('State X WHERE X name "activated"', req=req) + self.failUnless(state is samestate) + + def test_rest_path(self): + note = self.add_entity('Note', type=u'z') + self.assertEquals(note.rest_path(), 'note/%s' % note.eid) + # unique attr + tag = self.add_entity('Tag', name=u'x') + self.assertEquals(tag.rest_path(), 'tag/x') + # test explicit rest_attr + person = self.add_entity('Personne', prenom=u'john', nom=u'doe') + self.assertEquals(person.rest_path(), 'personne/doe') + # ambiguity test + person2 = self.add_entity('Personne', prenom=u'remi', nom=u'doe') + self.assertEquals(person.rest_path(), 'personne/eid/%s' % person.eid) + self.assertEquals(person2.rest_path(), 'personne/eid/%s' % person2.eid) + # unique attr with None value (wikiid in this case) + card1 = self.add_entity('Card', title=u'hop') + self.assertEquals(card1.rest_path(), 'card/eid/%s' % card1.eid) + card2 = self.add_entity('Card', title=u'pod', wikiid=u'zob/i') + self.assertEquals(card2.rest_path(), 'card/zob%2Fi') + + def test_set_attributes(self): + person = self.add_entity('Personne', nom=u'di mascio', prenom=u'adrien') + self.assertEquals(person.prenom, u'adrien') + self.assertEquals(person.nom, u'di mascio') + person.set_attributes(prenom=u'sylvain', nom=u'thénault') + person = self.entity('Personne P') # XXX retreival needed ? + self.assertEquals(person.prenom, u'sylvain') + self.assertEquals(person.nom, u'thénault') + + def test_metainformation(self): + note = self.add_entity('Note', type=u'z') + metainf = note.metainformation() + self.assertEquals(metainf, {'source': {'adapter': 'native', 'uri': 'system'}, 'type': u'Note', 'extid': None}) + self.assertEquals(note.absolute_url(), 'http://testing.fr/cubicweb/note/%s' % note.eid) + metainf['source'] = metainf['source'].copy() + metainf['source']['base-url'] = 'http://cubicweb2.com/' + self.assertEquals(note.absolute_url(), 'http://cubicweb2.com/note/%s' % note.eid) + +if __name__ == '__main__': + from logilab.common.testlib import unittest_main + unittest_main() + diff -r 49075f57cf2c -r aa09e20dd8c0 test/unittest_rset.py --- a/test/unittest_rset.py Tue May 05 17:18:49 2009 +0200 +++ b/test/unittest_rset.py Thu May 14 12:48:11 2009 +0200 @@ -1,30 +1,33 @@ # coding: utf-8 """unit tests for module cubicweb.common.utils""" +from __future__ import with_statement from logilab.common.testlib import TestCase, unittest_main + from cubicweb.devtools.apptest import EnvBasedTC +from cubicweb.selectors import traced_selection from urlparse import urlsplit from rql import parse from cubicweb.rset import NotAnEntity, ResultSet, attr_desc_iterator - + def pprelcachedict(d): res = {} for k, (rset, related) in d.items(): res[k] = sorted(v.eid for v in related) return sorted(res.items()) - + class AttrDescIteratorTC(TestCase): """TestCase for cubicweb.rset.attr_desc_iterator""" - + def test_relations_description(self): """tests relations_description() function""" queries = { - 'Any U,L,M where U is EUser, U login L, U mail M' : [(1, 'login', 'subject'), (2, 'mail', 'subject')], - 'Any U,L,M where U is EUser, L is Foo, U mail M' : [(2, 'mail', 'subject')], + 'Any U,L,M where U is CWUser, U login L, U mail M' : [(1, 'login', 'subject'), (2, 'mail', 'subject')], + 'Any U,L,M where U is CWUser, L is Foo, U mail M' : [(2, 'mail', 'subject')], 'Any C,P where C is Company, C employs P' : [(1, 'employs', 'subject')], 'Any C,P where C is Company, P employed_by P' : [], 'Any C where C is Company, C employs P' : [], @@ -32,11 +35,11 @@ for rql, relations in queries.items(): result = list(attr_desc_iterator(parse(rql).children[0])) self.assertEquals((rql, result), (rql, relations)) - + def test_relations_description_indexed(self): """tests relations_description() function""" queries = { - 'Any C,U,P,L,M where C is Company, C employs P, U is EUser, U login L, U mail M' : + 'Any C,U,P,L,M where C is Company, C employs P, U is CWUser, U login L, U mail M' : {0: [(2,'employs', 'subject')], 1: [(3,'login', 'subject'), (4,'mail', 'subject')]}, } for rql, results in queries.items(): @@ -46,13 +49,13 @@ -class ResultSetTC(EnvBasedTC): +class ResultSetTC(EnvBasedTC): def setUp(self): super(ResultSetTC, self).setUp() self.rset = ResultSet([[12, 'adim'], [13, 'syt']], - 'Any U,L where U is EUser, U login L', - description=[['EUser', 'String'], ['Bar', 'String']]) + 'Any U,L where U is CWUser, U login L', + description=[['CWUser', 'String'], ['Bar', 'String']]) self.rset.vreg = self.vreg def compare_urls(self, url1, url2): @@ -64,7 +67,7 @@ params2 = dict(pair.split('=') for pair in info1[3].split('&')) self.assertDictEquals(params1, params2) - + def test_build_url(self): req = self.request() baseurl = req.base_url() @@ -76,20 +79,20 @@ # '%stask/title/go' % baseurl) # empty _restpath should not crash self.compare_urls(req.build_url('view', _restpath=''), baseurl) - - + + def test_resultset_build(self): """test basic build of a ResultSet""" - rs = ResultSet([1,2,3], 'EGroup X', description=['EGroup', 'EGroup', 'EGroup']) + rs = ResultSet([1,2,3], 'CWGroup X', description=['CWGroup', 'CWGroup', 'CWGroup']) self.assertEquals(rs.rowcount, 3) self.assertEquals(rs.rows, [1,2,3]) - self.assertEquals(rs.description, ['EGroup', 'EGroup', 'EGroup']) + self.assertEquals(rs.description, ['CWGroup', 'CWGroup', 'CWGroup']) def test_resultset_limit(self): rs = ResultSet([[12000, 'adim'], [13000, 'syt'], [14000, 'nico']], - 'Any U,L where U is EUser, U login L', - description=[['EUser', 'String']] * 3) + 'Any U,L where U is CWUser, U login L', + description=[['CWUser', 'String']] * 3) rs.req = self.request() rs.vreg = self.env.vreg @@ -99,25 +102,25 @@ self.assertEquals(rs2.get_entity(0, 0).row, 0) self.assertEquals(rs.limit(2, offset=2).rows, [[14000, 'nico']]) self.assertEquals(rs.limit(2, offset=3).rows, []) - + def test_resultset_filter(self): rs = ResultSet([[12000, 'adim'], [13000, 'syt'], [14000, 'nico']], - 'Any U,L where U is EUser, U login L', - description=[['EUser', 'String']] * 3) + 'Any U,L where U is CWUser, U login L', + description=[['CWUser', 'String']] * 3) rs.req = self.request() rs.vreg = self.env.vreg def test_filter(entity): return entity.login != 'nico' - + rs2 = rs.filtered_rset(test_filter) self.assertEquals(len(rs2), 2) self.assertEquals([login for _, login in rs2], ['adim', 'syt']) - + def test_resultset_transform(self): rs = ResultSet([[12, 'adim'], [13, 'syt'], [14, 'nico']], - 'Any U,L where U is EUser, U login L', - description=[['EUser', 'String']] * 3) + 'Any U,L where U is CWUser, U login L', + description=[['CWUser', 'String']] * 3) rs.req = self.request() def test_transform(row, desc): return row[1:], desc[1:] @@ -125,20 +128,20 @@ self.assertEquals(len(rs2), 3) self.assertEquals(list(rs2), [['adim'],['syt'],['nico']]) - + def test_resultset_sort(self): rs = ResultSet([[12000, 'adim'], [13000, 'syt'], [14000, 'nico']], - 'Any U,L where U is EUser, U login L', - description=[['EUser', 'String']] * 3) + 'Any U,L where U is CWUser, U login L', + description=[['CWUser', 'String']] * 3) rs.req = self.request() rs.vreg = self.env.vreg - + rs2 = rs.sorted_rset(lambda e:e['login']) self.assertEquals(len(rs2), 3) self.assertEquals([login for _, login in rs2], ['adim', 'nico', 'syt']) # make sure rs is unchanged self.assertEquals([login for _, login in rs], ['adim', 'syt', 'nico']) - + rs2 = rs.sorted_rset(lambda e:e['login'], reverse=True) self.assertEquals(len(rs2), 3) self.assertEquals([login for _, login in rs2], ['syt', 'nico', 'adim']) @@ -157,12 +160,12 @@ [13000, 'syt', u'Le carrelage en 42 leçons'], [14000, 'nico', u'La tarte tatin en 15 minutes'], [14000, 'nico', u"L'épluchage du castor commun"]], - 'Any U, L, T WHERE U is EUser, U login L,'\ + 'Any U, L, T WHERE U is CWUser, U login L,'\ 'D created_by U, D title T', - description=[['EUser', 'String', 'String']] * 5) + description=[['CWUser', 'String', 'String']] * 5) rs.req = self.request() rs.vreg = self.env.vreg - + rsets = rs.split_rset(lambda e:e['login']) self.assertEquals(len(rsets), 3) self.assertEquals([login for _, login,_ in rsets[0]], ['adim', 'adim']) @@ -170,7 +173,7 @@ self.assertEquals([login for _, login,_ in rsets[2]], ['nico', 'nico']) # make sure rs is unchanged self.assertEquals([login for _, login,_ in rs], ['adim', 'adim', 'syt', 'nico', 'nico']) - + rsets = rs.split_rset(lambda e:e['login'], return_dict=True) self.assertEquals(len(rsets), 3) self.assertEquals([login for _, login,_ in rsets['nico']], ['nico', 'nico']) @@ -195,7 +198,7 @@ u'Le carrelage en 42 leçons', u'La tarte tatin en 15 minutes', u"L'épluchage du castor commun"]) - + def test_cached_syntax_tree(self): """make sure syntax tree is cached""" rqlst1 = self.rset.syntax_tree() @@ -203,7 +206,7 @@ self.assert_(rqlst1 is rqlst2) def test_get_entity_simple(self): - self.add_entity('EUser', login=u'adim', upassword='adim', + self.add_entity('CWUser', login=u'adim', upassword='adim', surname=u'di mascio', firstname=u'adrien') e = self.entity('Any X,T WHERE X login "adim", X surname T') self.assertEquals(e['surname'], 'di mascio') @@ -213,12 +216,12 @@ e.complete() self.assertEquals(e['firstname'], 'adrien') self.assertEquals(pprelcachedict(e._related_cache), []) - + def test_get_entity_advanced(self): self.add_entity('Bookmark', title=u'zou', path=u'/view') self.execute('SET X bookmarked_by Y WHERE X is Bookmark, Y login "anon"') rset = self.execute('Any X,Y,XT,YN WHERE X bookmarked_by Y, X title XT, Y login YN') - + e = rset.get_entity(0, 0) self.assertEquals(e.row, 0) self.assertEquals(e.col, 0) @@ -226,7 +229,7 @@ self.assertRaises(KeyError, e.__getitem__, 'path') self.assertEquals(e.view('text'), 'zou') self.assertEquals(pprelcachedict(e._related_cache), []) - + e = rset.get_entity(0, 1) self.assertEquals(e.row, 0) self.assertEquals(e.col, 1) @@ -239,7 +242,7 @@ self.assertEquals(e.view('text'), 'anon') self.assertEquals(pprelcachedict(e._related_cache), []) - + self.assertRaises(NotAnEntity, rset.get_entity, 0, 2) self.assertRaises(NotAnEntity, rset.get_entity, 0, 3) @@ -247,7 +250,7 @@ rset = self.execute('Any X,S WHERE X in_state S, X login "anon"') e = rset.get_entity(0, 0) seid = self.execute('State X WHERE X name "activated"')[0][0] - # for_user / in_group are prefetched in EUser __init__, in_state should + # for_user / in_group are prefetched in CWUser __init__, in_state should # be filed from our query rset self.assertEquals(pprelcachedict(e._related_cache), [('in_state_subject', [seid])]) @@ -270,9 +273,9 @@ self.assertEquals(s['name'], 'activated') self.assertRaises(KeyError, s.__getitem__, 'description') - + def test_get_entity_cache_with_left_outer_join(self): - eid = self.execute('INSERT EUser E: E login "joe", E upassword "joe", E in_group G ' + eid = self.execute('INSERT CWUser E: E login "joe", E upassword "joe", E in_group G ' 'WHERE G name "users"')[0][0] rset = self.execute('Any X,E WHERE X eid %(x)s, X primary_email E?', {'x': eid}) e = rset.get_entity(0, 0) @@ -283,63 +286,63 @@ cached = e.related_cache('primary_email', 'subject', False) self.assertIsInstance(cached, ResultSet) self.assertEquals(cached.rowcount, 0) - + def test_get_entity_union(self): e = self.add_entity('Bookmark', title=u'manger', path=u'path') rset = self.execute('Any X,N ORDERBY N WITH X,N BEING ' '((Any X,N WHERE X is Bookmark, X title N)' ' UNION ' - ' (Any X,N WHERE X is EGroup, X name N))') - expected = (('EGroup', 'guests'), ('EGroup', 'managers'), - ('Bookmark', 'manger'), ('EGroup', 'owners'), - ('EGroup', 'users')) + ' (Any X,N WHERE X is CWGroup, X name N))') + expected = (('CWGroup', 'guests'), ('CWGroup', 'managers'), + ('Bookmark', 'manger'), ('CWGroup', 'owners'), + ('CWGroup', 'users')) for entity in rset.entities(): # test get_entity for each row actually etype, n = expected[entity.row] self.assertEquals(entity.id, etype) attr = etype == 'Bookmark' and 'title' or 'name' self.assertEquals(entity[attr], n) - + def test_related_entity_optional(self): e = self.add_entity('Bookmark', title=u'aaaa', path=u'path') rset = self.execute('Any B,U,L WHERE B bookmarked_by U?, U login L') entity, rtype = rset.related_entity(0, 2) self.assertEquals(entity, None) self.assertEquals(rtype, None) - + def test_related_entity_union_subquery(self): e = self.add_entity('Bookmark', title=u'aaaa', path=u'path') rset = self.execute('Any X,N ORDERBY N WITH X,N BEING ' - '((Any X,N WHERE X is EGroup, X name N)' + '((Any X,N WHERE X is CWGroup, X name N)' ' UNION ' ' (Any X,N WHERE X is Bookmark, X title N))') entity, rtype = rset.related_entity(0, 1) self.assertEquals(entity.eid, e.eid) self.assertEquals(rtype, 'title') entity, rtype = rset.related_entity(1, 1) - self.assertEquals(entity.id, 'EGroup') + self.assertEquals(entity.id, 'CWGroup') self.assertEquals(rtype, 'name') rset = self.execute('Any X,N ORDERBY N WHERE X is Bookmark WITH X,N BEING ' - '((Any X,N WHERE X is EGroup, X name N)' + '((Any X,N WHERE X is CWGroup, X name N)' ' UNION ' ' (Any X,N WHERE X is Bookmark, X title N))') entity, rtype = rset.related_entity(0, 1) self.assertEquals(entity.eid, e.eid) self.assertEquals(rtype, 'title') - + def test_entities(self): rset = self.execute('Any U,G WHERE U in_group G') # make sure we have at least one element self.failUnless(rset) self.assertEquals(set(e.e_schema.type for e in rset.entities(0)), - set(['EUser',])) + set(['CWUser',])) self.assertEquals(set(e.e_schema.type for e in rset.entities(1)), - set(['EGroup',])) + set(['CWGroup',])) - def test_printable_rql(self): - rset = self.execute(u'EEType X WHERE X final FALSE, X meta FALSE') + def test_printable_rql(self): + rset = self.execute(u'CWEType X WHERE X final FALSE, X meta FALSE') self.assertEquals(rset.printable_rql(), - 'Any X WHERE X final FALSE, X meta FALSE, X is EEType') + 'Any X WHERE X final FALSE, X meta FALSE, X is CWEType') def test_searched_text(self): @@ -347,7 +350,7 @@ self.assertEquals(rset.searched_text(), 'foobar') rset = self.execute(u'Any X WHERE X has_text %(text)s', {'text' : 'foo'}) self.assertEquals(rset.searched_text(), 'foo') - - + + if __name__ == '__main__': unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 test/unittest_rtags.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/unittest_rtags.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,57 @@ +from logilab.common.testlib import TestCase, unittest_main +from cubicweb.rtags import RelationTags, RelationTagsSet + +class RelationTagsTC(TestCase): + + def test_rtags_expansion(self): + rtags = RelationTags() + rtags.tag_subject_of(('Societe', 'travaille', '*'), 'primary') + rtags.tag_subject_of(('*', 'evaluee', '*'), 'secondary') + rtags.tag_object_of(('*', 'tags', '*'), 'generated') + self.assertEquals(rtags.get('Note', 'evaluee', '*', 'subject'), + 'secondary') + self.assertEquals(rtags.get('Societe', 'travaille', '*', 'subject'), + 'primary') + self.assertEquals(rtags.get('Note', 'travaille', '*', 'subject'), + None) + self.assertEquals(rtags.get('Note', 'tags', '*', 'subject'), + None) + self.assertEquals(rtags.get('*', 'tags', 'Note', 'object'), + 'generated') + self.assertEquals(rtags.get('Tag', 'tags', '*', 'object'), + 'generated') + +# self.assertEquals(rtags.rtag('evaluee', 'Note', 'subject'), set(('secondary', 'link'))) +# self.assertEquals(rtags.is_inlined('evaluee', 'Note', 'subject'), False) +# self.assertEquals(rtags.rtag('evaluee', 'Personne', 'subject'), set(('secondary', 'link'))) +# self.assertEquals(rtags.is_inlined('evaluee', 'Personne', 'subject'), False) +# self.assertEquals(rtags.rtag('ecrit_par', 'Note', 'object'), set(('inlineview', 'link'))) +# self.assertEquals(rtags.is_inlined('ecrit_par', 'Note', 'object'), True) +# class Personne2(Personne): +# id = 'Personne' +# __rtags__ = { +# ('evaluee', 'Note', 'subject') : set(('inlineview',)), +# } +# self.vreg.register_vobject_class(Personne2) +# rtags = Personne2.rtags +# self.assertEquals(rtags.rtag('evaluee', 'Note', 'subject'), set(('inlineview', 'link'))) +# self.assertEquals(rtags.is_inlined('evaluee', 'Note', 'subject'), True) +# self.assertEquals(rtags.rtag('evaluee', 'Personne', 'subject'), set(('secondary', 'link'))) +# self.assertEquals(rtags.is_inlined('evaluee', 'Personne', 'subject'), False) + + + def test_rtagset_expansion(self): + rtags = RelationTagsSet() + rtags.tag_subject_of(('Societe', 'travaille', '*'), 'primary') + rtags.tag_subject_of(('*', 'travaille', '*'), 'secondary') + self.assertEquals(rtags.get('Societe', 'travaille', '*', 'subject'), + set(('primary', 'secondary'))) + self.assertEquals(rtags.get('Societe', 'travaille', '*', 'subject'), + set(('primary', 'secondary'))) + self.assertEquals(rtags.get('Note', 'travaille', '*', 'subject'), + set(('secondary',))) + self.assertEquals(rtags.get('Note', 'tags', "*", 'subject'), + set()) + +if __name__ == '__main__': + unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 test/unittest_schema.py --- a/test/unittest_schema.py Tue May 05 17:18:49 2009 +0200 +++ b/test/unittest_schema.py Thu May 14 12:48:11 2009 +0200 @@ -96,7 +96,7 @@ ['Any X WHERE X travaille S, S owned_by U, X eid %(x)s, U eid %(u)s']) eperson.set_groups('read', ('managers',)) self.assertEqual(eperson.get_groups('read'), set(('managers',))) - + def test_relation_perms(self): rconcerne = schema.rschema('concerne') rconcerne.set_default_groups() @@ -112,19 +112,19 @@ self.assertRaises(RQLSyntaxError, ERQLExpression, '1') expr = ERQLExpression('X travaille S, S owned_by U') self.assertEquals(str(expr), 'Any X WHERE X travaille S, S owned_by U, X eid %(x)s, U eid %(u)s') - + def test_rrqlexpression(self): self.assertRaises(Exception, RRQLExpression, '1') self.assertRaises(RQLSyntaxError, RRQLExpression, 'O X Y') expr = RRQLExpression('U has_update_permission O') self.assertEquals(str(expr), 'Any O WHERE U has_update_permission O, O eid %(o)s, U eid %(u)s') - + loader = CubicWebSchemaLoader() config = TestConfiguration('data') config.bootstrap_cubes() loader.lib_directory = config.schemas_lib_dir() - + class SQLSchemaReaderClassTest(TestCase): def test_knownValues_include_schema_files(self): @@ -134,21 +134,20 @@ self.assertListEquals([basename(f) for f in schema_files], ['Bookmark.py']) def test_knownValues_load_schema(self): - """read an url and return a Schema instance""" schema = loader.load(config) self.assert_(isinstance(schema, CubicWebSchema)) self.assertEquals(schema.name, 'data') entities = [str(e) for e in schema.entities()] entities.sort() - expected_entities = ['Bookmark', 'Boolean', 'Bytes', 'Card', + expected_entities = ['Bookmark', 'Boolean', 'Bytes', 'Card', 'Date', 'Datetime', 'Decimal', - 'ECache', 'EConstraint', 'EConstraintType', 'EEType', - 'EFRDef', 'EGroup', 'EmailAddress', 'ENFRDef', - 'EPermission', 'EProperty', 'ERType', 'EUser', - 'Float', 'Int', 'Interval', - 'Password', - 'RQLExpression', - 'State', 'String', 'Time', + 'CWCache', 'CWConstraint', 'CWConstraintType', 'CWEType', + 'CWAttribute', 'CWGroup', 'EmailAddress', 'CWRelation', + 'CWPermission', 'CWProperty', 'CWRType', 'CWUser', + 'File', 'Float', 'Image', 'Int', 'Interval', 'Note', + 'Password', 'Personne', + 'RQLExpression', + 'Societe', 'State', 'String', 'SubNote', 'Tag', 'Time', 'Transition', 'TrInfo'] self.assertListEquals(entities, sorted(expected_entities)) relations = [str(r) for r in schema.relations()] @@ -156,19 +155,19 @@ expected_relations = ['add_permission', 'address', 'alias', 'allowed_transition', 'bookmarked_by', 'canonical', - 'cardinality', 'comment', 'comment_format', - 'composite', 'condition', 'constrained_by', 'content', + 'cardinality', 'comment', 'comment_format', + 'composite', 'condition', 'connait', 'constrained_by', 'content', 'content_format', 'created_by', 'creation_date', 'cstrtype', - 'defaultval', 'delete_permission', 'description', - 'description_format', 'destination_state', + 'data', 'data_encoding', 'data_format', 'defaultval', 'delete_permission', + 'description', 'description_format', 'destination_state', - 'eid', 'expression', 'exprtype', + 'ecrit_par', 'eid', 'evaluee', 'expression', 'exprtype', 'final', 'firstname', 'for_user', 'from_entity', 'from_state', 'fulltext_container', 'fulltextindexed', - 'has_text', + 'has_text', 'identical_to', 'identity', 'in_group', 'in_state', 'indexed', 'initial_state', 'inlined', 'internationalizable', 'is', 'is_instance_of', @@ -176,30 +175,30 @@ 'mainvars', 'meta', 'modification_date', - 'name', + 'name', 'nom', 'ordernum', 'owned_by', - 'path', 'pkey', 'primary_email', + 'path', 'pkey', 'prenom', 'primary_email', 'read_permission', 'relation_type', 'require_group', - + 'specializes', 'state_of', 'surname', 'symetric', 'synopsis', - 'timestamp', 'title', 'to_entity', 'to_state', 'transition_of', + 'tags', 'timestamp', 'title', 'to_entity', 'to_state', 'transition_of', 'travaille', 'type', 'upassword', 'update_permission', 'use_email', - 'value', + 'value', 'wf_info_for', 'wikiid'] - + self.assertListEquals(relations, expected_relations) - eschema = schema.eschema('EUser') + eschema = schema.eschema('CWUser') rels = sorted(str(r) for r in eschema.subject_relations()) self.assertListEquals(rels, ['created_by', 'creation_date', 'eid', - 'firstname', 'has_text', 'identity', + 'evaluee', 'firstname', 'has_text', 'identity', 'in_group', 'in_state', 'is', 'is_instance_of', 'last_login_time', 'login', 'modification_date', 'owned_by', @@ -209,7 +208,7 @@ self.assertListEquals(rels, ['bookmarked_by', 'created_by', 'for_user', 'identity', 'owned_by', 'wf_info_for']) rschema = schema.rschema('relation_type') - properties = rschema.rproperties('EFRDef', 'ERType') + properties = rschema.rproperties('CWAttribute', 'CWRType') self.assertEquals(properties['cardinality'], '1*') constraints = properties['constraints'] self.failUnlessEqual(len(constraints), 1, constraints) @@ -219,7 +218,7 @@ def test_fulltext_container(self): schema = loader.load(config) - self.failUnless('has_text' in schema['EUser'].subject_relations()) + self.failUnless('has_text' in schema['CWUser'].subject_relations()) self.failIf('has_text' in schema['EmailAddress'].subject_relations()) @@ -235,16 +234,16 @@ ex = self.assertRaises(BadSchemaDefinition, self.loader._build_schema, 'toto', False) self.assertEquals(str(ex), msg) - + def test_rrqlexpr_on_etype(self): self._test('rrqlexpr_on_eetype.py', "can't use RRQLExpression on an entity type, use an ERQLExpression (ToTo)") - + def test_erqlexpr_on_rtype(self): self._test('erqlexpr_on_ertype.py', "can't use ERQLExpression on a relation type, use a RRQLExpression (toto)") - + def test_rqlexpr_on_rtype_read(self): self._test('rqlexpr_on_ertype_read.py', "can't use rql expression for read permission of a relation type (toto)") - + def test_rrqlexpr_on_attr(self): self._test('rrqlexpr_on_attr.py', "can't use RRQLExpression on a final relation type (eg attribute relation), use an ERQLExpression (attr)") diff -r 49075f57cf2c -r aa09e20dd8c0 test/unittest_selectors.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/unittest_selectors.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,136 @@ +"""unit tests for selectors mechanism + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" + +from logilab.common.testlib import TestCase, unittest_main + +from cubicweb.devtools.testlib import EnvBasedTC +from cubicweb.vregistry import Selector, AndSelector, OrSelector +from cubicweb.selectors import implements, match_user_groups +from cubicweb.interfaces import IDownloadable +from cubicweb.web import action + +class _1_(Selector): + def __call__(self, *args, **kwargs): + return 1 + +class _0_(Selector): + def __call__(self, *args, **kwargs): + return 0 + +def _2_(*args, **kwargs): + return 2 + + +class SelectorsTC(TestCase): + def test_basic_and(self): + selector = _1_() & _1_() + self.assertEquals(selector(None), 2) + selector = _1_() & _0_() + self.assertEquals(selector(None), 0) + selector = _0_() & _1_() + self.assertEquals(selector(None), 0) + + def test_basic_or(self): + selector = _1_() | _1_() + self.assertEquals(selector(None), 1) + selector = _1_() | _0_() + self.assertEquals(selector(None), 1) + selector = _0_() | _1_() + self.assertEquals(selector(None), 1) + selector = _0_() | _0_() + self.assertEquals(selector(None), 0) + + def test_selector_and_function(self): + selector = _1_() & _2_ + self.assertEquals(selector(None), 3) + selector = _2_ & _1_() + self.assertEquals(selector(None), 3) + + def test_three_and(self): + selector = _1_() & _1_() & _1_() + self.assertEquals(selector(None), 3) + selector = _1_() & _0_() & _1_() + self.assertEquals(selector(None), 0) + selector = _0_() & _1_() & _1_() + self.assertEquals(selector(None), 0) + + def test_three_or(self): + selector = _1_() | _1_() | _1_() + self.assertEquals(selector(None), 1) + selector = _1_() | _0_() | _1_() + self.assertEquals(selector(None), 1) + selector = _0_() | _1_() | _1_() + self.assertEquals(selector(None), 1) + selector = _0_() | _0_() | _0_() + self.assertEquals(selector(None), 0) + + def test_composition(self): + selector = (_1_() & _1_()) & (_1_() & _1_()) + self.failUnless(isinstance(selector, AndSelector)) + self.assertEquals(len(selector.selectors), 4) + self.assertEquals(selector(None), 4) + selector = (_1_() & _0_()) | (_1_() & _1_()) + self.failUnless(isinstance(selector, OrSelector)) + self.assertEquals(len(selector.selectors), 2) + self.assertEquals(selector(None), 2) + + def test_search_selectors(self): + sel = implements('something') + self.assertIs(sel.search_selector(implements), sel) + csel = AndSelector(sel, Selector()) + self.assertIs(csel.search_selector(implements), sel) + csel = AndSelector(Selector(), sel) + self.assertIs(csel.search_selector(implements), sel) + + +class ImplementsSelectorTC(EnvBasedTC): + def test_etype_priority(self): + req = self.request() + cls = self.vreg.etype_class('File') + anyscore = implements('Any').score_class(cls, req) + idownscore = implements(IDownloadable).score_class(cls, req) + self.failUnless(idownscore > anyscore, (idownscore, anyscore)) + filescore = implements('File').score_class(cls, req) + self.failUnless(filescore > idownscore, (filescore, idownscore)) + + def test_etype_inheritance_no_yams_inheritance(self): + cls = self.vreg.etype_class('Personne') + self.failIf(implements('Societe').score_class(cls, self.request())) + + +class MatchUserGroupsTC(EnvBasedTC): + def test_owners_group(self): + """tests usage of 'owners' group with match_user_group""" + class SomeAction(action.Action): + id = 'yo' + category = 'foo' + __select__ = match_user_groups('owners') + self.vreg._loadedmods[__name__] = {} + self.vreg.register_vobject_class(SomeAction) + self.failUnless(SomeAction in self.vreg['actions']['yo'], self.vreg['actions']) + try: + # login as a simple user + self.create_user('john') + self.login('john') + # it should not be possible to use SomeAction not owned objects + rset, req = self.env.get_rset_and_req('Any G WHERE G is CWGroup, G name "managers"') + self.failIf('yo' in dict(self.pactions(req, rset))) + # insert a new card, and check that we can use SomeAction on our object + self.execute('INSERT Card C: C title "zoubidou"') + self.commit() + rset, req = self.env.get_rset_and_req('Card C WHERE C title "zoubidou"') + self.failUnless('yo' in dict(self.pactions(req, rset)), self.pactions(req, rset)) + # make sure even managers can't use the action + self.restore_connection() + rset, req = self.env.get_rset_and_req('Card C WHERE C title "zoubidou"') + self.failIf('yo' in dict(self.pactions(req, rset))) + finally: + del self.vreg[SomeAction.__registry__][SomeAction.id] + +if __name__ == '__main__': + unittest_main() + diff -r 49075f57cf2c -r aa09e20dd8c0 test/unittest_utils.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/unittest_utils.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,47 @@ +"""unit tests for module cubicweb.common.utils""" + +from logilab.common.testlib import TestCase, unittest_main + +from cubicweb.common.utils import make_uid, UStringIO, SizeConstrainedList + + +class MakeUidTC(TestCase): + def test_1(self): + self.assertNotEquals(make_uid('xyz'), make_uid('abcd')) + self.assertNotEquals(make_uid('xyz'), make_uid('xyz')) + + def test_2(self): + d = {} + while len(d)<10000: + uid = make_uid('xyz') + if d.has_key(uid): + self.fail(len(d)) + d[uid] = 1 + + +class UStringIOTC(TestCase): + def test_boolean_value(self): + self.assert_(UStringIO()) + + +class SizeConstrainedListTC(TestCase): + + def test_append(self): + l = SizeConstrainedList(10) + for i in xrange(12): + l.append(i) + self.assertEquals(l, range(2, 12)) + + def test_extend(self): + testdata = [(range(5), range(5)), + (range(10), range(10)), + (range(12), range(2, 12)), + ] + for extension, expected in testdata: + l = SizeConstrainedList(10) + l.extend(extension) + yield self.assertEquals, l, expected + + +if __name__ == '__main__': + unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 test/unittest_vregistry.py --- a/test/unittest_vregistry.py Tue May 05 17:18:49 2009 +0200 +++ b/test/unittest_vregistry.py Thu May 14 12:48:11 2009 +0200 @@ -5,45 +5,62 @@ from cubicweb import CW_SOFTWARE_ROOT as BASE from cubicweb.vregistry import VObject from cubicweb.cwvreg import CubicWebRegistry, UnknownProperty -from cubicweb.cwconfig import CubicWebConfiguration +from cubicweb.devtools import TestServerConfiguration +from cubicweb.interfaces import IMileStone + +from cubes.card.entities import Card class YesSchema: def __contains__(self, something): return True - + +WEBVIEWSDIR = join(BASE, 'web', 'views') + class VRegistryTC(TestCase): def setUp(self): - config = CubicWebConfiguration('data') + config = TestServerConfiguration('data') self.vreg = CubicWebRegistry(config) - self.vreg.schema = YesSchema() - - def test_load(self): - self.vreg.load_file(join(BASE, 'web', 'views'), 'euser.py') - self.vreg.load_file(join(BASE, 'web', 'views'), 'baseviews.py') - fpvc = [v for v in self.vreg.registry_objects('views', 'primary') if v.accepts[0] == 'EUser'][0] - fpv = fpvc(None, None) - # don't want a TypeError due to super call - self.assertRaises(AttributeError, fpv.render_entity_attributes, None, None) + config.bootstrap_cubes() + self.vreg.schema = config.load_schema() def test_load_interface_based_vojects(self): - self.vreg.load_file(join(BASE, 'web', 'views'), 'idownloadable.py') - self.vreg.load_file(join(BASE, 'web', 'views'), 'baseviews.py') - # check loading baseviews after idownloadable isn't kicking interface based views + self.vreg.init_registration([WEBVIEWSDIR]) + self.vreg.load_file(join(BASE, 'entities', '__init__.py'), 'cubicweb.entities.__init__') + self.vreg.load_file(join(WEBVIEWSDIR, 'idownloadable.py'), 'cubicweb.web.views.idownloadable') + self.vreg.load_file(join(WEBVIEWSDIR, 'primary.py'), 'cubicweb.web.views.primary') self.assertEquals(len(self.vreg['views']['primary']), 2) - - def test_autoselectors(self): + self.vreg.initialization_completed() + self.assertEquals(len(self.vreg['views']['primary']), 1) + + def test___selectors__compat(self): myselector1 = lambda *args: 1 myselector2 = lambda *args: 1 class AnAppObject(VObject): __selectors__ = (myselector1, myselector2) - self.assertEquals(AnAppObject.__select__(), 2) + AnAppObject.build___select__() + self.assertEquals(AnAppObject.__select__(AnAppObject), 2) def test_properties(self): self.failIf('system.version.cubicweb' in self.vreg['propertydefs']) self.failUnless(self.vreg.property_info('system.version.cubicweb')) self.assertRaises(UnknownProperty, self.vreg.property_info, 'a.non.existent.key') - + + def test_load_subinterface_based_vobjects(self): + self.vreg.reset() + self.vreg.register_objects([join(BASE, 'web', 'views', 'iprogress.py')]) + # check progressbar was kicked + self.failIf(self.vreg['views'].get('progressbar')) + class MyCard(Card): + __implements__ = (IMileStone,) + self.vreg.reset() + self.vreg._loadedmods[__name__] = {} + self.vreg.register_vobject_class(MyCard) + self.vreg.register_objects([join(BASE, 'entities', '__init__.py'), + join(BASE, 'web', 'views', 'iprogress.py')]) + # check progressbar isn't kicked + self.assertEquals(len(self.vreg['views']['progressbar']), 1) + if __name__ == '__main__': unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 toolsutils.py --- a/toolsutils.py Tue May 05 17:18:49 2009 +0200 +++ b/toolsutils.py Thu May 14 12:48:11 2009 +0200 @@ -1,7 +1,7 @@ """some utilities for cubicweb tools :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -11,7 +11,7 @@ from os.path import exists, join, abspath, normpath from logilab.common.clcommands import Command as BaseCommand, \ - main_run as base_main_run, register_commands, pop_arg, cmd_run + main_run as base_main_run from logilab.common.compat import any from cubicweb import warning @@ -39,7 +39,7 @@ if ex.errno != errno.EEXIST: raise print 'directory %s already exists' % directory - + def create_symlink(source, target): """create a symbolic link""" if exists(target): @@ -51,7 +51,7 @@ import shutil print '[copy] %s <-- %s' % (target, source) shutil.copy2(source, target) - + def rm(whatever): import shutil shutil.rmtree(whatever) @@ -66,7 +66,7 @@ diffs = p_output.read() if diffs: if askconfirm: - print + print print diffs action = raw_input('replace (N/y/q) ? ').lower() else: @@ -114,13 +114,13 @@ tfpath = tfpath[:-5] if not askconfirm or not exists(tfpath) or \ confirm('%s exists, overwrite?' % tfpath): - fname = fill_templated_file(fpath, tfpath, context) + fill_templated_file(fpath, tfpath, context) print '[generate] %s <-- %s' % (tfpath, fpath) elif exists(tfpath): show_diffs(tfpath, fpath, askconfirm) else: shutil.copyfile(fpath, tfpath) - + def fill_templated_file(fpath, tfpath, context): fobj = file(tfpath, 'w') templated = file(fpath).read() @@ -158,7 +158,7 @@ :param config_file: path to the configuration file :rtype: dict - :return: a dictionary with specified values associated to option names + :return: a dictionary with specified values associated to option names """ from logilab.common.fileutils import lines config = current = {} @@ -194,10 +194,10 @@ :type default: str :param default: default value if the environment variable is not defined - + :type name: str :param name: the informal name of the path, used for error message - + :rtype: str :return: the value of the environment variable or the default value @@ -243,12 +243,12 @@ msg = 'No helper for command %s using %s configuration' % ( cmdname, config.name) raise ConfigurationError(msg) - + def fail(self, reason): print "command failed:", reason sys.exit(1) - - + + def main_run(args, doc): """command line tool""" try: @@ -289,4 +289,4 @@ if not password: password = getpass('password: ') return connect(user=user, password=password, host=optconfig.host, database=appid) - + diff -r 49075f57cf2c -r aa09e20dd8c0 utils.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/utils.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,320 @@ +"""Some utilities for CubicWeb server/clients. + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +import locale +from md5 import md5 +from datetime import datetime, timedelta, date +from time import time +from random import randint, seed +from calendar import monthrange + +# initialize random seed from current time +seed() +try: + strptime = datetime.strptime +except AttributeError: # py < 2.5 + from time import strptime as time_strptime + def strptime(value, format): + return datetime(*time_strptime(value, format)[:6]) + +def todate(somedate): + """return a date from a date (leaving unchanged) or a datetime""" + if isinstance(somedate, datetime): + return date(somedate.year, somedate.month, somedate.day) + assert isinstance(somedate, date), repr(somedate) + return somedate + +def todatetime(somedate): + """return a date from a date (leaving unchanged) or a datetime""" + # take care, datetime is a subclass of date + if isinstance(somedate, datetime): + return somedate + assert isinstance(somedate, date), repr(somedate) + return datetime(somedate.year, somedate.month, somedate.day) + +ONEDAY = timedelta(days=1) +ONEWEEK = timedelta(days=7) + +def days_in_month(date_): + return monthrange(date_.year, date_.month)[1] + +def previous_month(date_, nbmonth=1): + while nbmonth: + date_ = first_day(date_) - ONEDAY + nbmonth -= 1 + return date_ + +def next_month(date_, nbmonth=1): + while nbmonth: + date_ = last_day(date_) + ONEDAY + nbmonth -= 1 + return date_ + +def first_day(date_): + return date(date_.year, date_.month, 1) + +def last_day(date_): + return date(date_.year, date_.month, days_in_month(date_)) + +def date_range(begin, end, incday=None, incmonth=None): + """yields each date between begin and end + :param begin: the start date + :param end: the end date + :param incr: the step to use to iterate over dates. Default is + one day. + :param include: None (means no exclusion) or a function taking a + date as parameter, and returning True if the date + should be included. + """ + assert not (incday and incmonth) + begin = todate(begin) + end = todate(end) + if incmonth: + while begin < end: + begin = next_month(begin, incmonth) + yield begin + else: + if not incday: + incr = ONEDAY + else: + incr = timedelta(incday) + while begin <= end: + yield begin + begin += incr + +def ustrftime(date, fmt='%Y-%m-%d'): + """like strftime, but returns a unicode string instead of an encoded + string which' may be problematic with localized date. + + encoding is guessed by locale.getpreferredencoding() + """ + # date format may depend on the locale + encoding = locale.getpreferredencoding(do_setlocale=False) or 'UTF-8' + return unicode(date.strftime(str(fmt)), encoding) + +def make_uid(key): + """forge a unique identifier""" + msg = str(key) + "%.10f"%time() + str(randint(0, 1000000)) + return md5(msg).hexdigest() + + +def dump_class(cls, clsname): + """create copy of a class by creating an empty class inheriting + from the given cls. + + Those class will be used as place holder for attribute and relation + description + """ + # type doesn't accept unicode name + # return type.__new__(type, str(clsname), (cls,), {}) + # __autogenerated__ attribute is just a marker + return type(str(clsname), (cls,), {'__autogenerated__': True}) + + +def merge_dicts(dict1, dict2): + """update a copy of `dict1` with `dict2`""" + dict1 = dict(dict1) + dict1.update(dict2) + return dict1 + + +class SizeConstrainedList(list): + """simple list that makes sure the list does not get bigger + than a given size. + + when the list is full and a new element is added, the first + element of the list is removed before appending the new one + + >>> l = SizeConstrainedList(2) + >>> l.append(1) + >>> l.append(2) + >>> l + [1, 2] + >>> l.append(3) + [2, 3] + """ + def __init__(self, maxsize): + self.maxsize = maxsize + + def append(self, element): + if len(self) == self.maxsize: + del self[0] + super(SizeConstrainedList, self).append(element) + + def extend(self, sequence): + super(SizeConstrainedList, self).extend(sequence) + keepafter = len(self) - self.maxsize + if keepafter > 0: + del self[:keepafter] + + __iadd__ = extend + + +class UStringIO(list): + """a file wrapper which automatically encode unicode string to an encoding + specifed in the constructor + """ + + def __nonzero__(self): + return True + + def write(self, value): + assert isinstance(value, unicode), u"unicode required not %s : %s"\ + % (type(value).__name__, repr(value)) + self.append(value) + + def getvalue(self): + return u''.join(self) + + def __repr__(self): + return '<%s at %#x>' % (self.__class__.__name__, id(self)) + + +class HTMLHead(UStringIO): + """wraps HTML header's stream + + Request objects use a HTMLHead instance to ease adding of + javascripts and stylesheets + """ + js_unload_code = u'jQuery(window).unload(unloadPageData);' + + def __init__(self): + super(HTMLHead, self).__init__() + self.jsvars = [] + self.jsfiles = [] + self.cssfiles = [] + self.ie_cssfiles = [] + self.post_inlined_scripts = [] + self.pagedata_unload = False + + + def add_raw(self, rawheader): + self.write(rawheader) + + def define_var(self, var, value): + self.jsvars.append( (var, value) ) + + def add_post_inline_script(self, content): + self.post_inlined_scripts.append(content) + + def add_onload(self, jscode): + self.add_post_inline_script(u"""jQuery(document).ready(function () { + %s + });""" % jscode) + + + def add_js(self, jsfile): + """adds `jsfile` to the list of javascripts used in the webpage + + This function checks if the file has already been added + :param jsfile: the script's URL + """ + if jsfile not in self.jsfiles: + self.jsfiles.append(jsfile) + + def add_css(self, cssfile, media): + """adds `cssfile` to the list of javascripts used in the webpage + + This function checks if the file has already been added + :param cssfile: the stylesheet's URL + """ + if (cssfile, media) not in self.cssfiles: + self.cssfiles.append( (cssfile, media) ) + + def add_ie_css(self, cssfile, media='all'): + """registers some IE specific CSS""" + if (cssfile, media) not in self.ie_cssfiles: + self.ie_cssfiles.append( (cssfile, media) ) + + def add_unload_pagedata(self): + """registers onunload callback to clean page data on server""" + if not self.pagedata_unload: + self.post_inlined_scripts.append(self.js_unload_code) + self.pagedata_unload = True + + def getvalue(self, skiphead=False): + """reimplement getvalue to provide a consistent (and somewhat browser + optimzed cf. http://stevesouders.com/cuzillion) order in external + resources declaration + """ + w = self.write + # 1/ variable declaration if any + if self.jsvars: + from simplejson import dumps + w(u'\n') + # 2/ css files + for cssfile, media in self.cssfiles: + w(u'\n' % + (media, cssfile)) + # 3/ ie css if necessary + if self.ie_cssfiles: + w(u' \n') + # 4/ js files + for jsfile in self.jsfiles: + w(u'\n' % jsfile) + # 5/ post inlined scripts (i.e. scripts depending on other JS files) + if self.post_inlined_scripts: + w(u'\n') + header = super(HTMLHead, self).getvalue() + if skiphead: + return header + return u'\n%s\n' % header + + +class HTMLStream(object): + """represents a HTML page. + + This is used my main templates so that HTML headers can be added + at any time during the page generation. + + HTMLStream uses the (U)StringIO interface to be compliant with + existing code. + """ + + def __init__(self, req): + # stream for + self.head = req.html_headers + # main stream + self.body = UStringIO() + self.doctype = u'' + # xmldecl and html opening tag + self.xmldecl = u'\n' % req.encoding + self.htmltag = u'' % (req.lang, req.lang) + + + def write(self, data): + """StringIO interface: this method will be assigned to self.w + """ + self.body.write(data) + + def getvalue(self): + """writes HTML headers, closes tag and writes HTML body""" + return u'%s\n%s\n%s\n%s\n%s\n' % (self.xmldecl, self.doctype, + self.htmltag, + self.head.getvalue(), + self.body.getvalue()) + + +class AcceptMixIn(object): + """Mixin class for vobjects defining the 'accepts' attribute describing + a set of supported entity type (Any by default). + """ + # XXX deprecated, no more necessary + + diff -r 49075f57cf2c -r aa09e20dd8c0 view.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/view.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,484 @@ +"""abstract views and templates classes for CubicWeb web client + + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from cStringIO import StringIO + +from logilab.common.deprecation import obsolete +from logilab.mtconverter import html_escape + +from cubicweb import NotAnEntity +from cubicweb.selectors import yes, non_final_entity, nonempty_rset, none_rset +from cubicweb.selectors import require_group_compat, accepts_compat +from cubicweb.appobject import AppRsetObject +from cubicweb.utils import UStringIO, HTMLStream + +_ = unicode + + +# robots control +NOINDEX = u'' +NOFOLLOW = u'' + +CW_XHTML_EXTENSIONS = '''[ + + + ] ''' + +TRANSITIONAL_DOCTYPE = u'\n' % CW_XHTML_EXTENSIONS +TRANSITIONAL_DOCTYPE_NOEXT = u'\n' +STRICT_DOCTYPE = u'\n' % CW_XHTML_EXTENSIONS +STRICT_DOCTYPE_NOEXT = u'\n' + +# base view object ############################################################ + +class View(AppRsetObject): + """abstract view class, used as base for every renderable object such + as views, templates, some components...web + + A view is instantiated to render a [part of a] result set. View + subclasses may be parametred using the following class attributes: + + * `templatable` indicates if the view may be embeded in a main + template or if it has to be rendered standalone (i.e. XML for + instance) + * if the view is not templatable, it should set the `content_type` class + attribute to the correct MIME type (text/xhtml by default) + * the `category` attribute may be used in the interface to regroup related + objects together + + At instantiation time, the standard `req`, `rset`, and `cursor` + attributes are added and the `w` attribute will be set at rendering + time to a write function to use. + """ + __registry__ = 'views' + registered = require_group_compat(AppRsetObject.registered) + + templatable = True + need_navigation = True + # content_type = 'application/xhtml+xml' # text/xhtml' + binary = False + add_to_breadcrumbs = True + category = 'view' + + def __init__(self, req=None, rset=None, **kwargs): + super(View, self).__init__(req, rset, **kwargs) + self.w = None + + @property + def content_type(self): + return self.req.html_content_type() + + def set_stream(self, w=None): + if self.w is not None: + return + if w is None: + if self.binary: + self._stream = stream = StringIO() + else: + self._stream = stream = UStringIO() + w = stream.write + else: + stream = None + self.w = w + return stream + + # main view interface ##################################################### + + def render(self, w=None, **context): + """called to render a view object for a result set. + + This method is a dispatched to an actual method selected + according to optional row and col parameters, which are locating + a particular row or cell in the result set: + + * if row is specified, `cell_call` is called + * if none of them is supplied, the view is considered to apply on + the whole result set (which may be None in this case), `call` is + called + """ + row = context.get('row') + if row is not None: + context.setdefault('col', 0) + view_func = self.cell_call + else: + view_func = self.call + stream = self.set_stream(w) + # stream = self.set_stream(context) + view_func(**context) + # return stream content if we have created it + if stream is not None: + return self._stream.getvalue() + + dispatch = obsolete('.dispatch is deprecated, use .render')(render) + + # should default .call() method add a

around each + # rset item + add_div_section = True + + def call(self, **kwargs): + """the view is called for an entire result set, by default loop + other rows of the result set and call the same view on the + particular row + + Views applicable on None result sets have to override this method + """ + rset = self.rset + if rset is None: + raise NotImplementedError, self + wrap = self.templatable and len(rset) > 1 and self.add_div_section + for i in xrange(len(rset)): + if wrap: + self.w(u'

') + self.wview(self.id, rset, row=i, **kwargs) + if wrap: + self.w(u"

") + + def cell_call(self, row, col, **kwargs): + """the view is called for a particular result set cell""" + raise NotImplementedError, self + + def linkable(self): + """return True if the view may be linked in a menu + + by default views without title are not meant to be displayed + """ + if not getattr(self, 'title', None): + return False + return True + + def is_primary(self): + return self.id == 'primary' + + def url(self): + """return the url associated with this view. Should not be + necessary for non linkable views, but a default implementation + is provided anyway. + """ + try: + return self.build_url(vid=self.id, rql=self.req.form['rql']) + except KeyError: + return self.build_url(vid=self.id) + + def set_request_content_type(self): + """set the content type returned by this view""" + self.req.set_content_type(self.content_type) + + # view utilities ########################################################## + + def wview(self, __vid, rset, __fallback_vid=None, **kwargs): + """shortcut to self.view method automatically passing self.w as argument + """ + self.view(__vid, rset, __fallback_vid, w=self.w, **kwargs) + + # XXX Template bw compat + template = obsolete('.template is deprecated, use .view')(wview) + + def whead(self, data): + self.req.html_headers.write(data) + + def wdata(self, data): + """simple helper that escapes `data` and writes into `self.w`""" + self.w(html_escape(data)) + + def action(self, actionid, row=0): + """shortcut to get action object with id `actionid`""" + return self.vreg.select_action(actionid, self.req, self.rset, + row=row) + + def action_url(self, actionid, label=None, row=0): + """simple method to be able to display `actionid` as a link anywhere + """ + action = self.vreg.select_action(actionid, self.req, self.rset, + row=row) + if action: + label = label or self.req._(action.title) + return u'%s' % (html_escape(action.url()), label) + return u'' + + def html_headers(self): + """return a list of html headers (eg something to be inserted between + and of the returned page + + by default return a meta tag to disable robot indexation of the page + """ + return [NOINDEX] + + def page_title(self): + """returns a title according to the result set - used for the + title in the HTML header + """ + vtitle = self.req.form.get('vtitle') + if vtitle: + return self.req._(vtitle) + # class defined title will only be used if the resulting title doesn't + # seem clear enough + vtitle = getattr(self, 'title', None) or u'' + if vtitle: + vtitle = self.req._(vtitle) + rset = self.rset + if rset and rset.rowcount: + if rset.rowcount == 1: + try: + entity = self.complete_entity(0) + # use long_title to get context information if any + clabel = entity.dc_long_title() + except NotAnEntity: + clabel = display_name(self.req, rset.description[0][0]) + clabel = u'%s (%s)' % (clabel, vtitle) + else : + etypes = rset.column_types(0) + if len(etypes) == 1: + etype = iter(etypes).next() + clabel = display_name(self.req, etype, 'plural') + else : + clabel = u'#[*] (%s)' % vtitle + else: + clabel = vtitle + return u'%s (%s)' % (clabel, self.req.property_value('ui.site-title')) + + def output_url_builder( self, name, url, args ): + self.w(u'\n') + + def create_url(self, etype, **kwargs): + """ return the url of the entity creation form for a given entity type""" + return self.req.build_url('add/%s'%etype, **kwargs) + + def field(self, label, value, row=True, show_label=True, w=None, tr=True): + """ read-only field """ + if w is None: + w = self.w + if row: + w(u'

') + if show_label: + if tr: + label = display_name(self.req, label) + w(u'%s' % label) + w(u'

' % value) + if row: + w(u'

') + + + +# concrete views base classes ################################################# + +class EntityView(View): + """base class for views applying on an entity (i.e. uniform result set)""" + __select__ = non_final_entity() + registered = accepts_compat(View.registered) + + category = 'entityview' + + +class StartupView(View): + """base class for views which doesn't need a particular result set to be + displayed (so they can always be displayed !) + """ + __select__ = none_rset() + registered = require_group_compat(View.registered) + + category = 'startupview' + + def url(self): + """return the url associated with this view. We can omit rql here""" + return self.build_url('view', vid=self.id) + + def html_headers(self): + """return a list of html headers (eg something to be inserted between + and of the returned page + + by default startup views are indexed + """ + return [] + + +class EntityStartupView(EntityView): + """base class for entity views which may also be applied to None + result set (usually a default rql is provided by the view class) + """ + __select__ = none_rset() | non_final_entity() + + default_rql = None + + def __init__(self, req, rset, **kwargs): + super(EntityStartupView, self).__init__(req, rset, **kwargs) + if rset is None: + # this instance is not in the "entityview" category + self.category = 'startupview' + + def startup_rql(self): + """return some rql to be executed if the result set is None""" + return self.default_rql + + def call(self, **kwargs): + """override call to execute rql returned by the .startup_rql method if + necessary + """ + if self.rset is None: + self.rset = self.req.execute(self.startup_rql()) + rset = self.rset + for i in xrange(len(rset)): + self.wview(self.id, rset, row=i, **kwargs) + + def url(self): + """return the url associated with this view. We can omit rql if we are + on a result set on which we do not apply. + """ + if self.rset is None: + return self.build_url(vid=self.id) + return super(EntityStartupView, self).url() + + +class AnyRsetView(View): + """base class for views applying on any non empty result sets""" + __select__ = nonempty_rset() + + category = 'anyrsetview' + + def columns_labels(self, tr=True): + if tr: + translate = display_name + else: + translate = lambda req, val: val + rqlstdescr = self.rset.syntax_tree().get_description()[0] # XXX missing Union support + labels = [] + for colindex, attr in enumerate(rqlstdescr): + # compute column header + if colindex == 0 or attr == 'Any': # find a better label + label = ','.join(translate(self.req, et) + for et in self.rset.column_types(colindex)) + else: + label = translate(self.req, attr) + labels.append(label) + return labels + + +# concrete template base classes ############################################## + +class MainTemplate(View): + """main template are primary access point to render a full HTML page. + There is usually at least a regular main template and a simple fallback + one to display error if the first one failed + """ + registered = require_group_compat(View.registered) + + @property + def doctype(self): + if self.req.xhtml_browser(): + return STRICT_DOCTYPE + return STRICT_DOCTYPE_NOEXT + + def set_stream(self, w=None): + if self.w is not None: + return + if w is None: + if self.binary: + self._stream = stream = StringIO() + else: + self._stream = stream = HTMLStream(self.req) + w = stream.write + else: + stream = None + self.w = w + return stream + + def write_doctype(self, xmldecl=True): + assert isinstance(self._stream, HTMLStream) + self._stream.doctype = self.doctype + if not xmldecl: + self._stream.xmldecl = u'' + + def linkable(self): + return False + +# concrete component base classes ############################################# + +class ReloadableMixIn(object): + """simple mixin for reloadable parts of UI""" + + def user_callback(self, cb, args, msg=None, nonify=False): + """register the given user callback and return an url to call it ready to be + inserted in html + """ + self.req.add_js('cubicweb.ajax.js') + if nonify: + _cb = cb + def cb(*args): + _cb(*args) + cbname = self.req.register_onetime_callback(cb, *args) + return self.build_js(cbname, html_escape(msg or '')) + + def build_update_js_call(self, cbname, msg): + rql = html_escape(self.rset.printable_rql()) + return "javascript:userCallbackThenUpdateUI('%s', '%s', '%s', '%s', '%s', '%s')" % ( + cbname, self.id, rql, msg, self.__registry__, self.div_id()) + + def build_reload_js_call(self, cbname, msg): + return "javascript:userCallbackThenReloadPage('%s', '%s')" % (cbname, msg) + + build_js = build_update_js_call # expect updatable component by default + + def div_id(self): + return '' + + +class Component(ReloadableMixIn, View): + """base class for components""" + __registry__ = 'components' + __select__ = yes() + property_defs = {} + + def div_class(self): + return '%s %s' % (self.propval('htmlclass'), self.id) + + def div_id(self): + return '%sComponent' % self.id diff -r 49075f57cf2c -r aa09e20dd8c0 vregistry.py --- a/vregistry.py Tue May 05 17:18:49 2009 +0200 +++ b/vregistry.py Thu May 14 12:48:11 2009 +0200 @@ -6,12 +6,7 @@ * to interact with the vregistry, object should inherit from the VObject abstract class - -* the registration procedure is delegated to a registerer. Each - registerable vobject must defines its registerer class using the - __registerer__ attribute. A registerer is instantianted at - registration time after what the instance is lost - + * the selection procedure has been generalized by delegating to a selector, which is responsible to score the vobject according to the current state (req, rset, row, col). At the end of the selection, if @@ -27,124 +22,53 @@ import sys from os import listdir, stat -from os.path import dirname, join, realpath, split, isdir +from os.path import dirname, join, realpath, split, isdir, exists from logging import getLogger +import types from cubicweb import CW_SOFTWARE_ROOT, set_log_methods from cubicweb import RegistryNotFound, ObjectNotFound, NoSelectableObject -class vobject_helper(object): - """object instantiated at registration time to help a wrapped - VObject subclass +def _toload_info(path, _toload=None): + """return a dictionary of : and an ordered list of + (file, module name) to load """ - - def __init__(self, registry, vobject): - self.registry = registry - self.vobject = vobject - self.config = registry.config - self.schema = registry.schema - - -class registerer(vobject_helper): - """do whatever is needed at registration time for the wrapped - class, according to current application schema and already - registered objects of the same kind (i.e. same registry name and - same id). - - The wrapped class may be skipped, some previously selected object - may be kicked out... After whatever works needed, if the object or - a transformed object is returned, it will be added to previously - registered objects. - """ - - def __init__(self, registry, vobject): - super(registerer, self).__init__(registry, vobject) - self.kicked = set() - - def do_it_yourself(self, registered): - raise NotImplementedError(str(self.vobject)) - - def kick(self, registered, kicked): - self.debug('kicking vobject %s', kicked) - registered.remove(kicked) - self.kicked.add(kicked.classid()) - - def skip(self): - self.debug('no schema compat, skipping %s', self.vobject) - + from logilab.common.modutils import modpath_from_file + if _toload is None: + _toload = {}, [] + for fileordir in path: + if isdir(fileordir) and exists(join(fileordir, '__init__.py')): + subfiles = [join(fileordir, fname) for fname in listdir(fileordir)] + _toload_info(subfiles, _toload) + elif fileordir[-3:] == '.py': + modname = '.'.join(modpath_from_file(fileordir)) + _toload[0][modname] = fileordir + _toload[1].append((fileordir, modname)) + return _toload -def selector(cls, *args, **kwargs): - """selector is called to help choosing the correct object for a - particular request and result set by returning a score. - - it must implement a .score_method taking a request, a result set and - optionaly row and col arguments which return an int telling how well - the wrapped class apply to the given request and result set. 0 score - means that it doesn't apply. - - rset may be None. If not, row and col arguments may be optionally - given if the registry is scoring a given row or a given cell of - the result set (both row and col are int if provided). - """ - raise NotImplementedError(cls) - - -class autoselectors(type): - """implements __selectors__ / __select__ compatibility layer so that: - - __select__ = chainall(classmethod(A, B, C)) - - can be replaced by something like: - - __selectors__ = (A, B, C) - """ - def __new__(mcs, name, bases, classdict): - if '__select__' in classdict and '__selectors__' in classdict: - raise TypeError("__select__ and __selectors__ " - "can't be used together") - if '__select__' not in classdict and '__selectors__' in classdict: - selectors = classdict['__selectors__'] - if len(selectors) > 1: - classdict['__select__'] = classmethod(chainall(*selectors)) - else: - classdict['__select__'] = classmethod(selectors[0]) - return super(autoselectors, mcs).__new__(mcs, name, bases, classdict) - - def __setattr__(self, attr, value): - if attr == '__selectors__': - self.__select__ = classmethod(chainall(*value)) - super(autoselectors, self).__setattr__(attr, value) - class VObject(object): """visual object, use to be handled somehow by the visual components registry. The following attributes should be set on concret vobject subclasses: - + :__registry__: name of the registry for this object (string like 'views', 'templates'...) :id: object's identifier in the registry (string like 'main', 'primary', 'folder_box') - :__registerer__: - registration helper class :__select__: - selection helper function - :__selectors__: - tuple of selectors to be chained - (__select__ and __selectors__ are mutually exclusive) - + class'selector + Moreover, the `__abstract__` attribute may be set to True to indicate that a vobject is abstract and should not be registered """ - __metaclass__ = autoselectors # necessary attributes to interact with the registry id = None __registry__ = None - __registerer__ = None __select__ = None @classmethod @@ -155,12 +79,13 @@ may be the right hook to create an instance for example). By default the vobject is returned without any transformation. """ + cls.build___select__() return cls @classmethod def selected(cls, *args, **kwargs): """called by the registry when the vobject has been selected. - + It must return the object that will be actually returned by the .select method (this may be the right hook to create an instance for example). By default the selected object is @@ -173,13 +98,36 @@ """returns a unique identifier for the vobject""" return '%s.%s' % (cls.__module__, cls.__name__) + # XXX bw compat code + @classmethod + def build___select__(cls): + for klass in cls.mro(): + if klass.__name__ == 'AppRsetObject': + continue # the bw compat __selector__ is there + klassdict = klass.__dict__ + if ('__select__' in klassdict and '__selectors__' in klassdict + and '__selgenerated__' not in klassdict): + raise TypeError("__select__ and __selectors__ can't be used together on class %s" % cls) + if '__selectors__' in klassdict and '__selgenerated__' not in klassdict: + cls.__selgenerated__ = True + # case where __selectors__ is defined locally (but __select__ + # is in a parent class) + selectors = klassdict['__selectors__'] + if len(selectors) == 1: + # micro optimization: don't bother with AndSelector if there's + # only one selector + select = _instantiate_selector(selectors[0]) + else: + select = AndSelector(*selectors) + cls.__select__ = select + class VRegistry(object): """class responsible to register, propose and select the various elements used to build the web interface. Currently, we have templates, views, actions and components. """ - + def __init__(self, config):#, cache_size=1000): self.config = config # dictionnary of registry (themself dictionnary) by name @@ -204,45 +152,290 @@ def __contains__(self, key): return key in self._registries - - def register_vobject_class(self, cls, _kicked=set()): + + def registry(self, name): + """return the registry (dictionary of class objects) associated to + this name + """ + try: + return self._registries[name] + except KeyError: + raise RegistryNotFound(name), None, sys.exc_info()[-1] + + def registry_objects(self, name, oid=None): + """returns objects registered with the given oid in the given registry. + If no oid is given, return all objects in this registry + """ + registry = self.registry(name) + if oid: + try: + return registry[oid] + except KeyError: + raise ObjectNotFound(oid), None, sys.exc_info()[-1] + else: + result = [] + for objs in registry.values(): + result += objs + return result + + def object_by_id(self, registry, cid, *args, **kwargs): + """return the most specific component according to the resultset""" + objects = self[registry][cid] + assert len(objects) == 1, objects + return objects[0].selected(*args, **kwargs) + + # methods for explicit (un)registration ################################### + +# def clear(self, key): +# regname, oid = key.split('.') +# self[regname].pop(oid, None) + def register_all(self, objects, modname, butclasses=()): + for obj in objects: + try: + if obj.__module__ != modname or obj in butclasses: + continue + oid = obj.id + except AttributeError: + continue + if oid: + self.register(obj) + + def register(self, obj, registryname=None, oid=None, clear=False): + """base method to add an object in the registry""" + assert not '__abstract__' in obj.__dict__ + registryname = registryname or obj.__registry__ + oid = oid or obj.id + assert oid + registry = self._registries.setdefault(registryname, {}) + if clear: + vobjects = registry[oid] = [] + else: + vobjects = registry.setdefault(oid, []) + # registered() is technically a classmethod but is not declared + # as such because we need to compose registered in some cases + vobject = obj.registered.im_func(obj, self) + assert not vobject in vobjects, vobject + assert callable(vobject.__select__), vobject + vobjects.append(vobject) + try: + vname = vobject.__name__ + except AttributeError: + vname = vobject.__class__.__name__ + self.debug('registered vobject %s in registry %s with id %s', + vname, registryname, oid) + # automatic reloading management + self._loadedmods[obj.__module__]['%s.%s' % (obj.__module__, oid)] = obj + + def unregister(self, obj, registryname=None): + registryname = registryname or obj.__registry__ + registry = self.registry(registryname) + removed_id = obj.classid() + for registered in registry[obj.id]: + # use classid() to compare classes because vreg will probably + # have its own version of the class, loaded through execfile + if registered.classid() == removed_id: + # XXX automatic reloading management + try: + registry[obj.id].remove(registered) + except ValueError: + self.warning('can\'t remove %s, no id %s in the %s registry', + removed_id, obj.id, registryname) + except ValueError: + self.warning('can\'t remove %s, not in the %s registry with id %s', + removed_id, registryname, obj.id) +# else: +# # if objects is empty, remove oid from registry +# if not registry[obj.id]: +# del regcontent[oid] + break + + def register_and_replace(self, obj, replaced, registryname=None): + if hasattr(replaced, 'classid'): + replaced = replaced.classid() + registryname = registryname or obj.__registry__ + registry = self.registry(registryname) + registered_objs = registry[obj.id] + for index, registered in enumerate(registered_objs): + if registered.classid() == replaced: + del registry[obj.id][index] + break + self.register(obj, registryname=registryname) + + # dynamic selection methods ############################################### + + def select(self, vobjects, *args, **kwargs): + """return an instance of the most specific object according + to parameters + + raise NoSelectableObject if not object apply + """ + score, winners = 0, [] + for vobject in vobjects: + vobjectscore = vobject.__select__(vobject, *args, **kwargs) + if vobjectscore > score: + score, winners = vobjectscore, [vobject] + elif vobjectscore > 0 and vobjectscore == score: + winners.append(vobject) + if not winners: + raise NoSelectableObject('args: %s\nkwargs: %s %s' + % (args, kwargs.keys(), + [repr(v) for v in vobjects])) + if len(winners) > 1: + if self.config.mode == 'installed': + self.error('select ambiguity, args: %s\nkwargs: %s %s', + args, kwargs.keys(), [repr(v) for v in winners]) + else: + raise Exception('select ambiguity, args: %s\nkwargs: %s %s' + % (args, kwargs.keys(), + [repr(v) for v in winners])) + winner = winners[0] + # return the result of the .selected method of the vobject + return winner.selected(*args, **kwargs) + + def possible_objects(self, registry, *args, **kwargs): + """return an iterator on possible objects in a registry for this result set + + actions returned are classes, not instances + """ + for vobjects in self.registry(registry).values(): + try: + yield self.select(vobjects, *args, **kwargs) + except NoSelectableObject: + continue + + def select_object(self, registry, cid, *args, **kwargs): + """return the most specific component according to the resultset""" + return self.select(self.registry_objects(registry, cid), *args, **kwargs) + + # intialization methods ################################################### + + def init_registration(self, path): + # compute list of all modules that have to be loaded + self._toloadmods, filemods = _toload_info(path) + self._loadedmods = {} + return filemods + + def register_objects(self, path, force_reload=None): + if force_reload is None: + force_reload = self.config.mode == 'dev' + elif not force_reload: + # force_reload == False usually mean modules have been reloaded + # by another connection, so we want to update the registry + # content even if there has been no module content modification + self.reset() + # need to clean sys.path this to avoid import confusion pb (i.e. + # having the same module loaded as 'cubicweb.web.views' subpackage and + # as views' or 'web.views' subpackage + # this is mainly for testing purpose, we should'nt need this in + # production environment + for webdir in (join(dirname(realpath(__file__)), 'web'), + join(dirname(__file__), 'web')): + if webdir in sys.path: + sys.path.remove(webdir) + if CW_SOFTWARE_ROOT in sys.path: + sys.path.remove(CW_SOFTWARE_ROOT) + # load views from each directory in the application's path + filemods = self.init_registration(path) + change = False + for filepath, modname in filemods: + if self.load_file(filepath, modname, force_reload): + change = True + return change + + def load_file(self, filepath, modname, force_reload=False): + """load visual objects from a python file""" + from logilab.common.modutils import load_module_from_name + if modname in self._loadedmods: + return + self._loadedmods[modname] = {} + try: + modified_on = stat(filepath)[-2] + except OSError: + # this typically happens on emacs backup files (.#foo.py) + self.warning('Unable to load %s. It is likely to be a backup file', + filepath) + return False + if filepath in self._lastmodifs: + # only load file if it was modified + if modified_on <= self._lastmodifs[filepath]: + return + # if it was modified, unregister all exisiting objects + # from this module, and keep track of what was unregistered + unregistered = self.unregister_module_vobjects(modname) + else: + unregistered = None + # load the module + module = load_module_from_name(modname, use_sys=not force_reload) + self.load_module(module) + # if something was unregistered, we need to update places where it was + # referenced + if unregistered: + # oldnew_mapping = {} + registered = self._loadedmods[modname] + oldnew_mapping = dict((unregistered[name], registered[name]) + for name in unregistered if name in registered) + self.update_registered_subclasses(oldnew_mapping) + self._lastmodifs[filepath] = modified_on + return True + + def load_module(self, module): + self.info('loading %s', module) + if hasattr(module, 'registration_callback'): + module.registration_callback(self) + else: + for objname, obj in vars(module).items(): + if objname.startswith('_'): + continue + self._load_ancestors_then_object(module.__name__, obj) + self.debug('loaded %s', module) + + def _load_ancestors_then_object(self, modname, obj): + # imported classes + objmodname = getattr(obj, '__module__', None) + if objmodname != modname: + if objmodname in self._toloadmods: + self.load_file(self._toloadmods[objmodname], objmodname) + return + # skip non registerable object + try: + if not issubclass(obj, VObject): + return + except TypeError: + return + objname = '%s.%s' % (modname, obj.__name__) + if objname in self._loadedmods[modname]: + return + self._loadedmods[modname][objname] = obj + for parent in obj.__bases__: + self._load_ancestors_then_object(modname, parent) + self.load_object(obj) + + def load_object(self, obj): + try: + self.register_vobject_class(obj) + except Exception, ex: + if self.config.mode in ('test', 'dev'): + raise + self.exception('vobject %s registration failed: %s', obj, ex) + + # old automatic registration XXX deprecated ############################### + + def register_vobject_class(self, cls): """handle vobject class registration - + vobject class with __abstract__ == True in their local dictionnary or with a name starting starting by an underscore are not registered. Also a vobject class needs to have __registry__ and id attributes set to a non empty string to be registered. - - Registration is actually handled by vobject's registerer. """ if (cls.__dict__.get('__abstract__') or cls.__name__[0] == '_' or not cls.__registry__ or not cls.id): return - # while reloading a module : - # if cls was previously kicked, it means that there is a more specific - # vobject defined elsewhere re-registering cls would kick it out - if cls.classid() in _kicked: - self.debug('not re-registering %s because it was previously kicked', - cls.classid()) - else: - regname = cls.__registry__ - if cls.id in self.config['disable-%s' % regname]: - return - registry = self._registries.setdefault(regname, {}) - vobjects = registry.setdefault(cls.id, []) - registerer = cls.__registerer__(self, cls) - cls = registerer.do_it_yourself(vobjects) - #_kicked |= registerer.kicked - if cls: - vobject = cls.registered(self) - try: - vname = vobject.__name__ - except AttributeError: - vname = vobject.__class__.__name__ - self.debug('registered vobject %s in registry %s with id %s', - vname, cls.__registry__, cls.id) - vobjects.append(vobject) - + regname = cls.__registry__ + if '%s.%s' % (regname, cls.id) in self.config['disable-appobjects']: + return + self.register(cls) + def unregister_module_vobjects(self, modname): """removes registered objects coming from a given module @@ -279,7 +472,6 @@ del objdict[oid] return unregistered - def update_registered_subclasses(self, oldnew_mapping): """updates subclasses of re-registered vobjects @@ -306,240 +498,189 @@ obj.__module__, obj.__name__) obj.__bases__ = newbases - def registry(self, name): - """return the registry (dictionary of class objects) associated to - this name - """ - try: - return self._registries[name] - except KeyError: - raise RegistryNotFound(name), None, sys.exc_info()[-1] - - def registry_objects(self, name, oid=None): - """returns objects registered with the given oid in the given registry. - If no oid is given, return all objects in this registry - """ - registry = self.registry(name) - if oid: - try: - return registry[oid] - except KeyError: - raise ObjectNotFound(oid), None, sys.exc_info()[-1] - else: - result = [] - for objs in registry.values(): - result += objs - return result - - def select(self, vobjects, *args, **kwargs): - """return an instance of the most specific object according - to parameters - - raise NoSelectableObject if not object apply - """ - score, winners = 0, [] - for vobject in vobjects: - vobjectscore = vobject.__select__(*args, **kwargs) - if vobjectscore > score: - score, winners = vobjectscore, [vobject] - elif vobjectscore > 0 and vobjectscore == score: - winners.append(vobject) - if not winners: - raise NoSelectableObject('args: %s\nkwargs: %s %s' - % (args, kwargs.keys(), [repr(v) for v in vobjects])) - if len(winners) > 1: - if self.config.mode == 'installed': - self.error('select ambiguity, args: %s\nkwargs: %s %s', - args, kwargs.keys(), [repr(v) for v in winners]) - else: - raise Exception('select ambiguity, args: %s\nkwargs: %s %s' - % (args, kwargs.keys(), [repr(v) for v in winners])) - winner = winners[0] - # return the result of the .selected method of the vobject - return winner.selected(*args, **kwargs) - - def possible_objects(self, registry, *args, **kwargs): - """return an iterator on possible objects in a registry for this result set - - actions returned are classes, not instances - """ - for vobjects in self.registry(registry).values(): - try: - yield self.select(vobjects, *args, **kwargs) - except NoSelectableObject: - continue - - def select_object(self, registry, cid, *args, **kwargs): - """return the most specific component according to the resultset""" - return self.select(self.registry_objects(registry, cid), *args, **kwargs) - - def object_by_id(self, registry, cid, *args, **kwargs): - """return the most specific component according to the resultset""" - objects = self[registry][cid] - assert len(objects) == 1, objects - return objects[0].selected(*args, **kwargs) - - # intialization methods ################################################### - - - def register_objects(self, path, force_reload=None): - if force_reload is None: - force_reload = self.config.mode == 'dev' - elif not force_reload: - # force_reload == False usually mean modules have been reloaded - # by another connection, so we want to update the registry - # content even if there has been no module content modification - self.reset() - # need to clean sys.path this to avoid import confusion pb (i.e. - # having the same module loaded as 'cubicweb.web.views' subpackage and - # as views' or 'web.views' subpackage - # this is mainly for testing purpose, we should'nt need this in - # production environment - for webdir in (join(dirname(realpath(__file__)), 'web'), - join(dirname(__file__), 'web')): - if webdir in sys.path: - sys.path.remove(webdir) - if CW_SOFTWARE_ROOT in sys.path: - sys.path.remove(CW_SOFTWARE_ROOT) - # load views from each directory in the application's path - change = False - for fileordirectory in path: - if isdir(fileordirectory): - if self.read_directory(fileordirectory, force_reload): - change = True - else: - directory, filename = split(fileordirectory) - if self.load_file(directory, filename, force_reload): - change = True - if change: - for registry, objects in self.items(): - self.debug('available in registry %s: %s', registry, - sorted(objects)) - return change - - def read_directory(self, directory, force_reload=False): - """read a directory and register available views""" - modified_on = stat(realpath(directory))[-2] - # only read directory if it was modified - _lastmodifs = self._lastmodifs - if directory in _lastmodifs and modified_on <= _lastmodifs[directory]: - return False - self.info('loading directory %s', directory) - for filename in listdir(directory): - if filename[-3:] == '.py': - try: - self.load_file(directory, filename, force_reload) - except OSError: - # this typically happens on emacs backup files (.#foo.py) - self.warning('Unable to load file %s. It is likely to be a backup file', - filename) - except Exception, ex: - if self.config.mode in ('dev', 'test'): - raise - self.exception('%r while loading file %s', ex, filename) - _lastmodifs[directory] = modified_on - return True - - def load_file(self, directory, filename, force_reload=False): - """load visual objects from a python file""" - from logilab.common.modutils import load_module_from_modpath, modpath_from_file - filepath = join(directory, filename) - modified_on = stat(filepath)[-2] - modpath = modpath_from_file(join(directory, filename)) - modname = '.'.join(modpath) - unregistered = {} - _lastmodifs = self._lastmodifs - if filepath in _lastmodifs: - # only load file if it was modified - if modified_on <= _lastmodifs[filepath]: - return - else: - # if it was modified, unregister all exisiting objects - # from this module, and keep track of what was unregistered - unregistered = self.unregister_module_vobjects(modname) - # load the module - module = load_module_from_modpath(modpath, use_sys=not force_reload) - registered = self.load_module(module) - # if something was unregistered, we need to update places where it was - # referenced - if unregistered: - # oldnew_mapping = {} - oldnew_mapping = dict((unregistered[name], registered[name]) - for name in unregistered if name in registered) - self.update_registered_subclasses(oldnew_mapping) - _lastmodifs[filepath] = modified_on - return True - - def load_module(self, module): - registered = {} - self.info('loading %s', module) - for objname, obj in vars(module).items(): - if objname.startswith('_'): - continue - self.load_ancestors_then_object(module.__name__, registered, obj) - return registered - - def load_ancestors_then_object(self, modname, registered, obj): - # skip imported classes - if getattr(obj, '__module__', None) != modname: - return - # skip non registerable object - try: - if not issubclass(obj, VObject): - return - except TypeError: - return - objname = '%s.%s' % (modname, obj.__name__) - if objname in registered: - return - registered[objname] = obj - for parent in obj.__bases__: - self.load_ancestors_then_object(modname, registered, parent) - self.load_object(obj) - - def load_object(self, obj): - try: - self.register_vobject_class(obj) - except Exception, ex: - if self.config.mode in ('test', 'dev'): - raise - self.exception('vobject %s registration failed: %s', obj, ex) - -# init logging +# init logging set_log_methods(VObject, getLogger('cubicweb')) set_log_methods(VRegistry, getLogger('cubicweb.registry')) -set_log_methods(registerer, getLogger('cubicweb.registration')) + + +# selector base classes and operations ######################################## + +class Selector(object): + """base class for selector classes providing implementation + for operators ``&`` and ``|`` + + This class is only here to give access to binary operators, the + selector logic itself should be implemented in the __call__ method -# advanced selector building functions ######################################## + a selector is called to help choosing the correct object for a + particular context by returning a score (`int`) telling how well + the class given as first argument apply to the given context. + + 0 score means that the class doesn't apply. + """ + + @property + def func_name(self): + # backward compatibility + return self.__class__.__name__ + + def search_selector(self, selector): + """search for the given selector or selector instance in the selectors + tree. Return it of None if not found + """ + if self is selector: + return self + if isinstance(selector, type) and isinstance(self, selector): + return self + return None + + def __str__(self): + return self.__class__.__name__ + + def __and__(self, other): + return AndSelector(self, other) + def __rand__(self, other): + return AndSelector(other, self) + + def __or__(self, other): + return OrSelector(self, other) + def __ror__(self, other): + return OrSelector(other, self) + + def __invert__(self): + return NotSelector(self) + + # XXX (function | function) or (function & function) not managed yet + + def __call__(self, cls, *args, **kwargs): + return NotImplementedError("selector %s must implement its logic " + "in its __call__ method" % self.__class__) + +class MultiSelector(Selector): + """base class for compound selector classes""" + + def __init__(self, *selectors): + self.selectors = self.merge_selectors(selectors) + + def __str__(self): + return '%s(%s)' % (self.__class__.__name__, + ','.join(str(s) for s in self.selectors)) + + @classmethod + def merge_selectors(cls, selectors): + """deal with selector instanciation when necessary and merge + multi-selectors if possible: + + AndSelector(AndSelector(sel1, sel2), AndSelector(sel3, sel4)) + ==> AndSelector(sel1, sel2, sel3, sel4) + """ + merged_selectors = [] + for selector in selectors: + try: + selector = _instantiate_selector(selector) + except: + pass + #assert isinstance(selector, Selector), selector + if isinstance(selector, cls): + merged_selectors += selector.selectors + else: + merged_selectors.append(selector) + return merged_selectors -def chainall(*selectors): + def search_selector(self, selector): + """search for the given selector or selector instance in the selectors + tree. Return it of None if not found + """ + for childselector in self.selectors: + if childselector is selector: + return childselector + found = childselector.search_selector(selector) + if found is not None: + return found + return None + + +def objectify_selector(selector_func): + """convenience decorator for simple selectors where a class definition + would be overkill:: + + @objectify_selector + def yes(cls, *args, **kwargs): + return 1 + + """ + return type(selector_func.__name__, (Selector,), + {'__call__': lambda self, *args, **kwargs: selector_func(*args, **kwargs)}) + +def _instantiate_selector(selector): + """ensures `selector` is a `Selector` instance + + NOTE: This should only be used locally in build___select__() + XXX: then, why not do it ?? + """ + if isinstance(selector, types.FunctionType): + return objectify_selector(selector)() + if isinstance(selector, type) and issubclass(selector, Selector): + return selector() + return selector + + +class AndSelector(MultiSelector): + """and-chained selectors (formerly known as chainall)""" + def __call__(self, cls, *args, **kwargs): + score = 0 + for selector in self.selectors: + partscore = selector(cls, *args, **kwargs) + if not partscore: + return 0 + score += partscore + return score + + +class OrSelector(MultiSelector): + """or-chained selectors (formerly known as chainfirst)""" + def __call__(self, cls, *args, **kwargs): + for selector in self.selectors: + partscore = selector(cls, *args, **kwargs) + if partscore: + return partscore + return 0 + +class NotSelector(Selector): + """negation selector""" + def __init__(self, selector): + self.selector = selector + + def __call__(self, cls, *args, **kwargs): + score = self.selector(cls, *args, **kwargs) + return int(not score) + + def __str__(self): + return 'NOT(%s)' % super(NotSelector, self).__str__() + + +# XXX bw compat functions ##################################################### + +def chainall(*selectors, **kwargs): """return a selector chaining given selectors. If one of the selectors fail, selection will fail, else the returned score will be the sum of each selector'score """ assert selectors - def selector(cls, *args, **kwargs): - score = 0 - for selector in selectors: - partscore = selector(cls, *args, **kwargs) - if not partscore: - return 0 - score += partscore - return score + # XXX do we need to create the AndSelector here, a tuple might be enough + selector = AndSelector(*selectors) + if 'name' in kwargs: + selector.__name__ = kwargs['name'] return selector -def chainfirst(*selectors): +def chainfirst(*selectors, **kwargs): """return a selector chaining given selectors. If all the selectors fail, selection will fail, else the returned score will be the first non-zero selector score """ assert selectors - def selector(cls, *args, **kwargs): - for selector in selectors: - partscore = selector(cls, *args, **kwargs) - if partscore: - return partscore - return 0 + selector = OrSelector(*selectors) + if 'name' in kwargs: + selector.__name__ = kwargs['name'] return selector - diff -r 49075f57cf2c -r aa09e20dd8c0 web/__init__.py --- a/web/__init__.py Tue May 05 17:18:49 2009 +0200 +++ b/web/__init__.py Thu May 14 12:48:11 2009 +0200 @@ -3,14 +3,21 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" +_ = unicode -from cubicweb.web._exceptions import * +from decimal import Decimal +from datetime import datetime, date, timedelta +from simplejson import dumps -_ = unicode +from logilab.common.deprecation import obsolete + +from cubicweb.common.uilib import urlquote +from cubicweb.web._exceptions import * + INTERNAL_FIELD_VALUE = '__cubicweb_internal_field__' @@ -35,12 +42,47 @@ from logging import getLogger LOGGER = getLogger('cubicweb.web') +# XXX deprecated FACETTES = set() -## FACETTES = set( ( -## # (relation, role, target's attribute) -## ('created_by', 'subject', 'login'), -## ('in_group', 'subject', 'name'), -## ('in_state', 'subject', 'name'), -## )) + +def json_dumps(value): + if isinstance(value, Decimal): + value = float(value) + elif isinstance(value, (date, datetime)): + value = value.strftime('%Y-%m-%d %H:%M') + elif isinstance(value, timedelta): + value = (value.days * 24*60*60) + value.seconds + try: + return dumps(value) + except TypeError: + return dumps(repr(value)) + +def jsonize(function): + def newfunc(*args, **kwargs): + return json_dumps(function(*args, **kwargs)) + return newfunc + +@obsolete('use req.build_ajax_replace_url() instead') +def ajax_replace_url(nodeid, rql, vid=None, swap=False, **extraparams): + """builds a replacePageChunk-like url + >>> ajax_replace_url('foo', 'Person P') + "javascript: replacePageChunk('foo', 'Person%20P');" + >>> ajax_replace_url('foo', 'Person P', 'oneline') + "javascript: replacePageChunk('foo', 'Person%20P', 'oneline');" + >>> ajax_replace_url('foo', 'Person P', 'oneline', name='bar', age=12) + "javascript: replacePageChunk('foo', 'Person%20P', 'oneline', {'age':12, 'name':'bar'});" + >>> ajax_replace_url('foo', 'Person P', name='bar', age=12) + "javascript: replacePageChunk('foo', 'Person%20P', 'null', {'age':12, 'name':'bar'});" + """ + params = [repr(nodeid), repr(urlquote(rql))] + if extraparams and not vid: + params.append("'null'") + elif vid: + params.append(repr(vid)) + if extraparams: + params.append(json_dumps(extraparams)) + if swap: + params.append('true') + return "javascript: replacePageChunk(%s);" % ', '.join(params) diff -r 49075f57cf2c -r aa09e20dd8c0 web/_exceptions.py --- a/web/_exceptions.py Tue May 05 17:18:49 2009 +0200 +++ b/web/_exceptions.py Thu May 14 12:48:11 2009 +0200 @@ -2,7 +2,7 @@ """exceptions used in the core of the CubicWeb web application :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -11,13 +11,13 @@ class PublishException(CubicWebException): """base class for publishing related exception""" - + class RequestError(PublishException): """raised when a request can't be served because of a bad input""" class NothingToEdit(RequestError): """raised when an edit request doesn't specify any eid to edit""" - + class NotFound(RequestError): """raised when a 404 error should be returned""" @@ -34,7 +34,7 @@ def __init__(self, status, content=''): self.status = int(status) self.content = content - + class ExplicitLogin(AuthenticationError): """raised when a bad connection id is given or when an attempt to establish a connection failed""" @@ -55,4 +55,3 @@ def dumps(self): import simplejson return simplejson.dumps({'reason': self.reason}) - diff -r 49075f57cf2c -r aa09e20dd8c0 web/action.py --- a/web/action.py Tue May 05 17:18:49 2009 +0200 +++ b/web/action.py Thu May 14 12:48:11 2009 +0200 @@ -1,29 +1,27 @@ """abstract action classes for CubicWeb web client :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" -from cubicweb.common.appobject import AppRsetObject -from cubicweb.common.registerers import action_registerer -from cubicweb.common.selectors import add_etype_selector, \ - match_search_state, searchstate_accept_one, \ - searchstate_accept_one_but_etype - +from cubicweb import target +from cubicweb.selectors import (partial_relation_possible, match_search_state, + one_line_rset, partial_may_add_relation, yes, + accepts_compat, condition_compat, deprecate) +from cubicweb.appobject import AppRsetObject + _ = unicode class Action(AppRsetObject): """abstract action. Handle the .search_states attribute to match - request search state. + request search state. """ __registry__ = 'actions' - __registerer__ = action_registerer - __selectors__ = (match_search_state,) - # by default actions don't appear in link search mode - search_states = ('normal',) + __select__ = match_search_state('normal') + property_defs = { 'visible': dict(type='Boolean', default=True, help=_('display the action or not')), @@ -36,186 +34,61 @@ } site_wide = True # don't want user to configuration actions eproperties category = 'moreactions' - - @classmethod - def accept_rset(cls, req, rset, row, col): - user = req.user - action = cls.schema_action - if row is None: - score = 0 - need_local_check = [] - geteschema = cls.schema.eschema - for etype in rset.column_types(0): - accepted = cls.accept(user, etype) - if not accepted: - return 0 - if action: - eschema = geteschema(etype) - if not user.matching_groups(eschema.get_groups(action)): - if eschema.has_local_role(action): - # have to ckeck local roles - need_local_check.append(eschema) - continue - else: - # even a local role won't be enough - return 0 - score += accepted - if need_local_check: - # check local role for entities of necessary types - for i, row in enumerate(rset): - if not rset.description[i][0] in need_local_check: - continue - if not cls.has_permission(rset.get_entity(i, 0), action): - return 0 - score += 1 - return score - col = col or 0 - etype = rset.description[row][col] - score = cls.accept(user, etype) - if score and action: - if not cls.has_permission(rset.get_entity(row, col), action): - return 0 - return score - - @classmethod - def has_permission(cls, entity, action): - """defined in a separated method to ease overriding (see ModifyAction - for instance) - """ - return entity.has_perm(action) - + def url(self): """return the url associated with this action""" raise NotImplementedError - + def html_class(self): if self.req.selected(self.url()): return 'selected' if self.category: return 'box' + self.category.capitalize() + class UnregisteredAction(Action): """non registered action used to build boxes. Unless you set them explicitly, .vreg and .schema attributes at least are None. """ category = None id = None - + def __init__(self, req, rset, title, path, **kwargs): Action.__init__(self, req, rset) self.title = req._(title) self._path = path self.__dict__.update(kwargs) - + def url(self): return self._path -class AddEntityAction(Action): - """link to the entity creation form. Concrete class must set .etype and - may override .vid - """ - __selectors__ = (add_etype_selector, match_search_state) - vid = 'creation' - etype = None - - def url(self): - return self.build_url(vid=self.vid, etype=self.etype) - - -class EntityAction(Action): - """an action for an entity. By default entity actions are only - displayable on single entity result if accept match. - """ - __selectors__ = (searchstate_accept_one,) - schema_action = None - condition = None - - @classmethod - def accept(cls, user, etype): - score = super(EntityAction, cls).accept(user, etype) - if not score: - return 0 - # check if this type of entity has the necessary relation - if hasattr(cls, 'rtype') and not cls.relation_possible(etype): - return 0 - return score - - -class LinkToEntityAction(EntityAction): +class LinkToEntityAction(Action): """base class for actions consisting to create a new object with an initial relation set to an entity. Additionaly to EntityAction behaviour, this class is parametrized using .etype, .rtype and .target attributes to check if the action apply and if the logged user has access to it """ - etype = None - rtype = None - target = None + __select__ = (match_search_state('normal') & one_line_rset() + & partial_relation_possible(action='add') + & partial_may_add_relation()) + registered = accepts_compat(Action.registered) + category = 'addrelated' - @classmethod - def accept_rset(cls, req, rset, row, col): - entity = rset.get_entity(row or 0, col or 0) - # check if this type of entity has the necessary relation - if hasattr(cls, 'rtype') and not cls.relation_possible(entity.e_schema): - return 0 - score = cls.accept(req.user, entity.e_schema) - if not score: - return 0 - if not cls.check_perms(req, entity): - return 0 - return score - - @classmethod - def check_perms(cls, req, entity): - if not cls.check_rtype_perm(req, entity): - return False - # XXX document this: - # if user can create the relation, suppose it can create the entity - # this is because we usually can't check "add" permission before the - # entity has actually been created, and schema security should be - # defined considering this - #if not cls.check_etype_perm(req, entity): - # return False - return True - - @classmethod - def check_etype_perm(cls, req, entity): - eschema = cls.schema.eschema(cls.etype) - if not eschema.has_perm(req, 'add'): - #print req.user.login, 'has no add perm on etype', cls.etype - return False - #print 'etype perm ok', cls - return True - - @classmethod - def check_rtype_perm(cls, req, entity): - rschema = cls.schema.rschema(cls.rtype) - # cls.target is telling us if we want to add the subject or object of - # the relation - if cls.target == 'subject': - if not rschema.has_perm(req, 'add', toeid=entity.eid): - #print req.user.login, 'has no add perm on subject rel', cls.rtype, 'with', entity - return False - elif not rschema.has_perm(req, 'add', fromeid=entity.eid): - #print req.user.login, 'has no add perm on object rel', cls.rtype, 'with', entity - return False - #print 'rtype perm ok', cls - return True - def url(self): current_entity = self.rset.get_entity(self.row or 0, self.col or 0) - linkto = '%s:%s:%s' % (self.rtype, current_entity.eid, self.target) + linkto = '%s:%s:%s' % (self.rtype, current_entity.eid, target(self)) return self.build_url(vid='creation', etype=self.etype, __linkto=linkto, __redirectpath=current_entity.rest_path(), # should not be url quoted! __redirectvid=self.req.form.get('__redirectvid', '')) +class EntityAction(Action): + """DEPRECATED / BACKWARD COMPAT + """ + registered = deprecate(condition_compat(accepts_compat(Action.registered)), + msg='EntityAction is deprecated, use Action with ' + 'appropriate selectors') -class LinkToEntityAction2(LinkToEntityAction): - """LinkToEntity action where the action is not usable on the same - entity's type as the one refered by the .etype attribute - """ - __selectors__ = (searchstate_accept_one_but_etype,) - diff -r 49075f57cf2c -r aa09e20dd8c0 web/application.py --- a/web/application.py Tue May 05 17:18:49 2009 +0200 +++ b/web/application.py Thu May 14 12:48:11 2009 +0200 @@ -14,20 +14,19 @@ from cubicweb import set_log_methods from cubicweb import (ValidationError, Unauthorized, AuthenticationError, NoSelectableObject, RepositoryError) -from cubicweb.cwconfig import CubicWebConfiguration from cubicweb.cwvreg import CubicWebRegistry from cubicweb.web import (LOGGER, StatusResponse, DirectResponse, Redirect, NotFound, RemoteCallFailed, ExplicitLogin, InvalidSession) -from cubicweb.web.component import SingletonComponent +from cubicweb.web.component import Component # make session manager available through a global variable so the debug view can # print information about web session SESSION_MANAGER = None -class AbstractSessionManager(SingletonComponent): +class AbstractSessionManager(Component): """manage session data associated to a session identifier""" id = 'sessionmanager' - + def __init__(self): self.session_time = self.vreg.config['http-session-time'] or None assert self.session_time is None or self.session_time > 0 @@ -40,7 +39,7 @@ assert self.cleanup_anon_session_time < self.session_time self.authmanager = self.vreg.select_component('authmanager') assert self.authmanager, 'no authentication manager found' - + def clean_sessions(self): """cleanup sessions which has not been unused since a given amount of time. Return the number of sessions which have been closed. @@ -58,28 +57,28 @@ self.close_session(session) closed += 1 return closed, total - closed - + def has_expired(self, session): """return True if the web session associated to the session is expired """ return not (self.session_time is None or time() < session.last_usage_time + self.session_time) - + def current_sessions(self): """return currently open sessions""" raise NotImplementedError() - + def get_session(self, req, sessionid): """return existing session for the given session identifier""" raise NotImplementedError() def open_session(self, req): """open and return a new session for the given request - + :raise ExplicitLogin: if authentication is required """ raise NotImplementedError() - + def close_session(self, session): """close session on logout or on invalid session detected (expired out, corrupted...) @@ -87,19 +86,19 @@ raise NotImplementedError() -class AbstractAuthenticationManager(SingletonComponent): +class AbstractAuthenticationManager(Component): """authenticate user associated to a request and check session validity""" id = 'authmanager' def authenticate(self, req): """authenticate user and return corresponding user object - + :raise ExplicitLogin: if authentication is required (no authentication info found or wrong user/password) """ raise NotImplementedError() - + class CookieSessionHandler(object): """a session handler using a cookie to store the session identifier @@ -108,7 +107,7 @@ identifier """ SESSION_VAR = '__session' - + def __init__(self, appli): self.session_manager = appli.vreg.select_component('sessionmanager') assert self.session_manager, 'no session manager found' @@ -122,7 +121,7 @@ time """ self.session_manager.clean_sessions() - + def set_session(self, req): """associate a session to the request @@ -133,7 +132,7 @@ if no session id is found, open a new session for the connected user or request authentification as needed - :raise Redirect: if authentication has occured and succeed + :raise Redirect: if authentication has occured and succeed """ assert req.cnx is None # at this point no cnx should be set on the request cookie = req.get_cookie() @@ -155,7 +154,7 @@ def get_session(self, req, sessionid): return self.session_manager.get_session(req, sessionid) - + def open_session(self, req): session = self.session_manager.open_session(req) cookie = req.get_cookie() @@ -178,7 +177,7 @@ except: req.cnx.rollback() raise - + def _postlogin(self, req): """postlogin: the user has been authenticated, redirect to the original page (index by default) with a welcome message @@ -198,7 +197,7 @@ if path == 'login': path = 'view' raise Redirect(req.build_url(path, **args)) - + def logout(self, req): """logout from the application by cleaning the session and raising `AuthenticationError` @@ -212,7 +211,7 @@ """Central registry for the web application. This is one of the central object in the web application, coupling dynamically loaded objects with the application's schema and the application's configuration objects. - + It specializes the VRegistry by adding some convenience methods to access to stored objects. Currently we have the following registries of objects known by the web application (library may use some others @@ -224,7 +223,7 @@ * components * actions """ - + def __init__(self, config, debug=None, session_handler_fact=CookieSessionHandler, vreg=None): @@ -244,14 +243,14 @@ from threading import Lock self._query_log = open(config['query-log-file'], 'a') self.publish = self.log_publish - self._logfile_lock = Lock() + self._logfile_lock = Lock() else: self._query_log = None self.publish = self.main_publish # instantiate session and url resolving helpers self.session_handler = session_handler_fact(self) self.url_resolver = vreg.select_component('urlpublisher') - + def connect(self, req): """return a connection for a logged user object according to existing sessions (i.e. a new connection may be created or an already existing @@ -267,9 +266,9 @@ req=req, appli=self) except NoSelectableObject: raise Unauthorized(req._('not authorized')) - + # publish methods ######################################################### - + def log_publish(self, path, req): """wrapper around _publish to log all queries executed for a given accessed path @@ -294,13 +293,13 @@ def main_publish(self, path, req): """method called by the main publisher to process - + should return a string containing the resulting page or raise a `NotFound` exception :type path: str :param path: the path part of the url to publish - + :type req: `web.Request` :param req: the request object @@ -371,7 +370,7 @@ req.set_session_data(req.form['__errorurl'], forminfo) raise Redirect(req.form['__errorurl']) self.error_handler(req, ex, tb=False) - + def error_handler(self, req, ex, tb=False): excinfo = sys.exc_info() self.exception(repr(ex)) @@ -384,21 +383,30 @@ if tb: req.data['excinfo'] = excinfo req.form['vid'] = 'error' - content = self.vreg.main_template(req, 'main') + errview = self.vreg.select_view('error', req, None) + template = self.main_template_id(req) + content = self.vreg.main_template(req, template, view=errview) except: - content = self.vreg.main_template(req, 'error') + content = self.vreg.main_template(req, 'error-template') raise StatusResponse(500, content) - + def need_login_content(self, req): return self.vreg.main_template(req, 'login') - + def loggedout_content(self, req): return self.vreg.main_template(req, 'loggedout') - + def notfound_content(self, req): - template = req.property_value('ui.main-template') or 'main' req.form['vid'] = '404' - return self.vreg.main_template(req, template) + view = self.vreg.select_view('404', req, None) + template = self.main_template_id(req) + return self.vreg.main_template(req, template, view=view) + + def main_template_id(self, req): + template = req.property_value('ui.main-template') + if template not in self.vreg.registry('views') : + template = 'main-template' + return template set_log_methods(CubicWebPublisher, LOGGER) diff -r 49075f57cf2c -r aa09e20dd8c0 web/box.py --- a/web/box.py Tue May 05 17:18:49 2009 +0200 +++ b/web/box.py Thu May 14 12:48:11 2009 +0200 @@ -1,24 +1,19 @@ """abstract box classes for CubicWeb web client :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" -from logilab.common.decorators import cached from logilab.mtconverter import html_escape -from cubicweb import Unauthorized, role as get_role -from cubicweb.common.registerers import ( - accepts_registerer, extresources_registerer, - etype_rtype_priority_registerer) -from cubicweb.common.selectors import ( - etype_rtype_selector, one_line_rset, accept, has_relation, - primary_view, match_context_prop, has_related_entities, - _rql_condition) -from cubicweb.common.view import Template -from cubicweb.common.appobject import ReloadableMixIn +from cubicweb import Unauthorized, role as get_role, target as get_target +from cubicweb.selectors import (one_line_rset, primary_view, + match_context_prop, partial_has_related_entities, + accepts_compat, has_relation_compat, + condition_compat, require_group_compat) +from cubicweb.view import View, ReloadableMixIn from cubicweb.web.htmlwidgets import (BoxLink, BoxWidget, SideBoxWidget, RawBoxItem, BoxSeparator) @@ -27,23 +22,24 @@ _ = unicode -class BoxTemplate(Template): +class BoxTemplate(View): """base template for boxes, usually a (contextual) list of possible - + actions. Various classes attributes may be used to control the box rendering. - + You may override on of the formatting callbacks is this is not necessary for your custom box. - + Classes inheriting from this class usually only have to override call to fetch desired actions, and then to do something like :: box.render(self.w) """ __registry__ = 'boxes' - __selectors__ = Template.__selectors__ + (match_context_prop,) - + __select__ = match_context_prop() + registered = classmethod(require_group_compat(View.registered)) + categories_in_order = () property_defs = { _('visible'): dict(type='Boolean', default=True, @@ -80,9 +76,9 @@ if escape: title = html_escape(title) return self.box_action(self._action(title, path, **kwargs)) - + def _action(self, title, path, **kwargs): - return UnregisteredAction(self.req, self.rset, title, path, **kwargs) + return UnregisteredAction(self.req, self.rset, title, path, **kwargs) # formating callbacks @@ -95,25 +91,24 @@ cls = getattr(action, 'html_class', lambda: None)() or self.htmlitemclass return BoxLink(action.url(), self.req._(action.title), cls, self.boxitem_link_tooltip(action)) - + class RQLBoxTemplate(BoxTemplate): """abstract box for boxes displaying the content of a rql query not related to the current result set. - + It rely on etype, rtype (both optional, usable to control registration according to application schema and display according to connected user's rights) and rql attributes """ - __registerer__ = etype_rtype_priority_registerer - __selectors__ = BoxTemplate.__selectors__ + (etype_rtype_selector,) +#XXX __selectors__ = BoxTemplate.__selectors__ + (etype_rtype_selector,) rql = None - + def to_display_rql(self): assert self.rql is not None, self.id return (self.rql,) - + def call(self, **kwargs): try: rset = self.req.execute(*self.to_display_rql()) @@ -128,7 +123,7 @@ box.append(self.mk_action(tname, entity.absolute_url())) box.render(w=self.w) - + class UserRQLBoxTemplate(RQLBoxTemplate): """same as rql box template but the rql is build using the eid of the request's user @@ -137,34 +132,22 @@ def to_display_rql(self): assert self.rql is not None, self.id return (self.rql, {'x': self.req.user.eid}, 'x') - - -class ExtResourcesBoxTemplate(BoxTemplate): - """base class for boxes displaying external resources such as the RSS logo. - It should list necessary resources with the .need_resources attribute. - """ - __registerer__ = extresources_registerer - need_resources = () class EntityBoxTemplate(BoxTemplate): """base class for boxes related to a single entity""" - __registerer__ = accepts_registerer - __selectors__ = (one_line_rset, primary_view, - match_context_prop, etype_rtype_selector, - has_relation, accept, _rql_condition) - accepts = ('Any',) + __select__ = BoxTemplate.__select__ & one_line_rset() & primary_view() + registered = accepts_compat(has_relation_compat(condition_compat(BoxTemplate.registered))) context = 'incontext' - condition = None - + def call(self, row=0, col=0, **kwargs): """classes inheriting from EntityBoxTemplate should define cell_call""" self.cell_call(row, col, **kwargs) class RelatedEntityBoxTemplate(EntityBoxTemplate): - __selectors__ = EntityBoxTemplate.__selectors__ + (has_related_entities,) - + __select__ = EntityBoxTemplate.__select__ & partial_has_related_entities() + def cell_call(self, row, col, **kwargs): entity = self.entity(row, col) limit = self.req.property_value('navigation.related-limit') + 1 @@ -182,37 +165,32 @@ subclasses should define at least id, rtype and target class attributes. """ - - def cell_call(self, row, col, view=None): + + def cell_call(self, row, col, view=None, **kwargs): self.req.add_js('cubicweb.ajax.js') entity = self.entity(row, col) box = SideBoxWidget(display_name(self.req, self.rtype), self.id) count = self.w_related(box, entity) if count: box.append(BoxSeparator()) - self.w_unrelated(box, entity) + if not self.w_unrelated(box, entity): + del box.items[-1] # remove useless separator box.render(self.w) def div_id(self): return self.id - @cached - def xtarget(self): - if self.target == 'subject': - return 'object', 'subject' - return 'subject', 'object' - def box_item(self, entity, etarget, rql, label): """builds HTML link to edit relation between `entity` and `etarget` """ - x, target = self.xtarget() - args = {x[0] : entity.eid, target[0] : etarget.eid} + role, target = get_role(self), get_target(self) + args = {role[0] : entity.eid, target[0] : etarget.eid} url = self.user_rql_callback((rql, args)) # for each target, provide a link to edit the relation label = u'[%s] %s' % (url, label, etarget.view('incontext')) return RawBoxItem(label, liclass=u'invisible') - + def w_related(self, box, entity): """appends existing relations to the `box`""" rql = 'DELETE S %s O WHERE S eid %%(s)s, O eid %%(o)s' % self.rtype @@ -220,12 +198,15 @@ for etarget in related: box.append(self.box_item(entity, etarget, rql, u'-')) return len(related) - + def w_unrelated(self, box, entity): """appends unrelated entities to the `box`""" rql = 'SET S %s O WHERE S eid %%(s)s, O eid %%(o)s' % self.rtype + i = 0 for etarget in self.unrelated_entities(entity): box.append(self.box_item(entity, etarget, rql, u'+')) + i += 1 + return i def unrelated_entities(self, entity): """returns the list of unrelated entities @@ -233,19 +214,20 @@ if etype is not defined on the Box's class, the default behaviour is to use the entity's appropraite vocabulary function """ - x, target = self.xtarget() # use entity.unrelated if we've been asked for a particular etype if hasattr(self, 'etype'): - return entity.unrelated(self.rtype, self.etype, x).entities() + return entity.unrelated(self.rtype, self.etype, get_role(self)).entities() # in other cases, use vocabulary functions entities = [] - for _, eid in entity.vocabulary(self.rtype, x): + form = self.vreg.select_object('forms', 'edition', self.req, self.rset, + row=self.row or 0) + field = form.field_by_name(self.rtype, get_role(self), entity.e_schema) + for _, eid in form.form_field_vocabulary(field): if eid is not None: rset = self.req.eid_rset(eid) entities.append(rset.get_entity(0, 0)) return entities - + def related_entities(self, entity): - x, target = self.xtarget() - return entity.related(self.rtype, x, entities=True) + return entity.related(self.rtype, get_role(self), entities=True) diff -r 49075f57cf2c -r aa09e20dd8c0 web/component.py --- a/web/component.py Tue May 05 17:18:49 2009 +0200 +++ b/web/component.py Thu May 14 12:48:11 2009 +0200 @@ -1,71 +1,72 @@ """abstract component class and base components definition for CubicWeb web client :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" -from cubicweb.common.appobject import Component, SingletonComponent -from cubicweb.common.utils import merge_dicts -from cubicweb.common.view import VComponent, SingletonVComponent -from cubicweb.common.registerers import action_registerer -from cubicweb.common.selectors import (paginated_rset, one_line_rset, - rql_condition, accept, primary_view, - match_context_prop, has_relation, - etype_rtype_selector) -from cubicweb.common.uilib import html_escape +from logilab.common.deprecation import class_renamed +from logilab.mtconverter import html_escape + +from cubicweb import role +from cubicweb.utils import merge_dicts +from cubicweb.view import View, Component +from cubicweb.selectors import ( + paginated_rset, one_line_rset, primary_view, match_context_prop, + partial_has_related_entities, condition_compat, accepts_compat, + has_relation_compat) _ = unicode - -class EntityVComponent(VComponent): +class EntityVComponent(Component): """abstract base class for additinal components displayed in content headers and footer according to: - + * the displayed entity's type * a context (currently 'header' or 'footer') it should be configured using .accepts, .etype, .rtype, .target and .context class attributes """ - + __registry__ = 'contentnavigation' - __registerer__ = action_registerer - __selectors__ = (one_line_rset, primary_view, - match_context_prop, etype_rtype_selector, - has_relation, accept, - rql_condition) - + __select__ = one_line_rset() & primary_view() & match_context_prop() + registered = accepts_compat(has_relation_compat(condition_compat(View.registered))) + property_defs = { _('visible'): dict(type='Boolean', default=True, help=_('display the box or not')), _('order'): dict(type='Int', default=99, help=_('display order of the component')), _('context'): dict(type='String', default='header', - vocabulary=(_('navtop'), _('navbottom'), + vocabulary=(_('navtop'), _('navbottom'), _('navcontenttop'), _('navcontentbottom')), #vocabulary=(_('header'), _('incontext'), _('footer')), help=_('context where this component should be displayed')), _('htmlclass'):dict(type='String', default='mainRelated', help=_('html class of the component')), } - - accepts = ('Any',) + context = 'navcontentbottom' # 'footer' | 'header' | 'incontext' - condition = None - - def call(self, view): - return self.cell_call(0, 0, view) - def cell_call(self, row, col, view): + def call(self, view=None): + return self.cell_call(0, 0, view=view) + + def cell_call(self, row, col, view=None): raise NotImplementedError() - -class NavigationComponent(VComponent): + +class NavigationComponent(Component): """abstract base class for navigation components""" - __selectors__ = (paginated_rset,) id = 'navigation' + __select__ = paginated_rset() + + property_defs = { + _('visible'): dict(type='Boolean', default=True, + help=_('display the component or not')), + } + page_size_property = 'navigation.page-size' start_param = '__start' stop_param = '__stop' @@ -74,21 +75,8 @@ previous_page_link_templ = next_page_link_templ = page_link_templ no_previous_page_link = no_next_page_link = u'' - @classmethod - def selected(cls, req, rset, row=None, col=None, page_size=None, **kwargs): - """by default web app objects are usually instantiated on - selection according to a request, a result set, and optional - row and col - """ - instance = super(NavigationComponent, cls).selected(req, rset, row, col, **kwargs) - if page_size is not None: - instance.page_size = page_size - elif 'page_size' in req.form: - instance.page_size = int(req.form['page_size']) - return instance - - def __init__(self, req, rset): - super(NavigationComponent, self).__init__(req, rset) + def __init__(self, req, rset, **kwargs): + super(NavigationComponent, self).__init__(req, rset, **kwargs) self.starting_from = 0 self.total = rset.rowcount @@ -96,14 +84,20 @@ try: return self._page_size except AttributeError: - self._page_size = self.req.property_value(self.page_size_property) - return self._page_size + page_size = self.extra_kwargs.get('page_size') + if page_size is None: + if 'page_size' in self.req.form: + page_size = int(self.req.form['page_size']) + else: + page_size = self.req.property_value(self.page_size_property) + self._page_size = page_size + return page_size def set_page_size(self, page_size): self._page_size = page_size - + page_size = property(get_page_size, set_page_size) - + def page_boundaries(self): try: stop = int(self.req.form[self.stop_param]) + 1 @@ -112,7 +106,7 @@ start, stop = 0, self.page_size self.starting_from = start return start, stop - + def clean_params(self, params): if self.start_param in params: del params[self.start_param] @@ -151,25 +145,19 @@ class RelatedObjectsVComponent(EntityVComponent): """a section to display some related entities""" - __selectors__ = (one_line_rset, primary_view, - etype_rtype_selector, has_relation, - match_context_prop, accept) + __select__ = EntityVComponent.__select__ & partial_has_related_entities() + vid = 'list' def rql(self): - """override this method if you want to use a custom rql query. - """ + """override this method if you want to use a custom rql query""" return None - + def cell_call(self, row, col, view=None): rql = self.rql() if rql is None: entity = self.rset.get_entity(row, col) - if self.target == 'object': - role = 'subject' - else: - role = 'object' - rset = entity.related(self.rtype, role) + rset = entity.related(self.rtype, role(self)) else: eid = self.rset[row][col] rset = self.req.execute(self.rql(), {'x': eid}, 'x') @@ -178,3 +166,10 @@ self.w(u'

' % self.div_class()) self.wview(self.vid, rset, title=self.req._(self.title).capitalize()) self.w(u'

') + + +VComponent = class_renamed('VComponent', Component, + 'VComponent is deprecated, use Component') +SingletonVComponent = class_renamed('SingletonVComponent', Component, + 'SingletonVComponent is deprecated, use ' + 'Component and explicit registration control') diff -r 49075f57cf2c -r aa09e20dd8c0 web/controller.py --- a/web/controller.py Tue May 05 17:18:49 2009 +0200 +++ b/web/controller.py Thu May 14 12:48:11 2009 +0200 @@ -2,17 +2,17 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" -from mx.DateTime import strptime, Error as MxDTError, TimeDelta +import datetime from cubicweb import typed_eid -from cubicweb.common.registerers import priority_registerer -from cubicweb.common.selectors import match_user_group -from cubicweb.common.appobject import AppObject +from cubicweb.utils import strptime, todate, todatetime +from cubicweb.selectors import yes, require_group_compat +from cubicweb.appobject import AppObject from cubicweb.web import LOGGER, Redirect, RequestError @@ -21,7 +21,7 @@ ('__redirectpath', '__redirectpath'), ('__redirectparams', '__redirectparams'), ) -NAV_FORM_PARAMETERS = [fp for ap, fp in NAVIGATION_PARAMETERS] +NAV_FORM_PARAMETERS = tuple(fp for ap, fp in NAVIGATION_PARAMETERS) def redirect_params(form): """transform redirection parameters into navigation parameters @@ -47,7 +47,7 @@ for subj in subjs.split('_'): for obj in objs.split('_'): yield typed_eid(subj), rtype, typed_eid(obj) - + def append_url_params(url, params): """append raw parameters to the url. Given parameters, if any, are expected to be already url-quoted. @@ -67,16 +67,15 @@ and another linked by forms to edit objects ("edit"). """ __registry__ = 'controllers' - __registerer__ = priority_registerer - __selectors__ = (match_user_group,) - require_groups = () + __select__ = yes() + registered = require_group_compat(AppObject.registered) def __init__(self, *args, **kwargs): super(Controller, self).__init__(*args, **kwargs) # attributes use to control after edition redirection self._after_deletion_path = None self._edited_entity = None - + def publish(self, rset=None): """publish the current request, with an option input rql string (already processed if necessary) @@ -84,7 +83,18 @@ raise NotImplementedError # generic methods useful for concret implementations ###################### - + + def process_rql(self, rql): + """execute rql if specified""" + if rql: + self.ensure_ro_rql(rql) + if not isinstance(rql, unicode): + rql = unicode(rql, self.req.encoding) + pp = self.vreg.select_component('magicsearch', self.req) + self.rset = pp.process_query(rql, self.req) + return self.rset + return None + def check_expected_params(self, params): """check that the given list of parameters are specified in the form dictionary @@ -96,7 +106,7 @@ if missing: raise RequestError('missing required parameter(s): %s' % ','.join(missing)) - + def parse_datetime(self, value, etype='Datetime'): """get a datetime or time from a string (according to etype) Datetime formatted as Date are accepted @@ -106,21 +116,24 @@ if etype == 'Datetime': format = self.req.property_value('ui.datetime-format') try: - return strptime(value, format) - except MxDTError: + return todatetime(strptime(value, format)) + except: pass elif etype == 'Time': format = self.req.property_value('ui.time-format') try: # (adim) I can't find a way to parse a Time with a custom format date = strptime(value, format) # this returns a DateTime - return TimeDelta(date.hour, date.minute, date.second) - except MxDTError: + return datetime.time(date.hour, date.minute, date.second) + except: raise ValueError('can\'t parse %r (expected %s)' % (value, format)) try: format = self.req.property_value('ui.date-format') - return strptime(value, format) - except MxDTError: + dt = strptime(value, format) + if etype == 'Datetime': + return todatetime(dt) + return todate(dt) + except: raise ValueError('can\'t parse %r (expected %s)' % (value, format)) @@ -131,7 +144,7 @@ # relation) that might not be satisfied yet (in case of creations) if not self._edited_entity: self._edited_entity = entity - + def delete_entities(self, eidtypes): """delete entities from the repository""" redirect_info = set() @@ -150,7 +163,7 @@ self.req.set_message(self.req._('entities deleted')) else: self.req.set_message(self.req._('entity deleted')) - + def delete_relations(self, rdefs): """delete relations from the repository""" # FIXME convert to using the syntax subject:relation:eids @@ -159,7 +172,7 @@ rql = 'DELETE X %s Y where X eid %%(x)s, Y eid %%(y)s' % rtype execute(rql, {'x': subj, 'y': obj}, ('x', 'y')) self.req.set_message(self.req._('relations deleted')) - + def insert_relations(self, rdefs): """insert relations into the repository""" execute = self.req.execute @@ -167,7 +180,7 @@ rql = 'SET X %s Y where X eid %%(x)s, Y eid %%(y)s' % rtype execute(rql, {'x': subj, 'y': obj}, ('x', 'y')) - + def reset(self): """reset form parameters and redirect to a view determinated by given parameters @@ -211,7 +224,7 @@ url = self.build_url(path, **newparams) url = append_url_params(url, self.req.form.get('__redirectparams')) raise Redirect(url) - + def _return_to_edition_view(self, newparams): """apply-button case""" diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.acl.css --- a/web/data/cubicweb.acl.css Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.acl.css Thu May 14 12:48:11 2009 +0200 @@ -9,19 +9,90 @@ /* security edition form (views/management.py) */ /******************************************************************************/ +h2.schema{ + background : #ff7700; + color: #fff; + font-weight: bold; + padding : 0.1em 0.3em; +} + + +h3.schema{ + font-weight: bold; +} + +h4 a, +h4 a:link, +h4 a:visited{ + color:#000; + } + table.schemaInfo { - margin: 1ex 1em; + margin: 1em 0em; text-align: left; border: 1px solid black; border-collapse: collapse; + width:100%; } table.schemaInfo th, table.schemaInfo td { - padding: 0em 1em; - border: 1px solid black; + padding: .3em .5em; + border: 1px solid grey; + width:33%; +} + + +table.schemaInfo tr th { + padding: 0.2em 0px 0.2em 5px; + background-image:none; + background-color:#dfdfdf; +} + +table.schemaInfo thead tr { + border: 1px solid #dfdfdf; +} + +table.schemaInfo td { + padding: 3px 10px 3px 5px; + } +.users{ + color : #00CC33; + font-weight: bold } + +.guests{ + color : #ff7700; + font-weight: bold; +} + +.staff{ + color : #0083ab; + font-weight: bold; +} + +.owners{ + color : #8b0000; + font-weight: bold; +} + +.discret, +a.grey{ + color:#666; +} + +a.grey:hover{ + color:#000; +} + +.red{ + color : #ff7700; + } + +div#schema_security{ + width:780px; + } /******************************************************************************/ /* user groups edition form (views/euser.py) */ /******************************************************************************/ diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.ajax.js --- a/web/data/cubicweb.ajax.js Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.ajax.js Thu May 14 12:48:11 2009 +0200 @@ -1,6 +1,6 @@ /* * :organization: Logilab - * :copyright: 2003-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. + * :copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. * :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr */ @@ -9,6 +9,36 @@ var JSON_BASE_URL = baseuri() + 'json?'; +function _loadAjaxHtmlHead(node, head, tag, srcattr) { + var loaded = []; + jQuery('head ' + tag).each(function(i) { + loaded.push(this.getAttribute(srcattr)); + }); + node.find(tag).each(function(i) { + if (!loaded.contains(this.getAttribute(srcattr))) { + jQuery(this).appendTo(head); + } + }); + node.find(tag).remove(); +} + +/* + * inspect dom response, search for a

node and + * put its content into the real document's head. + * This enables dynamic css and js loading and is used by replacePageChunk + */ +function loadAjaxHtmlHead(node) { + var head = jQuery('head'); + node = jQuery(node).find('div.ajaxHtmlHead'); + _loadAjaxHtmlHead(node, head, 'script', 'src'); + _loadAjaxHtmlHead(node, head, 'link', 'href'); + node.find('*').appendTo(head); +} + +function preprocessAjaxLoad(node, newdomnode) { + loadAjaxHtmlHead(newdomnode); +} + function postAjaxLoad(node) { // find sortable tables if there are some if (typeof(Sortable) != 'undefined') { @@ -27,11 +57,12 @@ if (typeof roundedCornersOnLoad != 'undefined') { roundedCornersOnLoad(); } + loadDynamicFragments(node); + jQuery(CubicWeb).trigger('ajax-loaded'); } // cubicweb loadxhtml plugin to make jquery handle xhtml response jQuery.fn.loadxhtml = function(url, data, reqtype, mode) { - var ajax = null; if (reqtype == 'post') { ajax = jQuery.post; @@ -41,16 +72,16 @@ if (this.size() > 1) { log('loadxhtml was called with more than one element'); } + var node = this.get(0); // only consider the first element mode = mode || 'replace'; var callback = null; if (data && data.callback) { callback = data.callback; delete data.callback; } - var node = this.get(0); // only consider the first element - ajax = jQuery.post; ajax(url, data, function(response) { var domnode = getDomFromResponse(response); + preprocessAjaxLoad(node, domnode); if (mode == 'swap') { var origId = node.id; node = swapDOM(node, domnode); @@ -74,8 +105,12 @@ /* finds each dynamic fragment in the page and executes the * the associated RQL to build them (Async call) */ -function loadDynamicFragments() { - var fragments = jQuery('div.dynamicFragment'); +function loadDynamicFragments(node) { + if (node) { + var fragments = jQuery(node).find('div.dynamicFragment'); + } else { + var fragments = jQuery('div.dynamicFragment'); + } if (fragments.length == 0) { return; } @@ -97,26 +132,10 @@ } } -jQuery(document).ready(loadDynamicFragments); +jQuery(document).ready(function() {loadDynamicFragments();}); //============= base AJAX functions to make remote calls =====================// - -/* - * This function will call **synchronously** a remote method on the cubicweb server - * @param fname: the function name to call (as exposed by the JSONController) - * @param args: the list of arguments to pass the function - */ -function remote_exec(fname) { - setProgressCursor(); - var props = {'mode' : "remote", 'fname' : fname, 'pageid' : pageid, - 'arg': map(jQuery.toJSON, sliceList(arguments, 1))}; - var result = jQuery.ajax({url: JSON_BASE_URL, data: props, async: false}).responseText; - result = evalJSON(result); - resetCursor(); - return result; -} - function remoteCallFailed(err, req) { if (req.status == 500) { updateMessage(err); @@ -125,92 +144,64 @@ } } + /* - * This function is the equivalent of MochiKit's loadJSONDoc but - * uses POST instead of GET + * This function will call **synchronously** a remote method on the cubicweb server + * @param fname: the function name to call (as exposed by the JSONController) + * + * additional arguments will be directly passed to the specified function + * + * It looks at http headers to guess the response type. */ -function loadJSONDocUsingPOST(url, queryargs, mode) { - mode = mode || 'remote'; +function remoteExec(fname /* ... */) { setProgressCursor(); - var dataType = (mode == 'remote') ? "json":null; - var deferred = loadJSON(url, queryargs, 'POST', dataType); + var props = {'fname' : fname, 'pageid' : pageid, + 'arg': map(jQuery.toJSON, sliceList(arguments, 1))}; + var result = jQuery.ajax({url: JSON_BASE_URL, data: props, async: false}).responseText; + if (result) { + result = evalJSON(result); + } + resetCursor(); + return result; +} + +/* + * This function will call **asynchronously** a remote method on the json + * controller of the cubicweb http server + * + * @param fname: the function name to call (as exposed by the JSONController) + * + * additional arguments will be directly passed to the specified function + * + * It looks at http headers to guess the response type. + */ + +function asyncRemoteExec(fname /* ... */) { + setProgressCursor(); + var props = {'fname' : fname, 'pageid' : pageid, + 'arg': map(jQuery.toJSON, sliceList(arguments, 1))}; + var deferred = loadRemote(JSON_BASE_URL, props, 'POST'); deferred = deferred.addErrback(remoteCallFailed); -// if (mode == 'remote') { -// deferred = deferred.addCallbacks(evalJSONRequest); -// } + deferred = deferred.addErrback(resetCursor); deferred = deferred.addCallback(resetCursor); return deferred; } -function _buildRemoteArgs(fname) { - return {'mode' : "remote", 'fname' : fname, 'pageid' : pageid, - 'arg': map(jQuery.toJSON, sliceList(arguments, 1))}; -} - -/* - * This function will call **asynchronously** a remote method on the cubicweb server - * This function is a low level one. You should use `async_remote_exec` or - * `async_rawremote_exec` instead. - * - * @param fname: the function name to call (as exposed by the JSONController) - * @param funcargs: the function's arguments - * @param mode: rawremote or remote - */ -function _async_exec(fname, funcargs, mode) { - var props = {'mode' : mode, 'fname' : fname, 'pageid' : pageid}; - var args = map(urlEncode, map(jQuery.toJSON, funcargs)); - args.unshift(''); // this is to be able to use join() directly - var queryargs = as_url(props) + args.join('&arg='); - return loadJSONDocUsingPOST(JSON_BASE_URL, queryargs, mode); -} - -/* - * This function will call **asynchronously** a remote method on the cubicweb server - * @param fname: the function name to call (as exposed by the JSONController) - * additional arguments will be directly passed to the specified function - * Expected response type is Json. - */ -function async_remote_exec(fname /* ... */) { - return _async_exec(fname, sliceList(arguments, 1), 'remote'); -} - -/* - * This version of _async_exec doesn't expect a json response. - * It looks at http headers to guess the response type. - */ -function async_rawremote_exec(fname /* ... */) { - return _async_exec(fname, sliceList(arguments, 1), 'rawremote'); -} - -/* - * This function will call **asynchronously** a remote method on the cubicweb server - * @param fname: the function name to call (as exposed by the JSONController) - * @param varargs: the list of arguments to pass to the function - * This is an alternative form of `async_remote_exec` provided for convenience - */ -function async_remote_exec_varargs(fname, varargs) { - return _async_exec(fname, varargs, 'remote'); -} - /* emulation of gettext's _ shortcut */ function _(message) { - return remote_exec('i18n', [message])[0]; -} - -function rqlexec(rql) { - return async_remote_exec('rql', rql); + return remoteExec('i18n', [message])[0]; } function userCallback(cbname) { - async_remote_exec('user_callback', cbname); + asyncRemoteExec('user_callback', cbname); } function unloadPageData() { // NOTE: do not make async calls on unload if you want to avoid // strange bugs - remote_exec('unload_page_data'); + remoteExec('unload_page_data'); } function openHash() { @@ -228,7 +219,7 @@ nodeid = nodeid || (compid + 'Component'); extraargs = extraargs || {}; var node = getNode(nodeid); - var d = async_rawremote_exec('component', compid, rql, registry, extraargs); + var d = asyncRemoteExec('component', compid, rql, registry, extraargs); d.addCallback(function(result, req) { var domnode = getDomFromResponse(result); if (node) { @@ -251,7 +242,7 @@ } function userCallbackThenUpdateUI(cbname, compid, rql, msg, registry, nodeid) { - var d = async_remote_exec('user_callback', cbname); + var d = asyncRemoteExec('user_callback', cbname); d.addCallback(function() { reloadComponent(compid, rql, registry, nodeid); if (msg) { updateMessage(msg); } @@ -265,7 +256,7 @@ } function userCallbackThenReloadPage(cbname, msg) { - var d = async_remote_exec('user_callback', cbname); + var d = asyncRemoteExec('user_callback', cbname); d.addCallback(function() { window.location.reload(); if (msg) { updateMessage(msg); } @@ -283,7 +274,7 @@ * while the page was generated. */ function unregisterUserCallback(cbname) { - var d = async_remote_exec('unregister_user_callback', cbname); + var d = asyncRemoteExec('unregister_user_callback', cbname); d.addCallback(function() {resetCursor();}); d.addErrback(function(xxx) { updateMessage(_("an error occured")); @@ -311,20 +302,33 @@ var props = {}; if (node) { props['rql'] = rql; + props['fname'] = 'view'; props['pageid'] = pageid; if (vid) { props['vid'] = vid; } if (extraparams) { jQuery.extend(props, extraparams); } - // FIXME we need to do as_url(props) manually instead of + // FIXME we need to do asURL(props) manually instead of // passing `props` directly to loadxml because replacePageChunk // is sometimes called (abusively) with some extra parameters in `vid` var mode = swap?'swap':'replace'; - var url = JSON_BASE_URL + as_url(props); + var url = JSON_BASE_URL + asURL(props); jQuery(node).loadxhtml(url, params, 'get', mode); } else { log('Node', nodeId, 'not found'); } } +/* + * fetches `url` and replaces `nodeid`'s content with the result + * @param replacemode how the replacement should be done (default is 'replace') + * Possible values are : + * - 'replace' to replace the node's content with the generated HTML + * - 'swap' to replace the node itself with the generated HTML + * - 'append' to append the generated HTML to the node's content + */ +function loadxhtml(nodeid, url, /* ... */ replacemode) { + jQuery('#' + nodeid).loadxhtml(url, null, 'post', replacemode); +} + /* XXX: this function should go in edition.js but as for now, htmlReplace * references it. * @@ -349,6 +353,22 @@ jQuery(document).ready(buildWysiwygEditors); +/* + * takes a list of DOM nodes and removes all empty text nodes + */ +function stripEmptyTextNodes(nodelist) { + var stripped = []; + for (var i=0; i < nodelist.length; i++) { + var node = nodelist[i]; + if (isTextNode(node) && !node.textContent.strip()) { + continue; + } else { + stripped.push(node); + } + } + return stripped; +} + /* convenience function that returns a DOM node based on req's result. */ function getDomFromResponse(response) { if (typeof(response) == 'string') { @@ -360,6 +380,7 @@ // no child (error cases) => return the whole document return doc.cloneNode(true); } + children = stripEmptyTextNodes(children); if (children.length == 1) { // only one child => return it return children[0].cloneNode(true); diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.bookmarks.js --- a/web/data/cubicweb.bookmarks.js Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.bookmarks.js Thu May 14 12:48:11 2009 +0200 @@ -1,7 +1,7 @@ CubicWeb.require('ajax.js'); function removeBookmark(beid) { - d = async_remote_exec('delete_bookmark', beid); + d = asyncRemoteExec('delete_bookmark', beid); d.addCallback(function(boxcontent) { reloadComponent('bookmarks_box', '', 'boxes', 'bookmarks_box'); document.location.hash = '#header'; diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.calendar.js --- a/web/data/cubicweb.calendar.js Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.calendar.js Thu May 14 12:48:11 2009 +0200 @@ -235,7 +235,7 @@ // the only way understood by both IE and Mozilla. Otherwise, // IE accepts innerText and mozilla accepts textContent var selectedDate = new Date(cal.year, cal.month, cell.innerHTML, 12); - var xxx = remote_exec("format_date", toISOTimestamp(selectedDate)); + var xxx = remoteExec("format_date", toISOTimestamp(selectedDate)); input.value = xxx; cal.hide(); } diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.compat.js --- a/web/data/cubicweb.compat.js Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.compat.js Thu May 14 12:48:11 2009 +0200 @@ -365,19 +365,26 @@ }; -function loadJSON(url, data, type, dataType) { +/* + * Asynchronously load an url and return a deferred + * whose callbacks args are decoded according to + * the Content-Type response header + */ +function loadRemote(url, data, reqtype) { var d = new Deferred(); jQuery.ajax({ url: url, - type: type, + type: reqtype, data: data, - dataType: dataType, beforeSend: function(xhr) { d.req = xhr; }, success: function(data, status) { + if (d.req.getResponseHeader("content-type") == 'application/json') { + data = evalJSON(data); + } d.success(data); }, @@ -507,23 +514,7 @@ var KEYS = { KEY_ESC: 27, KEY_ENTER: 13 -} +}; -// XHR = null; -// function test() { -// var d = loadJSON('http://crater:9876/json?mode=remote&fname=i18n&pageid=xxx&arg=' + jQuery.toJSON(['modify'])); -// d = d.addCallback(function (result, xhr) { -// XHR = xhr; -// log('got ajax result 1' + result + xhr); -// log('got ajax result 1' + xhr); -// log('got ajax result 1' + xhr + 'arguments =', arguments.length); -// }); -// d.addCallback(function (x, req, y, z) { -// log('callback 2 x =' + x, ' req=', req, 'y =', y, 'z=',z); -// }, 12, 13) -// d.addErrback(function (error, xhr) { -// XHR = xhr; -// log('got err', error, ' code =', xhr.status, 'arguments length=', arguments.length); -// }) -// } + diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.edition.js --- a/web/data/cubicweb.edition.js Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.edition.js Thu May 14 12:48:11 2009 +0200 @@ -1,6 +1,6 @@ /* * :organization: Logilab - * :copyright: 2003-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. + * :copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. * :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr */ @@ -20,10 +20,11 @@ * @param tabindex the tabindex that should be set on the widget */ function setPropValueWidget(varname, tabindex) { - var key = firstSelected(jQuery('#pkey:'+varname)); + var key = firstSelected(document.getElementById('pkey:'+varname)); if (key) { - var args = _buildRemoteArgs('prop_widget', key, varname, tabindex); - jQuery('#div:value:'+varname).loadxhtml(JSON_BASE_URL, args, 'post'); + var args = {fname: 'prop_widget', pageid: pageid, + arg: map(jQuery.toJSON, [key, varname, tabindex])}; + jqNode('div:value:'+varname).loadxhtml(JSON_BASE_URL, args, 'post'); } } @@ -51,40 +52,25 @@ }); } + function showMatchingSelect(selectedValue, eid) { if (selectedValue) { divId = 'div' + selectedValue + '_' + eid; var divNode = jQuery('#' + divId); if (!divNode.length) { var args = {vid: 'unrelateddivs', relation: selectedValue, - rql: rql_for_eid(eid), pageid: pageid, - '__notemplate': 1}; - jQuery.get(JSON_BASE_URL, args, function(response) { - // append generated HTML to the cell - jQuery('#unrelatedDivs_' + eid).append(getDomFromResponse(response)); - _showMatchingSelect(eid, jQuery('#' + divId)); - }); - // deferred = doXHR(JSON_BASE_URL + queryString(args)); - // deferred.addCallback(_buildAndShowMatchingSelect, eid, divId); + rql: rql_for_eid(eid), '__notemplate': 1, + callback: function() {_showMatchingSelect(eid, jQuery('#' + divId))}}; + jQuery('#unrelatedDivs_' + eid).loadxhtml(baseuri() + 'view', args, 'post', 'append'); } else { _showMatchingSelect(eid, divNode); } - } - else { + } else { _showMatchingSelect(eid, null); } } - -// @param divStr a HTML string returned by the server -// function _buildAndShowMatchingSelect(eid, divId, req) { -// var tdNode = jQuery('#unrelatedDivs_' + eid); -// // append generated HTML to the cell -// tdNode.appendChild(getDomFromRequest(req)); -// _showMatchingSelect(eid, jQuery('#' + divId)); -// } - // @param divNode is a jQuery selection function _showMatchingSelect(eid, divNode) { // hide all divs, and then show the matching one @@ -154,7 +140,7 @@ // add hidden parameter var entityForm = jQuery('#entityForm'); var oid = optionNode.id.substring(2); // option id is prefixed by "id" - remote_exec('add_pending_insert', oid.split(':')); + remoteExec('add_pending_inserts', [oid.split(':')]); var selectNode = optionNode.parentNode; // remove option node selectNode.removeChild(optionNode); @@ -180,13 +166,15 @@ if (comboId) { // re-insert option in combobox if it was taken from there var selectNode = getNode(comboId); + // XXX what on object relation if (selectNode){ var options = selectNode.options; var node_id = elementId.substring(0, elementId.indexOf(':')); options[options.length] = OPTION({'id' : elementId, 'value' : node_id}, entityView); } } - remote_exec('remove_pending_insert', elementId.split(':')); + elementId = elementId.substring(2, elementId.length); + remoteExec('remove_pending_insert', elementId.split(':')); } // this function builds a Handle to cancel pending insertion @@ -198,7 +186,7 @@ // @param nodeId eid_from:r_type:eid_to function addPendingDelete(nodeId, eid) { - var d = async_remote_exec('add_pending_delete', nodeId.split(':')); + var d = asyncRemoteExec('add_pending_delete', nodeId.split(':')); d.addCallback(function () { // and strike entity view jqNode('span' + nodeId).addClass('pendingDelete'); @@ -209,7 +197,7 @@ // @param nodeId eid_from:r_type:eid_to function cancelPendingDelete(nodeId, eid) { - var d = async_remote_exec('remove_pending_delete', nodeId.split(':')); + var d = asyncRemoteExec('remove_pending_delete', nodeId.split(':')); d.addCallback(function () { // reset link's CSS class jqNode('span' + nodeId).removeClass('pendingDelete'); @@ -232,11 +220,11 @@ function selectForAssociation(tripletIdsString, originalEid) { var tripletlist = map(function (x) { return x.split(':'); }, tripletIdsString.split('-')); - var d = async_remote_exec('add_pending_inserts', tripletlist); + var d = asyncRemoteExec('add_pending_inserts', tripletlist); d.addCallback(function () { var args = {vid: 'edition', __mode: 'normal', rql: rql_for_eid(originalEid)}; - document.location = 'view?' + as_url(args); + document.location = 'view?' + asURL(args); }); } @@ -246,36 +234,27 @@ jQuery('#inline' + rtype + 'slot span.icounter').each(function (i) { this.innerHTML = i+1; }); - // var divnode = jQuery('#inline' + rtype + 'slot'); - // var iforms = getElementsByTagAndClassName('span', 'icounter', divnode); - // for (var i=0; i>> as_url({'rql' : "RQL", 'x': [1, 2], 'itemvid' : "oneline"}) + * >>> asURL({'rql' : "RQL", 'x': [1, 2], 'itemvid' : "oneline"}) * rql=RQL&vid=list&itemvid=oneline&x=1&x=2 */ -function as_url(props) { +function asURL(props) { var chunks = []; for(key in props) { var value = props[key]; diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.login.css --- a/web/data/cubicweb.login.css Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.login.css Thu May 14 12:48:11 2009 +0200 @@ -9,7 +9,7 @@ position: absolute; z-index: 400; right: 0px; - width: 23em; + width: 26em; padding: 0px 1px 1px; font-weight: bold; background: #E4EAD8; @@ -24,8 +24,8 @@ position : absolute; top: 15%; left : 50%; - margin-left: -11em; - width: 24em; + margin-left: -14em; + width: 28em; background: #fff; border: 2px solid #cfceb7; padding-bottom: 0.5em; diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.mailform.css --- a/web/data/cubicweb.mailform.css Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.mailform.css Thu May 14 12:48:11 2009 +0200 @@ -5,7 +5,7 @@ * :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr */ -div#compose { +form#sendmail { border: 1px solid #DBDCE3; background-color: #E9F5F7; font-family:Verdana,Tahoma,Arial,sans-serif; @@ -16,7 +16,7 @@ width: 100%; } -div#compose td#buttonbar { +form#sendmail td#buttonbar { padding: 0.5ex 0ex; } @@ -36,12 +36,12 @@ width: 47em; } -div#compose div#toolbar { +form#sendmail div#toolbar { margin: 0.5em 0em; height: 29px; } -div#compose div#toolbar ul { +form#sendmail div#toolbar ul { list-style-image: none; list-style-position: outside; list-style-type:none; @@ -50,13 +50,13 @@ /* border: 1px solid #DBDCE3; */ } -div#compose div#toolbar li { +form#sendmail div#toolbar li { background: none; padding-left: 1em; float: left; } -div#compose div#toolbar li a { +form#sendmail div#toolbar li a { font-family: Verdana,Tahoma,Arial,sans-serif; color: #444444; } diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.preferences.css --- a/web/data/cubicweb.preferences.css Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.preferences.css Thu May 14 12:48:11 2009 +0200 @@ -5,12 +5,46 @@ * :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr */ -.componentTitle{ + +table.preferences td{ + padding: 0 0.5em 1em; + } + +fieldset.preferences{ + border : 1px solid #CFCEB7; + margin:1em 0; + padding:0 1em 1em; +} + +div.preffield { + margin-bottom: 0.8em ; +} + +/* +div.preffield label{ + font-size:110% + } +*/ + +div.prefinput{ + margin:.3em 0; +} + +div.componentLink{ + margin-top:0.3em; + } + +a.componentTitle{ font-weight:bold; - color: #ff7700; - padding:0px 4px; + color: #000; + } + +a.componentTitle:visited{ + color: #000; } + + h2.propertiesform a{ display:block; margin: 10px 0px 6px 0px; @@ -26,3 +60,56 @@ background-color:#cfceb7; text-decoration:none; } + +div.prefinput select.changed, +div.prefinput input.changed{ + background:#eeedd9; + border: 1px solid #eeedd9; +} + +div.prefinput select, +div.prefinput input{ + background:#fff; + border: 1px solid #CFCEB7; +} + +.prefinput input.error { + background:transparent url(error.png) no-repeat scroll 100% 50% !important; +} + + +div.formsg{ + font-weight:bold; + margin:0.5em 0px; + } + + +div.formsg .critical{ + color:red; + padding-left:20px; + background:#fff url(critical.png) no-repeat; + } + +div.formsg .message{ + color : green; +} + +.helper{ + font-size: 96%; + color: #555544; + padding:0; +} + +div.prefinput .helper:hover { + color: #000; + cursor: default; +} + +.error{ + color:red; + padding-right:1em; + } + +div.openlink{ + display:inline; + } \ No newline at end of file diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.preferences.js --- a/web/data/cubicweb.preferences.js Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.preferences.js Thu May 14 12:48:11 2009 +0200 @@ -3,8 +3,176 @@ * XXX whenever used outside of preferences, don't forget to * move me in a more appropriate place */ -function toggle_and_remember_visibility(elemId, cookiename) { + +function toggleVisibility(elemId, cookiename) { + _clearPreviousMessages(); jqNode(elemId).toggleClass('hidden'); - async_remote_exec('set_cookie', cookiename, + asyncRemoteExec('set_cookie', cookiename, jQuery('#' + elemId).attr('class')); } + +function closeFieldset(fieldsetid){ + var linklabel = _('open all'); + var linkhref = 'javascript:openFieldset("' +fieldsetid + '")' + _toggleFieldset(fieldsetid, 1, linklabel, linkhref) +} + +function openFieldset(fieldsetid){ + var linklabel = _('close all'); + var linkhref = 'javascript:closeFieldset("'+ fieldsetid + '")' + _toggleFieldset(fieldsetid, 0, linklabel, linkhref) +} + + +function _toggleFieldset(fieldsetid, closeaction, linklabel, linkhref){ + jQuery('#'+fieldsetid).find('div.openlink').each(function(){ + var link = A({'href' : "javascript:noop();", + 'onclick' : linkhref}, + linklabel) + jQuery(this).empty().append(link); + }); + jQuery('#'+fieldsetid).find('fieldset[id]').each(function(){ + var fieldset = jQuery(this); + if(closeaction){ + fieldset.addClass('hidden') + }else{ + fieldset.removeClass('hidden'); + linkLabel = (_('open all')); + } + }); +} + +function validatePrefsForm(formid){ + var form = getNode(formid); + freezeFormButtons(formid); + try { + var d = _sendForm(formid, null); + } catch (ex) { + log('got exception', ex); + return false; + } + function _callback(result, req) { + _clearPreviousMessages(); + _clearPreviousErrors(formid); + // success + if(result[0]){ + return submitSucces(formid) + } + // Failures + unfreezeFormButtons(formid); + var descr = result[1]; + if (!isArrayLike(descr) || descr.length != 2) { + log('got strange error :', descr); + updateMessage(descr); + return ; + } + _displayValidationerrors(formid, descr[0], descr[1]); + var dom = DIV({'class':'critical'}, + _("please correct errors below")); + jQuery(form).find('div.formsg').empty().append(dom); + updateMessage(_("")); + return false; + } + d.addCallback(_callback); + return false; +} + +function submitSucces(formid){ + var form = jQuery('#'+formid); + setCurrentValues(form); + var dom = DIV({'class':'message'}, + _("changes applied")); + jQuery(form).find('div.formsg').empty().append(dom); + jQuery(form).find('input').removeClass('changed'); + checkValues(form, true); + return; +} + +function _clearPreviousMessages() { + jQuery('div#appMsg').addClass('hidden'); + jQuery('div.formsg').empty(); +} + +function _clearPreviousErrors(formid) { + jQuery('#' + formid + ' span.error').remove(); +} + + +function checkValues(form, success){ + var unfreezeButtons = false; + jQuery(form).find('select').each(function () { + unfreezeButtons = _checkValue(jQuery(this), unfreezeButtons); + }); + jQuery(form).find('[type=text]').each(function () { + unfreezeButtons = _checkValue(jQuery(this), unfreezeButtons); + }); + jQuery(form).find('input[type=radio]').each(function () { + if (jQuery(this).attr('checked')){ + unfreezeButtons = _checkValue(jQuery(this), unfreezeButtons); + } + }); + + if (unfreezeButtons){ + unfreezeFormButtons(form.attr('id')); + }else{ + if (!success){ + _clearPreviousMessages(); + } + _clearPreviousErrors(form.attr('id')); + freezeFormButtons(form.attr('id')); + } +} + +function _checkValue(input, unfreezeButtons){ + var currentValueInput = jQuery("input[id=current-" + input.attr('name') + "]"); + if (currentValueInput.attr('value') != input.attr('value')){ + input.addClass('changed'); + unfreezeButtons = true; + }else{ + input.removeClass('changed'); + jQuery("span[id=err-" + input.attr('id') + "]").remove(); + } + input.removeClass('error'); + return unfreezeButtons +} + + +function setCurrentValues(form){ + jQuery(form).find('input[id^=current-value]').each(function () { + var currentValueInput = jQuery(this); + var name = currentValueInput.attr('id').split('-')[1]; + jQuery(form).find("[name=" + name + "]").each(function (){ + var input = jQuery(this); + if(input.attr('type')=='radio'){ + if(input.attr('checked')){ + log(input.attr('value')); + currentValueInput.attr('value', input.attr('value')); + } + }else{ + currentValueInput.attr('value', input.attr('value')); + } + }); + }); +} + + +function initEvents(){ + jQuery('form').each(function() { + var form = jQuery(this); + freezeFormButtons(form.attr('id')); + form.find('input[type=text]').keyup(function(){ + checkValues(form); + }); + form.find('input[type=radio]').change(function(){ + checkValues(form); + }); + form.find('select').change(function(){ + checkValues(form); + }); + }); +} + +$(document).ready(function() { + initEvents(); +}); + diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.tabs.js --- a/web/data/cubicweb.tabs.js Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.tabs.js Thu May 14 12:48:11 2009 +0200 @@ -1,6 +1,6 @@ function set_tab(tabname, cookiename) { // set appropriate cookie - async_remote_exec('set_cookie', cookiename, tabname); + asyncRemoteExec('set_cookie', cookiename, tabname); // trigger show + tabname event trigger_load(tabname); } diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/cubicweb.widgets.js --- a/web/data/cubicweb.widgets.js Tue May 05 17:18:49 2009 +0200 +++ b/web/data/cubicweb.widgets.js Thu May 14 12:48:11 2009 +0200 @@ -222,46 +222,46 @@ __init__ : function(wdgnode) { this.variables = getNodeAttribute(wdgnode, 'cubicweb:variables').split(','); - this.options = {'name' : wdgnode.getAttribute('cubicweb:inputname'), - 'id' : wdgnode.getAttribute('cubicweb:inputid'), + this.options = {'name' : wdgnode.getAttribute('cubicweb:inputid'), 'rows' : wdgnode.getAttribute('cubicweb:rows') || 40, 'cols' : wdgnode.getAttribute('cubicweb:cols') || 80 }; // this.variableRegexp = /%$(\w+)$s/; - this.parentnode = wdgnode; - }, - - show : function(parentnode) { - parentnode = parentnode || this.parentnode; - this.errorField = DIV({'class' : "textfieldErrors"}); + this.errorField = DIV({'class' : "errorMessage"}); this.textField = TEXTAREA(this.options); - connect(this.textField, 'onkeyup', this, this.highlightInvalidVariables); - appendChildNodes(parentnode, this.textField, this.errorField); - appendChildNodes(parentnode, this.textField); + jQuery(this.textField).bind('keyup', {'self': this}, this.highlightInvalidVariables); + jQuery('#substitutions').prepend(this.errorField); + jQuery('#substitutions .errorMessage').hide(); + wdgnode.appendChild(this.textField); }, /* signal callbacks */ - highlightInvalidVariables : function() { - var text = this.textField.value; + highlightInvalidVariables : function(event) { + var self = event.data.self; + var text = self.textField.value; var unknownVariables = []; - var it=0; + var it = 0; var group = null; var variableRegexp = /%$(\w+)$s/g; // emulates rgx.findAll() while ( group=variableRegexp.exec(text) ) { - if ( !this.variables.contains(group[1]) ) { + if ( !self.variables.contains(group[1]) ) { unknownVariables.push(group[1]); } it++; - if (it > 5) + if (it > 5) { break; + } } var errText = ''; if (unknownVariables.length) { errText = "Detected invalid variables : " + ", ".join(unknownVariables); + jQuery('#substitutions .errorMessage').show(); + } else { + jQuery('#substitutions .errorMessage').hide(); } - this.errorField.innerHTML = errText; + self.errorField.innerHTML = errText; } }); @@ -282,14 +282,14 @@ this.eid_to = name[1]; this.etype_to = wdgnode.getAttribute('cubicweb:etype_to'); this.etype_from = wdgnode.getAttribute('cubicweb:etype_from'); - var d = async_remote_exec('add_and_link_new_entity', this.etype_to, this.rel, this.eid_to, this.etype_from, 'new_val'); + var d = asyncRemoteExec('add_and_link_new_entity', this.etype_to, this.rel, this.eid_to, this.etype_from, 'new_val'); d.addCallback(function (eid) { - jQuery(wdgnode).find("option[selected]").removeAttr("selected"); - var new_option = OPTION({'value':eid, 'selected':'selected'}, value=new_val); - wdgnode.appendChild(new_option); + jQuery(wdgnode).find("option[selected]").removeAttr("selected"); + var new_option = OPTION({'value':eid, 'selected':'selected'}, value=new_val); + wdgnode.appendChild(new_option); }); d.addErrback(function (xxx) { - log('xxx =', xxx); + log('xxx =', xxx); }); }); } diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/external_resources --- a/web/data/external_resources Tue May 05 17:18:49 2009 +0200 +++ b/web/data/external_resources Thu May 14 12:48:11 2009 +0200 @@ -52,3 +52,4 @@ DOWNLOAD_ICON = DATADIR/download.gif UPLOAD_ICON = DATADIR/upload.gif GMARKER_ICON = DATADIR/gmap_blue_marker.png +UP_ICON = DATADIR/up.gif diff -r 49075f57cf2c -r aa09e20dd8c0 web/data/up.gif Binary file web/data/up.gif has changed diff -r 49075f57cf2c -r aa09e20dd8c0 web/facet.py --- a/web/facet.py Tue May 05 17:18:49 2009 +0200 +++ b/web/facet.py Thu May 14 12:48:11 2009 +0200 @@ -19,10 +19,8 @@ from rql import parse, nodes from cubicweb import Unauthorized, typed_eid -from cubicweb.common.selectors import match_context_prop, one_has_relation -from cubicweb.common.registerers import priority_registerer -from cubicweb.common.appobject import AppRsetObject -from cubicweb.common.utils import AcceptMixIn +from cubicweb.selectors import match_context_prop, partial_relation_possible +from cubicweb.appobject import AppRsetObject from cubicweb.web.htmlwidgets import HTMLWidget ## rqlst manipulation functions used by facets ################################ @@ -119,12 +117,17 @@ return None def _add_rtype_relation(rqlst, mainvar, rtype, role): + """add a relation relying `mainvar` to entities linked by the `rtype` + relation (where `mainvar` has `role`) + + return the inserted variable for linked entities. + """ newvar = rqlst.make_variable() if role == 'object': - rel = rqlst.add_relation(newvar, rtype, mainvar) + rqlst.add_relation(newvar, rtype, mainvar) else: - rel = rqlst.add_relation(mainvar, rtype, newvar) - return newvar, rel + rqlst.add_relation(mainvar, rtype, newvar) + return newvar def _prepare_vocabulary_rqlst(rqlst, mainvar, rtype, role): """prepare a syntax tree to generate a filter vocabulary rql using the given @@ -134,11 +137,11 @@ * add the new variable to GROUPBY clause if necessary * add the new variable to the selection """ - newvar, rel = _add_rtype_relation(rqlst, mainvar, rtype, role) + newvar = _add_rtype_relation(rqlst, mainvar, rtype, role) if rqlst.groupby: rqlst.add_group_var(newvar) rqlst.add_selected(newvar) - return newvar, rel + return newvar def _remove_relation(rqlst, rel, var): """remove a constraint relation from the syntax tree""" @@ -171,10 +174,10 @@ sortfuncname=None, sortasc=True): """modify a syntax tree to retrieve only relevant attribute `attr` of `var`""" _cleanup_rqlst(rqlst, mainvar) - var, mainrel = _prepare_vocabulary_rqlst(rqlst, mainvar, rtype, role) + var = _prepare_vocabulary_rqlst(rqlst, mainvar, rtype, role) # not found, create one attrvar = rqlst.make_variable() - attrrel = rqlst.add_relation(var, attrname, attrvar) + rqlst.add_relation(var, attrname, attrvar) # if query is grouped, we have to add the attribute variable if rqlst.groupby: if not attrvar in rqlst.groupby: @@ -234,8 +237,7 @@ ## base facet classes ######################################################### -class AbstractFacet(AcceptMixIn, AppRsetObject): - __registerer__ = priority_registerer +class AbstractFacet(AppRsetObject): __abstract__ = True __registry__ = 'facets' property_defs = { @@ -334,8 +336,8 @@ class RelationFacet(VocabularyFacet): - __selectors__ = (one_has_relation, match_context_prop) - # class attributes to configure the relation facet + __select__ = partial_relation_possible() & match_context_prop() + # class attributes to configure the rel ation facet rtype = None role = 'subject' target_attr = 'eid' @@ -411,7 +413,7 @@ if not value: return mainvar = self.filtered_variable - restrvar = _add_rtype_relation(self.rqlst, mainvar, self.rtype, self.role)[0] + restrvar = _add_rtype_relation(self.rqlst, mainvar, self.rtype, self.role) if isinstance(value, basestring): # only one value selected self.rqlst.add_eid_restriction(restrvar, value) @@ -425,7 +427,7 @@ # multiple values with AND operator self.rqlst.add_eid_restriction(restrvar, value.pop()) while value: - restrvar = _add_rtype_relation(self.rqlst, mainvar, self.rtype, self.role)[0] + restrvar = _add_rtype_relation(self.rqlst, mainvar, self.rtype, self.role) self.rqlst.add_eid_restriction(restrvar, value.pop()) @@ -443,7 +445,7 @@ try: mainvar = self.filtered_variable _cleanup_rqlst(rqlst, mainvar) - newvar, rel = _prepare_vocabulary_rqlst(rqlst, mainvar, self.rtype, self.role) + newvar = _prepare_vocabulary_rqlst(rqlst, mainvar, self.rtype, self.role) _set_orderby(rqlst, newvar, self.sortasc, self.sortfunc) try: rset = self.rqlexec(rqlst.as_string(), self.rset.args, self.rset.cachekey) @@ -521,7 +523,7 @@ if not self.facet.start_unfolded: cssclass += ' hidden' if len(self.items) > 6: - cssclass +=' overflowed' + cssclass += ' overflowed' self.w(u'

\n' % cssclass) for item in self.items: item.render(self.w) diff -r 49075f57cf2c -r aa09e20dd8c0 web/form.py --- a/web/form.py Tue May 05 17:18:49 2009 +0200 +++ b/web/form.py Thu May 14 12:48:11 2009 +0200 @@ -1,65 +1,35 @@ """abstract form classes for CubicWeb web client :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" -from simplejson import dumps +from warnings import warn -from logilab.mtconverter import html_escape +from logilab.common.compat import any +from logilab.common.decorators import iclassmethod -from cubicweb import typed_eid -from cubicweb.common.selectors import match_form_params -from cubicweb.common.registerers import accepts_registerer -from cubicweb.common.view import NOINDEX, NOFOLLOW, View, EntityView, AnyRsetView -from cubicweb.web import stdmsgs +from cubicweb.appobject import AppRsetObject +from cubicweb.selectors import yes, non_final_entity, match_kwargs, one_line_rset +from cubicweb.view import NOINDEX, NOFOLLOW +from cubicweb.common import tags +from cubicweb.web import INTERNAL_FIELD_VALUE, eid_param, stdmsgs from cubicweb.web.httpcache import NoHTTPCacheManager -from cubicweb.web.controller import redirect_params - +from cubicweb.web.controller import NAV_FORM_PARAMETERS +from cubicweb.web.formfields import (Field, StringField, RelationField, + HiddenInitialValueField) +from cubicweb.web import formrenderers +from cubicweb.web import formwidgets as fwdgs -def relation_id(eid, rtype, target, reid): - if target == 'subject': - return u'%s:%s:%s' % (eid, rtype, reid) - return u'%s:%s:%s' % (reid, rtype, eid) - - -class FormMixIn(object): - """abstract form mix-in""" +class FormViewMixIn(object): + """abstract form view mix-in""" category = 'form' controller = 'edit' - domid = 'entityForm' - http_cache_manager = NoHTTPCacheManager add_to_breadcrumbs = False - skip_relations = set() - - def __init__(self, req, rset): - super(FormMixIn, self).__init__(req, rset) - self.maxrelitems = self.req.property_value('navigation.related-limit') - self.maxcomboitems = self.req.property_value('navigation.combobox-limit') - self.force_display = not not req.form.get('__force_display') - # get validation session data which may have been previously set. - # deleting validation errors here breaks form reloading (errors are - # no more available), they have to be deleted by application's publish - # method on successful commit - formurl = req.url() - forminfo = req.get_session_data(formurl) - if forminfo: - req.data['formvalues'] = forminfo['values'] - req.data['formerrors'] = errex = forminfo['errors'] - req.data['displayederrors'] = set() - # if some validation error occured on entity creation, we have to - # get the original variable name from its attributed eid - foreid = errex.entity - for var, eid in forminfo['eidmap'].items(): - if foreid == eid: - errex.eid = var - break - else: - errex.eid = foreid - + def html_headers(self): """return a list of html headers (eg something to be inserted between and of the returned page @@ -67,18 +37,109 @@ by default forms are neither indexed nor followed """ return [NOINDEX, NOFOLLOW] - + def linkable(self): """override since forms are usually linked by an action, so we don't want them to be listed by appli.possible_views """ return False - @property - def limit(self): - if self.force_display: - return None - return self.maxrelitems + 1 + +# XXX should disappear +class FormMixIn(object): + """abstract form mix-in + XXX: you should inherit from this FIRST (obscure pb with super call) + """ + + def session_key(self): + """return the key that may be used to store / retreive data about a + previous post which failed because of a validation error + """ + return '%s#%s' % (self.req.url(), self.domid) + + def __init__(self, req, rset, **kwargs): + super(FormMixIn, self).__init__(req, rset, **kwargs) + self.restore_previous_post(self.session_key()) + + def restore_previous_post(self, sessionkey): + # get validation session data which may have been previously set. + # deleting validation errors here breaks form reloading (errors are + # no more available), they have to be deleted by application's publish + # method on successful commit + forminfo = self.req.get_session_data(sessionkey, pop=True) + if forminfo: + # XXX remove req.data assigment once cw.web.widget is killed + self.req.data['formvalues'] = self.form_previous_values = forminfo['values'] + self.req.data['formerrors'] = self.form_valerror = forminfo['errors'] + self.req.data['displayederrors'] = self.form_displayed_errors = set() + # if some validation error occured on entity creation, we have to + # get the original variable name from its attributed eid + foreid = self.form_valerror.entity + for var, eid in forminfo['eidmap'].items(): + if foreid == eid: + self.form_valerror.eid = var + break + else: + self.form_valerror.eid = foreid + else: + self.form_previous_values = {} + self.form_valerror = None + + # XXX deprecated with new form system. Should disappear + + domid = 'entityForm' + category = 'form' + controller = 'edit' + http_cache_manager = NoHTTPCacheManager + add_to_breadcrumbs = False + + def html_headers(self): + """return a list of html headers (eg something to be inserted between + and of the returned page + + by default forms are neither indexed nor followed + """ + return [NOINDEX, NOFOLLOW] + + def linkable(self): + """override since forms are usually linked by an action, + so we don't want them to be listed by appli.possible_views + """ + return False + + + def button(self, label, klass='validateButton', tabindex=None, **kwargs): + if tabindex is None: + tabindex = self.req.next_tabindex() + return tags.input(value=label, klass=klass, **kwargs) + + def action_button(self, label, onclick=None, __action=None, **kwargs): + if onclick is None: + onclick = "postForm('__action_%s', \'%s\', \'%s\')" % ( + __action, label, self.domid) + return self.button(label, onclick=onclick, **kwargs) + + def button_ok(self, label=None, type='submit', name='defaultsubmit', + **kwargs): + label = self.req._(label or stdmsgs.BUTTON_OK).capitalize() + return self.button(label, name=name, type=type, **kwargs) + + def button_apply(self, label=None, type='button', **kwargs): + label = self.req._(label or stdmsgs.BUTTON_APPLY).capitalize() + return self.action_button(label, __action='apply', type=type, **kwargs) + + def button_delete(self, label=None, type='button', **kwargs): + label = self.req._(label or stdmsgs.BUTTON_DELETE).capitalize() + return self.action_button(label, __action='delete', type=type, **kwargs) + + def button_cancel(self, label=None, type='button', **kwargs): + label = self.req._(label or stdmsgs.BUTTON_CANCEL).capitalize() + return self.action_button(label, __action='cancel', type=type, **kwargs) + + def button_reset(self, label=None, type='reset', name='__action_cancel', + **kwargs): + label = self.req._(label or stdmsgs.BUTTON_CANCEL).capitalize() + return self.button(label, type=type, **kwargs) def need_multipart(self, entity, categories=('primary', 'secondary')): """return a boolean indicating if form's enctype should be multipart @@ -102,16 +163,16 @@ This method should be called once inlined field errors has been consumed """ - errex = self.req.data.get('formerrors') + errex = self.req.data.get('formerrors') or self.form_valerror # get extra errors if errex is not None: errormsg = self.req._('please correct the following errors:') - displayed = self.req.data['displayederrors'] + displayed = self.req.data.get('displayederrors') or self.form_displayed_errors errors = sorted((field, err) for field, err in errex.errors.items() if not field in displayed) if errors: if len(errors) > 1: - templstr = '

\n' + templstr = '

\n' else: templstr = ' %s\n' for field, err in errors: @@ -123,131 +184,490 @@ errormsg = '

%s' % errormsg return u'

' % errormsg return u'' - - def restore_pending_inserts(self, entity, cell=False): - """used to restore edition page as it was before clicking on - 'search for ' - - """ - eid = entity.eid - cell = cell and "div_insert_" or "tr" - pending_inserts = set(self.req.get_pending_inserts(eid)) - for pendingid in pending_inserts: - eidfrom, rtype, eidto = pendingid.split(':') - if typed_eid(eidfrom) == entity.eid: # subject - label = display_name(self.req, rtype, 'subject') - reid = eidto + + +############################################################################### + +class metafieldsform(type): + """metaclass for FieldsForm to retrieve fields defined as class attributes + and put them into a single ordered list: '_fields_'. + """ + def __new__(mcs, name, bases, classdict): + allfields = [] + for base in bases: + if hasattr(base, '_fields_'): + allfields += base._fields_ + clsfields = (item for item in classdict.items() + if isinstance(item[1], Field)) + for fieldname, field in sorted(clsfields, key=lambda x: x[1].creation_rank): + if not field.name: + field.set_name(fieldname) + allfields.append(field) + classdict['_fields_'] = allfields + return super(metafieldsform, mcs).__new__(mcs, name, bases, classdict) + + +class FieldNotFound(Exception): + """raised by field_by_name when a field with the given name has not been + found + """ + +class FieldsForm(FormMixIn, AppRsetObject): + __metaclass__ = metafieldsform + __registry__ = 'forms' + __select__ = yes() + + renderer_cls = formrenderers.FormRenderer + is_subform = False + + # attributes overrideable through __init__ + internal_fields = ('__errorurl',) + NAV_FORM_PARAMETERS + needs_js = ('cubicweb.ajax.js', 'cubicweb.edition.js',) + needs_css = ('cubicweb.form.css',) + domid = 'form' + title = None + action = None + onsubmit = "return freezeFormButtons('%(domid)s');" + cssclass = None + cssstyle = None + cwtarget = None + redirect_path = None + set_error_url = True + copy_nav_params = False + form_buttons = None # form buttons (button widgets instances) + + def __init__(self, req, rset=None, row=None, col=None, submitmsg=None, + **kwargs): + super(FieldsForm, self).__init__(req, rset, row=row, col=col) + self.fields = list(self.__class__._fields_) + for key, val in kwargs.items(): + if key in NAV_FORM_PARAMETERS: + self.form_add_hidden(key, val) else: - label = display_name(self.req, rtype, 'object') - reid = eidfrom - jscall = "javascript: cancelPendingInsert('%s', '%s', null, %s);" \ - % (pendingid, cell, eid) - rset = self.req.eid_rset(reid) - eview = self.view('text', rset, row=0) - # XXX find a clean way to handle baskets - if rset.description[0][0] == 'Basket': - eview = '%s (%s)' % (eview, display_name(self.req, 'Basket')) - yield rtype, pendingid, jscall, label, reid, eview - - - def force_display_link(self): - return (u'' - u'[%s]' - u'' % self.req._('view all')) - - def relations_table(self, entity): - """yiels 3-tuples (rtype, target, related_list) - where itself a list of : - - node_id (will be the entity element's DOM id) - - appropriate javascript's togglePendingDelete() function call - - status 'pendingdelete' or '' - - oneline view of related entity + assert hasattr(self.__class__, key) and not key[0] == '_', key + setattr(self, key, val) + if self.set_error_url: + self.form_add_hidden('__errorurl', self.session_key()) + if self.copy_nav_params: + for param in NAV_FORM_PARAMETERS: + if not param in kwargs: + value = req.form.get(param) + if value: + self.form_add_hidden(param, value) + if submitmsg is not None: + self.form_add_hidden('__message', submitmsg) + self.context = None + if 'domid' in kwargs:# session key changed + self.restore_previous_post(self.session_key()) + + @iclassmethod + def field_by_name(cls_or_self, name, role='subject'): + """return field with the given name and role""" + if isinstance(cls_or_self, type): + fields = cls_or_self._fields_ + else: + fields = cls_or_self.fields + for field in fields: + if field.name == name and field.role == role: + return field + raise FieldNotFound(name) + + @iclassmethod + def remove_field(cls_or_self, field): + """remove a field from form class or instance""" + if isinstance(cls_or_self, type): + fields = cls_or_self._fields_ + else: + fields = cls_or_self.fields + fields.remove(field) + + @iclassmethod + def append_field(cls_or_self, field): + """append a field to form class or instance""" + if isinstance(cls_or_self, type): + fields = cls_or_self._fields_ + else: + fields = cls_or_self.fields + fields.append(field) + + @property + def form_needs_multipart(self): + """true if the form needs enctype=multipart/form-data""" + return any(field.needs_multipart for field in self.fields) + + def form_add_hidden(self, name, value=None, **kwargs): + """add an hidden field to the form""" + field = StringField(name=name, widget=fwdgs.HiddenInput, initial=value, + **kwargs) + if 'id' in kwargs: + # by default, hidden input don't set id attribute. If one is + # explicitly specified, ensure it will be set + field.widget.setdomid = True + self.append_field(field) + return field + + def add_media(self): + """adds media (CSS & JS) required by this widget""" + if self.needs_js: + self.req.add_js(self.needs_js) + if self.needs_css: + self.req.add_css(self.needs_css) + + def form_render(self, **values): + """render this form, using the renderer given in args or the default + FormRenderer() + """ + renderer = values.pop('renderer', self.renderer_cls()) + return renderer.render(self, values) + + def form_build_context(self, rendervalues=None): + """build form context values (the .context attribute which is a + dictionary with field instance as key associated to a dictionary + containing field 'name' (qualified), 'id', 'value' (for display, always + a string). + + rendervalues is an optional dictionary containing extra kwargs given to + form_render() """ - eid = entity.eid - pending_deletes = self.req.get_pending_deletes(eid) - # XXX (adim) : quick fix to get Folder relations - for label, rschema, target in entity.srelations_by_category(('generic', 'metadata'), 'add'): - if rschema in self.skip_relations: - continue - relatedrset = entity.related(rschema, target, limit=self.limit) - toggable_rel_link = self.toggable_relation_link_func(rschema) - related = [] - for row in xrange(relatedrset.rowcount): - nodeid = relation_id(eid, rschema, target, relatedrset[row][0]) - if nodeid in pending_deletes: - status = u'pendingDelete' - label = '+' - else: - status = u'' - label = 'x' - dellink = toggable_rel_link(eid, nodeid, label) - eview = self.view('oneline', relatedrset, row=row) - related.append((nodeid, dellink, status, eview)) - yield (rschema, target, related) - - def toggable_relation_link_func(self, rschema): - if not rschema.has_perm(self.req, 'delete'): - return lambda x, y, z: u'' - return toggable_relation_link + self.context = context = {} + # ensure rendervalues is a dict + if rendervalues is None: + rendervalues = {} + for field in self.fields: + for field in field.actual_fields(self): + field.form_init(self) + value = self.form_field_display_value(field, rendervalues) + context[field] = {'value': value, + 'name': self.form_field_name(field), + 'id': self.form_field_id(field), + } + + def form_field_display_value(self, field, rendervalues, load_bytes=False): + """return field's *string* value to use for display + + looks in + 1. previously submitted form values if any (eg on validation error) + 2. req.form + 3. extra kw args given to render_form + 4. field's typed value + + values found in 1. and 2. are expected te be already some 'display' + value while those found in 3. and 4. are expected to be correctly typed. + """ + value = self._req_display_value(field) + if value is None: + if field.name in rendervalues: + value = rendervalues[field.name] + else: + value = self.form_field_value(field, load_bytes) + if callable(value): + value = value(self) + if value != INTERNAL_FIELD_VALUE: + value = field.format_value(self.req, value) + return value + + def _req_display_value(self, field): + qname = self.form_field_name(field) + if qname in self.form_previous_values: + return self.form_previous_values[qname] + if qname in self.req.form: + return self.req.form[qname] + return None + + def form_field_value(self, field, load_bytes=False): + """return field's *typed* value""" + value = field.initial + if callable(value): + value = value(self) + return value + + def form_field_error(self, field): + """return validation error for widget's field, if any""" + if self._field_has_error(field): + self.form_displayed_errors.add(field.name) + return u'%s' % self.form_valerror.errors[field.name] + return u'' + + def form_field_format(self, field): + """return MIME type used for the given (text or bytes) field""" + return self.req.property_value('ui.default-text-format') + + def form_field_encoding(self, field): + """return encoding used for the given (text) field""" + return self.req.encoding + + def form_field_name(self, field): + """return qualified name for the given field""" + return field.name + + def form_field_id(self, field): + """return dom id for the given field""" + return field.id + + def form_field_vocabulary(self, field, limit=None): + """return vocabulary for the given field. Should be overriden in + specific forms using fields which requires some vocabulary + """ + raise NotImplementedError + + def _field_has_error(self, field): + """return true if the field has some error in given validation exception + """ + return self.form_valerror and field.name in self.form_valerror.errors - def redirect_url(self, entity=None): - """return a url to use as next direction if there are some information - specified in current form params, else return the result the reset_url - method which should be defined in concrete classes +class EntityFieldsForm(FieldsForm): + __select__ = (match_kwargs('entity') | (one_line_rset & non_final_entity())) + + internal_fields = FieldsForm.internal_fields + ('__type', 'eid', '__maineid') + domid = 'entityForm' + + def __init__(self, *args, **kwargs): + self.edited_entity = kwargs.pop('entity', None) + msg = kwargs.pop('submitmsg', None) + super(EntityFieldsForm, self).__init__(*args, **kwargs) + if self.edited_entity is None: + self.edited_entity = self.complete_entity(self.row or 0, self.col or 0) + self.form_add_hidden('__type', eidparam=True) + self.form_add_hidden('eid') + if msg is not None: + # If we need to directly attach the new object to another one + for linkto in self.req.list_form_param('__linkto'): + self.form_add_hidden('__linkto', linkto) + msg = '%s %s' % (msg, self.req._('and linked')) + self.form_add_hidden('__message', msg) + # in case of direct instanciation + self.schema = self.edited_entity.schema + self.vreg = self.edited_entity.vreg + + def _field_has_error(self, field): + """return true if the field has some error in given validation exception + """ + return super(EntityFieldsForm, self)._field_has_error(field) \ + and self.form_valerror.eid == self.edited_entity.eid + + def _relation_vocabulary(self, rtype, targettype, role, + limit=None, done=None): + """return unrelated entities for a given relation and target entity type + for use in vocabulary """ - rparams = redirect_params(self.req.form) - if rparams: - return self.build_url('view', **rparams) - return self.reset_url(entity) + if done is None: + done = set() + rset = self.edited_entity.unrelated(rtype, targettype, role, limit) + res = [] + for entity in rset.entities(): + if entity.eid in done: + continue + done.add(entity.eid) + res.append((entity.view('combobox'), entity.eid)) + return res + + def _req_display_value(self, field): + value = super(EntityFieldsForm, self)._req_display_value(field) + if value is None: + value = self.edited_entity.linked_to(field.name, field.role) or None + return value - def reset_url(self, entity): - raise NotImplementedError('implement me in concrete classes') + def _form_field_default_value(self, field, load_bytes): + defaultattr = 'default_%s' % field.name + if hasattr(self.edited_entity, defaultattr): + # XXX bw compat, default_ on the entity + warn('found %s on %s, should be set on a specific form' + % (defaultattr, self.edited_entity.id), DeprecationWarning) + value = getattr(self.edited_entity, defaultattr) + if callable(value): + value = value() + else: + value = super(EntityFieldsForm, self).form_field_value(field, + load_bytes) + return value + + def form_build_context(self, values=None): + """overriden to add edit[s|o] hidden fields and to ensure schema fields + have eidparam set to True - BUTTON_STR = u'' - ACTION_SUBMIT_STR = u'' + edit[s|o] hidden fields are used to indicate the value for the + associated field before the (potential) modification made when + submitting the form. + """ + eschema = self.edited_entity.e_schema + for field in self.fields[:]: + for field in field.actual_fields(self): + fieldname = field.name + if fieldname != 'eid' and ( + (eschema.has_subject_relation(fieldname) or + eschema.has_object_relation(fieldname))): + field.eidparam = True + self.fields.append(HiddenInitialValueField(field)) + return super(EntityFieldsForm, self).form_build_context(values) + + def form_field_value(self, field, load_bytes=False): + """return field's *typed* value - def button_ok(self, label=None, tabindex=None): - label = self.req._(label or stdmsgs.BUTTON_OK).capitalize() - return self.BUTTON_STR % ('defaultsubmit', label, tabindex or 2) - - def button_apply(self, label=None, tabindex=None): - label = self.req._(label or stdmsgs.BUTTON_APPLY).capitalize() - return self.ACTION_SUBMIT_STR % ('__action_apply', label, self.domid, label, tabindex or 3) + overriden to deal with + * special eid / __type / edits- / edito- fields + * lookup for values on edited entities + """ + attr = field.name + entity = self.edited_entity + if attr == 'eid': + return entity.eid + if not field.eidparam: + return super(EntityFieldsForm, self).form_field_value(field, load_bytes) + if attr.startswith('edits-') or attr.startswith('edito-'): + # edit[s|o]- fieds must have the actual value stored on the entity + assert hasattr(field, 'visible_field') + vfield = field.visible_field + assert vfield.eidparam + if entity.has_eid(): + return self.form_field_value(vfield) + return INTERNAL_FIELD_VALUE + if attr == '__type': + return entity.id + if self.schema.rschema(attr).is_final(): + attrtype = entity.e_schema.destination(attr) + if attrtype == 'Password': + return entity.has_eid() and INTERNAL_FIELD_VALUE or '' + if attrtype == 'Bytes': + if entity.has_eid(): + if load_bytes: + return getattr(entity, attr) + # XXX value should reflect if some file is already attached + return True + return False + if entity.has_eid() or attr in entity: + value = getattr(entity, attr) + else: + value = self._form_field_default_value(field, load_bytes) + return value + # non final relation field + if entity.has_eid() or entity.relation_cached(attr, field.role): + value = [r[0] for r in entity.related(attr, field.role)] + else: + value = self._form_field_default_value(field, load_bytes) + return value + + def form_field_format(self, field): + """return MIME type used for the given (text or bytes) field""" + entity = self.edited_entity + if field.eidparam and entity.e_schema.has_metadata(field.name, 'format') and ( + entity.has_eid() or '%s_format' % field.name in entity): + return self.edited_entity.attr_metadata(field.name, 'format') + return self.req.property_value('ui.default-text-format') + + def form_field_encoding(self, field): + """return encoding used for the given (text) field""" + entity = self.edited_entity + if field.eidparam and entity.e_schema.has_metadata(field.name, 'encoding') and ( + entity.has_eid() or '%s_encoding' % field.name in entity): + return self.edited_entity.attr_metadata(field.name, 'encoding') + return super(EntityFieldsForm, self).form_field_encoding(field) + + def form_field_name(self, field): + """return qualified name for the given field""" + if field.eidparam: + return eid_param(field.name, self.edited_entity.eid) + return field.name + + def form_field_id(self, field): + """return dom id for the given field""" + if field.eidparam: + return eid_param(field.id, self.edited_entity.eid) + return field.id - def button_delete(self, label=None, tabindex=None): - label = self.req._(label or stdmsgs.BUTTON_DELETE).capitalize() - return self.ACTION_SUBMIT_STR % ('__action_delete', label, self.domid, label, tabindex or 3) - - def button_cancel(self, label=None, tabindex=None): - label = self.req._(label or stdmsgs.BUTTON_CANCEL).capitalize() - return self.ACTION_SUBMIT_STR % ('__action_cancel', label, self.domid, label, tabindex or 4) - - def button_reset(self, label=None, tabindex=None): - label = self.req._(label or stdmsgs.BUTTON_CANCEL).capitalize() - return u'' % ( - label, tabindex or 4) - -def toggable_relation_link(eid, nodeid, label='x'): - js = u"javascript: togglePendingDelete('%s', %s);" % (nodeid, html_escape(dumps(eid))) - return u'[%s]' % (js, nodeid, label) + def form_field_vocabulary(self, field, limit=None): + """return vocabulary for the given field""" + role, rtype = field.role, field.name + method = '%s_%s_vocabulary' % (role, rtype) + try: + vocabfunc = getattr(self, method) + except AttributeError: + try: + # XXX bw compat, __vocabulary on the entity + vocabfunc = getattr(self.edited_entity, method) + except AttributeError: + vocabfunc = getattr(self, '%s_relation_vocabulary' % role) + else: + warn('found %s on %s, should be set on a specific form' + % (method, self.edited_entity.id), DeprecationWarning) + # NOTE: it is the responsibility of `vocabfunc` to sort the result + # (direclty through RQL or via a python sort). This is also + # important because `vocabfunc` might return a list with + # couples (label, None) which act as separators. In these + # cases, it doesn't make sense to sort results afterwards. + return vocabfunc(rtype, limit) + + def subject_relation_vocabulary(self, rtype, limit=None): + """defaut vocabulary method for the given relation, looking for + relation's object entities (i.e. self is the subject) + """ + entity = self.edited_entity + if isinstance(rtype, basestring): + rtype = entity.schema.rschema(rtype) + done = None + assert not rtype.is_final(), rtype + if entity.has_eid(): + done = set(e.eid for e in getattr(entity, str(rtype))) + result = [] + rsetsize = None + for objtype in rtype.objects(entity.e_schema): + if limit is not None: + rsetsize = limit - len(result) + result += self._relation_vocabulary(rtype, objtype, 'subject', + rsetsize, done) + if limit is not None and len(result) >= limit: + break + return result + + def object_relation_vocabulary(self, rtype, limit=None): + """defaut vocabulary method for the given relation, looking for + relation's subject entities (i.e. self is the object) + """ + entity = self.edited_entity + if isinstance(rtype, basestring): + rtype = entity.schema.rschema(rtype) + done = None + if entity.has_eid(): + done = set(e.eid for e in getattr(entity, 'reverse_%s' % rtype)) + result = [] + rsetsize = None + for subjtype in rtype.subjects(entity.e_schema): + if limit is not None: + rsetsize = limit - len(result) + result += self._relation_vocabulary(rtype, subjtype, 'object', + rsetsize, done) + if limit is not None and len(result) >= limit: + break + return result + + def subject_in_state_vocabulary(self, rtype, limit=None): + """vocabulary method for the in_state relation, looking for relation's + object entities (i.e. self is the subject) according to initial_state, + state_of and next_state relation + """ + entity = self.edited_entity + if not entity.has_eid() or not entity.in_state: + # get the initial state + rql = 'Any S where S state_of ET, ET name %(etype)s, ET initial_state S' + rset = self.req.execute(rql, {'etype': str(entity.e_schema)}) + if rset: + return [(rset.get_entity(0, 0).view('combobox'), rset[0][0])] + return [] + results = [] + for tr in entity.in_state[0].transitions(entity): + state = tr.destination_state[0] + results.append((state.view('combobox'), state.eid)) + return sorted(results) -class Form(FormMixIn, View): - """base class for forms. Apply by default according to request form - parameters specified using the `form_params` class attribute which - should list necessary parameters in the form to be accepted. - """ - __registerer__ = accepts_registerer - __select__ = classmethod(match_form_params) +class CompositeForm(FieldsForm): + """form composed for sub-forms""" - form_params = () + def __init__(self, *args, **kwargs): + super(CompositeForm, self).__init__(*args, **kwargs) + self.forms = [] -class EntityForm(FormMixIn, EntityView): - """base class for forms applying on an entity (i.e. uniform result set) - """ - -class AnyRsetForm(FormMixIn, AnyRsetView): - """base class for forms applying on any empty result sets - """ - + def form_add_subform(self, subform): + """mark given form as a subform and append it""" + subform.is_subform = True + self.forms.append(subform) diff -r 49075f57cf2c -r aa09e20dd8c0 web/formfields.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/formfields.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,502 @@ +"""field classes for form construction + +:organization: Logilab +:copyright: 2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from datetime import datetime + +from logilab.mtconverter import html_escape +from yams.constraints import SizeConstraint, StaticVocabularyConstraint + +from cubicweb.schema import FormatConstraint +from cubicweb.utils import ustrftime +from cubicweb.common import tags, uilib +from cubicweb.web import INTERNAL_FIELD_VALUE +from cubicweb.web.formwidgets import ( + HiddenInput, TextInput, FileInput, PasswordInput, TextArea, FCKEditor, + Radio, Select, DateTimePicker) + +class Field(object): + """field class is introduced to control what's displayed in forms. It makes + the link between something to edit and its display in the form. Actual + display is handled by a widget associated to the field. + + Attributes + ---------- + all the attributes described below have sensible default value which may be + overriden by value given to field's constructor. + + :name: + name of the field (basestring), should be unique in a form. + :id: + dom identifier (default to the same value as `name`), should be unique in + a form. + :label: + label of the field (default to the same value as `name`). + :help: + help message about this field. + :widget: + widget associated to the field. Each field class has a default widget + class which may be overriden per instance. + :required: + bool flag telling if the field is required or not. + :initial: + initial value, used when no value specified by other means. + :choices: + static vocabulary for this field. May be a list of values or a list of + (label, value) tuples if specified. + :sort: + bool flag telling if the vocabulary (either static vocabulary specified + in `choices` or dynamic vocabulary fetched from the form) should be + sorted on label. + :internationalizable: + bool flag telling if the vocabulary labels should be translated using the + current request language. + :eidparam: + bool flag telling if this field is linked to a specific entity + :role: + when the field is linked to an entity attribute or relation, tells the + role of the entity in the relation (eg 'subject' or 'object') + + """ + # default widget associated to this class of fields. May be overriden per + # instance + widget = TextInput + # does this field requires a multipart form + needs_multipart = False + # class attribute used for ordering of fields in a form + __creation_rank = 0 + + def __init__(self, name=None, id=None, label=None, help=None, + widget=None, required=False, initial=None, + choices=None, sort=True, internationalizable=False, + eidparam=False, role='subject'): + self.name = name + self.id = id or name + self.label = label or name + self.help = help + self.required = required + if widget is not None: + self.widget = widget + if isinstance(self.widget, type): + self.widget = self.widget() + self.initial = initial + self.choices = choices + self.sort = sort + self.internationalizable = internationalizable + self.eidparam = eidparam + self.role = role + # ordering number for this field instance + self.creation_rank = Field.__creation_rank + Field.__creation_rank += 1 + + def __unicode__(self): + return u'<%s name=%r label=%r id=%r initial=%r visible=%r @%x>' % ( + self.__class__.__name__, self.name, self.label, + self.id, self.initial, self.is_visible(), id(self)) + + def __repr__(self): + return self.__unicode__().encode('utf-8') + + def set_name(self, name): + """automatically set .id and .label when name is set""" + assert name + self.name = name + if not self.id: + self.id = name + if not self.label: + self.label = name + + def is_visible(self): + """return true if the field is not an hidden field""" + return not isinstance(self.widget, HiddenInput) + + def actual_fields(self, form): + """return actual fields composing this field in case of a compound + field, usually simply return self + """ + yield self + + def format_value(self, req, value): + """return value suitable for display where value may be a list or tuple + of values + """ + if isinstance(value, (list, tuple)): + return [self.format_single_value(req, val) for val in value] + return self.format_single_value(req, value) + + def format_single_value(self, req, value): + """return value suitable for display""" + if value is None or value is False: + return u'' + if value is True: + return u'1' + return unicode(value) + + def get_widget(self, form): + """return the widget instance associated to this field""" + return self.widget + + def example_format(self, req): + """return a sample string describing what can be given as input for this + field + """ + return u'' + + def render(self, form, renderer): + """render this field, which is part of form, using the given form + renderer + """ + return self.get_widget(form).render(form, self) + + def vocabulary(self, form): + """return vocabulary for this field. This method will be called by + widgets which desire it.""" + if self.choices is not None: + if callable(self.choices): + vocab = self.choices(req=form.req) + else: + vocab = self.choices + if vocab and not isinstance(vocab[0], (list, tuple)): + vocab = [(x, x) for x in vocab] + else: + vocab = form.form_field_vocabulary(self) + if self.internationalizable: + vocab = [(form.req._(label), value) for label, value in vocab] + if self.sort: + vocab = sorted(vocab) + return vocab + + def form_init(self, form): + """method called before by form_build_context to trigger potential field + initialization requiring the form instance + """ + pass + +class StringField(Field): + def __init__(self, max_length=None, **kwargs): + super(StringField, self).__init__(**kwargs) + self.max_length = max_length + if isinstance(self.widget, TextArea): + self.init_text_area(self.widget) + + def init_text_area(self, widget): + if self.max_length < 513: + widget.attrs.setdefault('cols', 60) + widget.attrs.setdefault('rows', 5) + + +class RichTextField(StringField): + widget = None + def __init__(self, format_field=None, **kwargs): + super(RichTextField, self).__init__(**kwargs) + self.format_field = format_field + + def get_widget(self, form): + if self.widget is None: + if self.use_fckeditor(form): + return FCKEditor() + widget = TextArea() + self.init_text_area(widget) + return widget + return self.widget + + def get_format_field(self, form): + if self.format_field: + return self.format_field + # we have to cache generated field since it's use as key in the + # context dictionnary + req = form.req + try: + return req.data[self] + except KeyError: + if self.use_fckeditor(form): + # if fckeditor is used and format field isn't explicitly + # deactivated, we want an hidden field for the format + widget = HiddenInput() + choices = None + else: + # else we want a format selector + # XXX compute vocabulary + widget = Select() + fcstr = FormatConstraint() + choices = [(req._(fmt), fmt) for fmt in fcstr.vocabulary(req=req)] + widget.attrs['size'] = 1 + field = StringField(name=self.name + '_format', widget=widget, + choices=choices) + req.data[self] = field + return field + + def actual_fields(self, form): + yield self + format_field = self.get_format_field(form) + if format_field: + yield format_field + + def use_fckeditor(self, form): + """return True if fckeditor should be used to edit entity's attribute named + `attr`, according to user preferences + """ + if form.req.use_fckeditor(): + return form.form_field_format(self) == 'text/html' + return False + + def render(self, form, renderer): + format_field = self.get_format_field(form) + if format_field: + # XXX we want both fields to remain vertically aligned + format_field.widget.attrs['style'] = 'display: block' + result = format_field.render(form, renderer) + else: + result = u'' + return result + self.get_widget(form).render(form, self) + + +class FileField(StringField): + widget = FileInput + needs_multipart = True + + def __init__(self, format_field=None, encoding_field=None, **kwargs): + super(FileField, self).__init__(**kwargs) + self.format_field = format_field + self.encoding_field = encoding_field + + def actual_fields(self, form): + yield self + if self.format_field: + yield self.format_field + if self.encoding_field: + yield self.encoding_field + + def render(self, form, renderer): + wdgs = [self.get_widget(form).render(form, self)] + if self.format_field or self.encoding_field: + divid = '%s-advanced' % form.context[self]['name'] + wdgs.append(u'

' % + (html_escape(uilib.toggle_action(divid)), + form.req._('show advanced fields'), + html_escape(form.req.build_url('data/puce_down.png')), + form.req._('show advanced fields'))) + wdgs.append(u'') + if not self.required and form.context[self]['value']: + # trick to be able to delete an uploaded file + wdgs.append(u'
') + wdgs.append(tags.input(name=u'%s__detach' % form.context[self]['name'], + type=u'checkbox')) + wdgs.append(form.req._('detach attached file')) + return u'\n'.join(wdgs) + + def render_subfield(self, form, field, renderer): + return (renderer.render_label(form, field) + + field.render(form, renderer) + + renderer.render_help(form, field) + + u'
') + + +class EditableFileField(FileField): + editable_formats = ('text/plain', 'text/html', 'text/rest') + + def render(self, form, renderer): + wdgs = [super(EditableFileField, self).render(form, renderer)] + if form.form_field_format(self) in self.editable_formats: + data = form.form_field_value(self, load_bytes=True) + if data: + encoding = form.form_field_encoding(self) + try: + form.context[self]['value'] = unicode(data.getvalue(), encoding) + except UnicodeError: + pass + else: + if not self.required: + msg = form.req._( + 'You can either submit a new file using the browse button above' + ', or choose to remove already uploaded file by checking the ' + '"detach attached file" check-box, or edit file content online ' + 'with the widget below.') + else: + msg = form.req._( + 'You can either submit a new file using the browse button above' + ', or edit file content online with the widget below.') + wdgs.append(u'

' % msg) + wdgs.append(TextArea(setdomid=False).render(form, self)) + # XXX restore form context? + return '\n'.join(wdgs) + + +class IntField(Field): + def __init__(self, min=None, max=None, **kwargs): + super(IntField, self).__init__(**kwargs) + self.min = min + self.max = max + if isinstance(self.widget, TextInput): + self.widget.attrs.setdefault('size', 5) + self.widget.attrs.setdefault('maxlength', 15) + +class BooleanField(Field): + widget = Radio + + def vocabulary(self, form): + if self.choices: + return self.choices + return [(form.req._('yes'), '1'), (form.req._('no'), '')] + + +class FloatField(IntField): + def format_single_value(self, req, value): + formatstr = req.property_value('ui.float-format') + if value is None: + return u'' + return formatstr % float(value) + + def render_example(self, req): + return self.format_value(req, 1.234) + + +class DateField(StringField): + format_prop = 'ui.date-format' + widget = DateTimePicker + + def format_single_value(self, req, value): + return value and ustrftime(value, req.property_value(self.format_prop)) or u'' + + def render_example(self, req): + return self.format_value(req, datetime.now()) + + +class DateTimeField(DateField): + format_prop = 'ui.datetime-format' + + +class TimeField(DateField): + format_prop = 'ui.datetime-format' + widget = TextInput + +class HiddenInitialValueField(Field): + def __init__(self, visible_field): + name = 'edit%s-%s' % (visible_field.role[0], visible_field.name) + super(HiddenInitialValueField, self).__init__( + name=name, widget=HiddenInput, eidparam=True) + self.visible_field = visible_field + + +class RelationField(Field): + def __init__(self, **kwargs): + kwargs.setdefault('sort', False) + super(RelationField, self).__init__(**kwargs) + + @staticmethod + def fromcardinality(card, **kwargs): + kwargs.setdefault('widget', Select(multiple=card in '*+')) + return RelationField(**kwargs) + + def vocabulary(self, form): + entity = form.edited_entity + req = entity.req + # first see if its specified by __linkto form parameters + linkedto = entity.linked_to(self.name, self.role) + if linkedto: + entities = (req.eid_rset(eid).get_entity(0, 0) for eid in linkedto) + return [(entity.view('combobox'), entity.eid) for entity in entities] + # it isn't, check if the entity provides a method to get correct values + res = [] + if not self.required: + res.append(('', INTERNAL_FIELD_VALUE)) + # vocabulary doesn't include current values, add them + if entity.has_eid(): + rset = entity.related(self.name, self.role) + relatedvocab = [(e.view('combobox'), e.eid) for e in rset.entities()] + else: + relatedvocab = [] + vocab = res + form.form_field_vocabulary(self) + relatedvocab + if self.sort: + vocab = sorted(vocab) + return vocab + + def format_single_value(self, req, value): + return value + + +def guess_field(eschema, rschema, role='subject', skip_meta_attr=True, **kwargs): + """return the most adapated widget to edit the relation + 'subjschema rschema objschema' according to information found in the schema + """ + fieldclass = None + if role == 'subject': + targetschema = rschema.objects(eschema)[0] + card = rschema.rproperty(eschema, targetschema, 'cardinality')[0] + help = rschema.rproperty(eschema, targetschema, 'description') + if rschema.is_final(): + if rschema.rproperty(eschema, targetschema, 'internationalizable'): + kwargs['internationalizable'] = True + def get_default(form, es=eschema, rs=rschema): + return es.default(rs) + kwargs['initial'] = get_default + else: + targetschema = rschema.subjects(eschema)[0] + card = rschema.rproperty(targetschema, eschema, 'cardinality')[1] + help = rschema.rproperty(targetschema, eschema, 'description') + kwargs['required'] = card in '1+' + kwargs['name'] = rschema.type + kwargs['help'] = help + if rschema.is_final(): + if skip_meta_attr and rschema in eschema.meta_attributes(): + return None + fieldclass = FIELDS[targetschema] + if fieldclass is StringField: + if targetschema == 'Password': + # special case for Password field: specific PasswordInput widget + kwargs.setdefault('widget', PasswordInput()) + return StringField(**kwargs) + if eschema.has_metadata(rschema, 'format'): + # use RichTextField instead of StringField if the attribute has + # a "format" metadata. But getting information from constraints + # may be useful anyway... + constraints = rschema.rproperty(eschema, targetschema, 'constraints') + for cstr in constraints: + if isinstance(cstr, StaticVocabularyConstraint): + raise Exception('rich text field with static vocabulary') + return RichTextField(**kwargs) + constraints = rschema.rproperty(eschema, targetschema, 'constraints') + # init StringField parameters according to constraints + for cstr in constraints: + if isinstance(cstr, StaticVocabularyConstraint): + kwargs.setdefault('widget', Select()) + kwargs.setdefault('choices', cstr.vocabulary) + if card in '?1': + kwargs['widget'].attrs.setdefault('size', 1) + if isinstance(cstr, SizeConstraint) and cstr.max is not None: + if cstr.max < 257: + kwargs.setdefault('widget', TextInput()) + kwargs['max_length'] = cstr.max + kwargs.setdefault('widget', TextArea()) + return StringField(**kwargs) + if fieldclass is FileField: + for metadata in ('format', 'encoding'): + metaschema = eschema.has_metadata(rschema, metadata) + if metaschema is not None: + kwargs['%s_field' % metadata] = guess_field(eschema, metaschema, + skip_meta_attr=False) + return fieldclass(**kwargs) + kwargs['role'] = role + return RelationField.fromcardinality(card, **kwargs) + +FIELDS = { + 'Boolean': BooleanField, + 'Bytes': FileField, + 'Date': DateField, + 'Datetime': DateTimeField, + 'Int': IntField, + 'Float': FloatField, + 'Decimal': StringField, + 'Password': StringField, + 'String' : StringField, + 'Time': TimeField, + } diff -r 49075f57cf2c -r aa09e20dd8c0 web/formrenderers.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/formrenderers.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,474 @@ +"""form renderers, responsible to layout a form to html + +:organization: Logilab +:copyright: 2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from logilab.common import dictattr +from logilab.mtconverter import html_escape + +from simplejson import dumps + +from cubicweb.common import tags +from cubicweb.web import eid_param +from cubicweb.web import formwidgets as fwdgs +from cubicweb.web.widgets import checkbox +from cubicweb.web.formfields import HiddenInitialValueField + + +class FormRenderer(object): + """basic renderer displaying fields in a two columns table label | value + + +--------------+--------------+ + | field1 label | field1 input | + +--------------+--------------+ + | field1 label | field2 input | + +--------------+--------------+ + +---------+ + | buttons | + +---------+ + """ + _options = ('display_fields', 'display_label', 'display_help', + 'display_progress_div', 'table_class', 'button_bar_class') + display_fields = None # None -> all fields + display_label = True + display_help = True + display_progress_div = True + table_class = u'attributeForm' + button_bar_class = u'formButtonBar' + + def __init__(self, **kwargs): + if self._set_options(kwargs): + raise ValueError('unconsumed arguments %s' % kwargs) + + def _set_options(self, kwargs): + for key in self._options: + try: + setattr(self, key, kwargs.pop(key)) + except KeyError: + continue + return kwargs + + # renderer interface ###################################################### + + def render(self, form, values): + self._set_options(values) + form.add_media() + data = [] + w = data.append + w(self.open_form(form, values)) + if self.display_progress_div: + w(u'

' % form.req._('validating...')) + w(u'

') + w(tags.input(type=u'hidden', name=u'__form_id', + value=values.get('formvid', form.id))) + if form.redirect_path: + w(tags.input(type='hidden', name='__redirectpath', value=form.redirect_path)) + self.render_fields(w, form, values) + self.render_buttons(w, form) + w(u'

') + w(u'') + errormsg = self.error_message(form) + if errormsg: + data.insert(0, errormsg) + return '\n'.join(data) + + def render_label(self, form, field): + label = form.req._(field.label) + attrs = {'for': form.context[field]['id']} + if field.required: + attrs['class'] = 'required' + return tags.label(label, **attrs) + + def render_help(self, form, field): + help = [ u'
' ] + descr = field.help + if descr: + help.append('%s' % form.req._(descr)) + example = field.example_format(form.req) + if example: + help.append('(%s: %s)' + % (form.req._('sample format'), example)) + return u' '.join(help) + + # specific methods (mostly to ease overriding) ############################# + + def error_message(self, form): + """return formatted error message + + This method should be called once inlined field errors has been consumed + """ + req = form.req + errex = form.form_valerror + # get extra errors + if errex is not None: + errormsg = req._('please correct the following errors:') + displayed = form.form_displayed_errors + errors = sorted((field, err) for field, err in errex.errors.items() + if not field in displayed) + if errors: + if len(errors) > 1: + templstr = '

\n' + else: + templstr = ' %s\n' + for field, err in errors: + if field is None: + errormsg += templstr % err + else: + errormsg += templstr % '%s: %s' % (req._(field), err) + if len(errors) > 1: + errormsg = '

%s' % errormsg + return u'

' % errormsg + return u'' + + def open_form(self, form, values): + if form.form_needs_multipart: + enctype = 'multipart/form-data' + else: + enctype = 'application/x-www-form-urlencoded' + if form.action is None: + action = form.req.build_url('edit') + else: + action = form.action + tag = ('

' + + def display_field(self, form, field): + if isinstance(field, HiddenInitialValueField): + field = field.visible_field + return (self.display_fields is None + or field.name in form.internal_fields + or (field.name, field.role) in self.display_fields + or (field.name, field.role) in form.internal_fields) + + def render_fields(self, w, form, values): + form.form_build_context(values) + fields = self._render_hidden_fields(w, form) + if fields: + self._render_fields(fields, w, form) + self.render_child_forms(w, form, values) + + def render_child_forms(self, w, form, values): + # render + for childform in getattr(form, 'forms', []): + self.render_fields(w, childform, values) + + def _render_hidden_fields(self, w, form): + fields = form.fields[:] + for field in form.fields: + if not self.display_field(form, field): + fields.remove(field) + elif not field.is_visible(): + w(field.render(form, self)) + fields.remove(field) + return fields + + def _render_fields(self, fields, w, form): + w(u'' % self.table_class) + for field in fields: + w(u'') + if self.display_label: + w(u'' % self.render_label(form, field)) + error = form.form_field_error(field) + if error: + w(u'') + w(u'

%s	') + w(error) + else: + w(u'	') + w(field.render(form, self)) + if self.display_help: + w(self.render_help(form, field)) + w(u'

') + + def render_buttons(self, w, form): + w(u'\n\n' % self.button_bar_class) + for button in form.form_buttons: + w(u'\n' % button.render(form)) + w(u'

') + + +class HTableFormRenderer(FormRenderer): + """display fields horizontally in a table + + +--------------+--------------+---------+ + | field1 label | field2 label | | + +--------------+--------------+---------+ + | field1 input | field2 input | buttons + +--------------+--------------+---------+ + """ + display_help = False + def _render_fields(self, fields, w, form): + w(u'') + w(u'') + for field in fields: + if self.display_label: + w(u'' % self.render_label(form, field)) + if self.display_help: + w(self.render_help(form, field)) + # empty slot for buttons + w(u'') + w(u'') + w(u'') + for field in fields: + error = form.form_field_error(field) + if error: + w(u'') + w(u'') + w(u'') + w(u'

%s
') + w(error) + else: + w(u'	') + w(field.render(form, self)) + w(u'	') + for button in form.form_buttons: + w(button.render(form)) + w(u'

') + + def render_buttons(self, w, form): + pass + + +class EntityCompositeFormRenderer(FormRenderer): + """specific renderer for multiple entities edition form (muledit)""" + + def render_fields(self, w, form, values): + if not form.is_subform: + w(u'') + super(EntityCompositeFormRenderer, self).render_fields(w, form, values) + if not form.is_subform: + w(u'

') + + def _render_fields(self, fields, w, form): + if form.is_subform: + entity = form.edited_entity + values = form.form_previous_values + qeid = eid_param('eid', entity.eid) + cbsetstate = "setCheckboxesState2('eid', %s, 'checked')" % html_escape(dumps(entity.eid)) + w(u'' % (entity.row % 2 and u'even' or u'odd')) + # XXX turn this into a widget used on the eid field + w(u'%s' % checkbox('eid', entity.eid, checked=qeid in values)) + for field in fields: + error = form.form_field_error(field) + if error: + w(u'') + w(error) + else: + w(u'') + if isinstance(field.widget, (fwdgs.Select, fwdgs.CheckBox, fwdgs.Radio)): + field.widget.attrs['onchange'] = cbsetstate + elif isinstance(field.widget, fwdgs.Input): + field.widget.attrs['onkeypress'] = cbsetstate + w(u'

' % field.render(form, self)) + w(u'') + else: + # main form, display table headers + w(u'') + w(u'%s' + % tags.input(type='checkbox', title=form.req._('toggle check boxes'), + onclick="setCheckboxesState('eid', this.checked)")) + for field in self.forms[0].fields: + if self.display_field(form, field) and field.is_visible(): + w(u'%s' % form.req._(field.label)) + w(u'') + + + +class EntityFormRenderer(FormRenderer): + """specific renderer for entity edition form (edition)""" + _options = FormRenderer._options + ('display_relations_form',) + display_relations_form = True + + def render(self, form, values): + rendered = super(EntityFormRenderer, self).render(form, values) + return rendered + u'

' # close extra div introducted by open_form + + def open_form(self, form, values): + attrs_fs_label = ('

' + % form.req._('main informations')) + attrs_fs_label += '

' + return attrs_fs_label + super(EntityFormRenderer, self).open_form(form, values) + + def render_fields(self, w, form, values): + super(EntityFormRenderer, self).render_fields(w, form, values) + self.inline_entities_form(w, form) + if form.edited_entity.has_eid() and self.display_relations_form: + self.relations_form(w, form) + + def _render_fields(self, fields, w, form): + if not form.edited_entity.has_eid() or form.edited_entity.has_perm('update'): + super(EntityFormRenderer, self)._render_fields(fields, w, form) + + def render_buttons(self, w, form): + if len(form.form_buttons) == 3: + w(""" + + + +

+ %s +

+ %s + %s +

""" % tuple(button.render(form) for button in form.form_buttons)) + else: + super(EntityFormRenderer, self).render_buttons(w, form) + + def relations_form(self, w, form): + srels_by_cat = form.srelations_by_category('generic', 'add') + if not srels_by_cat: + return u'' + req = form.req + _ = req._ + label = u'%s :' % _('This %s' % form.edited_entity.e_schema).capitalize() + eid = form.edited_entity.eid + w(u'

') + w(u'%s' % label) + w(u'') + for rschema, target, related in form.relations_table(): + # already linked entities + if related: + w(u'' % rschema.display_name(req, target)) + w(u'') + w(u'') + pendings = list(form.restore_pending_inserts()) + if not pendings: + w(u'') + else: + for row in pendings: + # soon to be linked to entities + w(u'' % row[1]) + w(u'' % row[3]) + w(u'') + w(u'') + w(u'' % eid) + w(u'') + w(u'' % eid) + w(u'') + w(u'

%s	') + w(u' ') + for viewparams in related: + w(u' %s %s ' + % (viewparams[1], viewparams[0], viewparams[2], viewparams[3])) + if not form.force_display and form.maxrelitems < len(related): + link = (u'' + '[%s]' + '' % form.req._('view all')) + w(u' %s ' % link) + w(u' ') + w(u'

%s	') + w(u'[x]' % + (_('cancel this insert'), row[2])) + w(u'%s' + % (row[1], row[4], html_escape(row[5]))) + w(u'
') + w(u'%s' % _('add relation')) + w(u'') + w(u'

') + w(u'

') + + def inline_entities_form(self, w, form): + """create a form to edit entity's inlined relations""" + entity = form.edited_entity + __ = form.req.__ + for rschema, targettypes, role in form.inlined_relations(): + # show inline forms only if there's one possible target type + # for rschema + if len(targettypes) != 1: + self.warning('entity related by the %s relation should have ' + 'inlined form but there is multiple target types, ' + 'dunno what to do', rschema) + continue + targettype = targettypes[0].type + if form.should_inline_relation_form(rschema, targettype, role): + w(u'

' % rschema) + existant = entity.has_eid() and entity.related(rschema) + if existant: + # display inline-edition view for all existing related entities + w(form.view('inline-edition', existant, rtype=rschema, role=role, + ptype=entity.e_schema, peid=entity.eid)) + if role == 'subject': + card = rschema.rproperty(entity.e_schema, targettype, 'cardinality')[0] + else: + card = rschema.rproperty(targettype, entity.e_schema, 'cardinality')[1] + # there is no related entity and we need at least one: we need to + # display one explicit inline-creation view + if form.should_display_inline_creation_form(rschema, existant, card): + w(form.view('inline-creation', None, etype=targettype, + peid=entity.eid, ptype=entity.e_schema, + rtype=rschema, role=role)) + # we can create more than one related entity, we thus display a link + # to add new related entities + if form.should_display_add_new_relation_link(rschema, existant, card): + divid = "addNew%s%s%s:%s" % (targettype, rschema, role, entity.eid) + w(u'

' + % divid) + js = "addInlineCreationForm('%s', '%s', '%s', '%s')" % ( + entity.eid, targettype, rschema, role) + if card in '1?': + js = "toggleVisibility('%s'); %s" % (divid, js) + w(u'+ %s.' + % (rschema, entity.eid, js, __('add a %s' % targettype))) + w(u'

') + w(u'

') + + +class EntityInlinedFormRenderer(EntityFormRenderer): + """specific renderer for entity inlined edition form + (inline-[creation|edition]) + """ + def render(self, form, values): + form.add_media() + data = [] + w = data.append + try: + w(u'

' % values) + except KeyError: + w(u'

' % values) + else: + w(u'

' % ( + values['divid'], form.req._('click on the box to cancel the deletion'))) + w(u'

') + values['removemsg'] = form.req.__('remove this %s' % form.edited_entity.e_schema) + w(u'

%(title)s ' + '#1 ' + '[%(removemsg)s]

' + % values) + self.render_fields(w, form, values) + w(u'

') + return '\n'.join(data) + + def render_fields(self, w, form, values): + form.form_build_context(values) + w(u'

' % values) + fields = self._render_hidden_fields(w, form) + w(u'

') + w(u'

') + if fields: + self._render_fields(fields, w, form) + self.render_child_forms(w, form, values) + self.inline_entities_form(w, form) + w(u'

') + diff -r 49075f57cf2c -r aa09e20dd8c0 web/formwidgets.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/formwidgets.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,432 @@ +"""widget classes for form construction + +:organization: Logilab +:copyright: 2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from datetime import date + +from cubicweb.common import tags +from cubicweb.web import stdmsgs, INTERNAL_FIELD_VALUE + + +class FieldWidget(object): + """abstract widget class""" + # javascript / css files required by the widget + needs_js = () + needs_css = () + # automatically set id and tabindex attributes ? + setdomid = True + settabindex = True + + def __init__(self, attrs=None, setdomid=None, settabindex=None): + if attrs is None: + attrs = {} + self.attrs = attrs + if setdomid is not None: + # override class's default value + self.setdomid = setdomid + if settabindex is not None: + # override class's default value + self.settabindex = settabindex + + def add_media(self, form): + """adds media (CSS & JS) required by this widget""" + if self.needs_js: + form.req.add_js(self.needs_js) + if self.needs_css: + form.req.add_css(self.needs_css) + + def render(self, form, field): + """render the widget for the given `field` of `form`. + To override in concrete class + """ + raise NotImplementedError + + def _render_attrs(self, form, field): + """return html tag name, attributes and a list of values for the field + """ + name = form.context[field]['name'] + values = form.context[field]['value'] + if not isinstance(values, (tuple, list)): + values = (values,) + attrs = dict(self.attrs) + if self.setdomid: + attrs['id'] = form.context[field]['id'] + if self.settabindex and not 'tabindex' in attrs: + attrs['tabindex'] = form.req.next_tabindex() + return name, values, attrs + + +class Input(FieldWidget): + """abstract widget class for tag based widgets""" + type = None + + def render(self, form, field): + """render the widget for the given `field` of `form`. + + Generate one tag for each field's value + """ + self.add_media(form) + name, values, attrs = self._render_attrs(form, field) + # ensure something is rendered + if not values: + values = (INTERNAL_FIELD_VALUE,) + inputs = [tags.input(name=name, value=value, type=self.type, **attrs) + for value in values] + return u'\n'.join(inputs) + + +# basic html widgets ########################################################### + +class TextInput(Input): + """""" + type = 'text' + + +class PasswordInput(Input): + """ and its confirmation field (using + -confirm as name) + """ + type = 'password' + + def render(self, form, field): + self.add_media(form) + name, values, attrs = self._render_attrs(form, field) + assert len(values) == 1 + id = attrs.pop('id') + try: + confirmname = '%s-confirm:%s' % tuple(name.rsplit(':', 1)) + except TypeError: + confirmname = '%s-confirm' % name + inputs = [tags.input(name=name, value=values[0], type=self.type, id=id, **attrs), + '
', + tags.input(name=confirmname, value=values[0], type=self.type, **attrs), + ' ', tags.span(form.req._('confirm password'), + **{'class': 'emphasis'})] + return u'\n'.join(inputs) + + +class FileInput(Input): + """""" + type = 'file' + + def _render_attrs(self, form, field): + # ignore value which makes no sense here (XXX even on form validation error?) + name, values, attrs = super(FileInput, self)._render_attrs(form, field) + return name, ('',), attrs + + +class HiddenInput(Input): + """""" + type = 'hidden' + setdomid = False # by default, don't set id attribute on hidden input + settabindex = False + + +class ButtonInput(Input): + """ + + if you want a global form button, look at the Button, SubmitButton, + ResetButton and ImgButton classes below. + """ + type = 'button' + + +class TextArea(FieldWidget): + """

"""
+    def render(self, form, field):
+        name, values, attrs = self._render_attrs(form, field)
+        attrs.setdefault('onkeypress', 'autogrow(this)')
+        attrs.setdefault('cols', 80)
+        attrs.setdefault('rows', 20)
+        if not values:
+            value = u''
+        elif len(values) == 1:
+            value = values[0]
+        else:
+            raise ValueError('a textarea is not supposed to be multivalued')
+        return tags.textarea(value, name=name, **attrs)
+
+
+class FCKEditor(TextArea):
+    """FCKEditor enabled <textarea>"""
+    def __init__(self, *args, **kwargs):
+        super(FCKEditor, self).__init__(*args, **kwargs)
+        self.attrs['cubicweb:type'] = 'wysiwyg'
+
+    def render(self, form, field):
+        form.req.fckeditor_config()
+        return super(FCKEditor, self).render(form, field)
+
+
+class Select(FieldWidget):
+    """<select>, for field having a specific vocabulary"""
+    def __init__(self, attrs=None, multiple=False):
+        super(Select, self).__init__(attrs)
+        self._multiple = multiple
+
+    def render(self, form, field):
+        name, curvalues, attrs = self._render_attrs(form, field)
+        if not 'size' in attrs and self._multiple:
+            attrs['size'] = '5'
+        options = []
+        optgroup_opened = False
+        for label, value in field.vocabulary(form):
+            if value is None:
+                # handle separator
+                if optgroup_opened:
+                    options.append(u'</optgroup>')
+                options.append(u'<optgroup label="%s">' % (label or ''))
+                optgroup_opened = True
+            elif value in curvalues:
+                options.append(tags.option(label, value=value, selected='selected'))
+            else:
+                options.append(tags.option(label, value=value))
+        if optgroup_opened:
+            options.append(u'</optgroup>')
+        return tags.select(name=name, multiple=self._multiple,
+                           options=options, **attrs)
+
+
+class CheckBox(Input):
+    """<input type='checkbox'>, for field having a specific vocabulary. One
+    input will be generated for each possible value.
+    """
+    type = 'checkbox'
+
+    def render(self, form, field):
+        name, curvalues, attrs = self._render_attrs(form, field)
+        options = []
+        for label, value in field.vocabulary(form):
+            if value in curvalues:
+                tag = tags.input(name=name, value=value, type=self.type,
+                                 checked='checked', **attrs)
+            else:
+                tag = tags.input(name=name, value=value, type=self.type,
+                                 **attrs)
+            options.append(tag + label)
+        return '<br/>\n'.join(options)
+
+
+class Radio(Input):
+    """<input type='radio'>, for field having a specific vocabulary. One
+    input will be generated for each possible value.
+    """
+    type = 'radio'
+
+    def render(self, form, field):
+        name, curvalues, attrs = self._render_attrs(form, field)
+        domid = attrs.pop('id', None)
+        options = []
+        for i, (label, value) in enumerate(field.vocabulary(form)):
+            iattrs = attrs.copy()
+            if i == 0 and domid is not None:
+                iattrs['id'] = domid
+            if value in curvalues:
+                iattrs['checked'] = u'checked'
+            tag = tags.input(name=name, type=self.type, value=value, **iattrs)
+            options.append(tag + label + '<br/>')
+        return '\n'.join(options)
+
+
+# javascript widgets ###########################################################
+
+class DateTimePicker(TextInput):
+    """<input type='text' + javascript date/time picker for date or datetime
+    fields
+    """
+    monthnames = ('january', 'february', 'march', 'april',
+                  'may', 'june', 'july', 'august',
+                  'september', 'october', 'november', 'december')
+    daynames = ('monday', 'tuesday', 'wednesday', 'thursday',
+                'friday', 'saturday', 'sunday')
+
+    needs_js = ('cubicweb.calendar.js',)
+    needs_css = ('cubicweb.calendar_popup.css',)
+
+    @classmethod
+    def add_localized_infos(cls, req):
+        """inserts JS variables defining localized months and days"""
+        # import here to avoid dependancy from cubicweb-common to simplejson
+        _ = req._
+        monthnames = [_(mname) for mname in cls.monthnames]
+        daynames = [_(dname) for dname in cls.daynames]
+        req.html_headers.define_var('MONTHNAMES', monthnames)
+        req.html_headers.define_var('DAYNAMES', daynames)
+
+    def render(self, form, field):
+        txtwidget = super(DateTimePicker, self).render(form, field)
+        self.add_localized_infos(form.req)
+        cal_button = self._render_calendar_popup(form, field)
+        return txtwidget + cal_button
+
+    def _render_calendar_popup(self, form, field):
+        value = form.form_field_value(field)
+        if not value:
+            value = date.today()
+        inputid = form.context[field]['id']
+        helperid = '%shelper' % inputid
+        year, month = value.year, value.month
+        return (u"""<a onclick="toggleCalendar('%s', '%s', %s, %s);" class="calhelper">
+<img src="%s" title="%s" alt="" /></a><div class="calpopup hidden" id="%s"></div>"""
+                % (helperid, inputid, year, month,
+                   form.req.external_resource('CALENDAR_ICON'),
+                   form.req._('calendar'), helperid) )
+
+
+
+# ajax widgets ################################################################
+
+def init_ajax_attributes(attrs, wdgtype, loadtype=u'auto'):
+    try:
+        attrs['klass'] += u' widget'
+    except KeyError:
+        attrs['klass'] = u'widget'
+    attrs.setdefault('cubicweb:wdgtype', wdgtype)
+    attrs.setdefault('cubicweb:loadtype', loadtype)
+
+
+class AjaxWidget(FieldWidget):
+    """simple <div> based ajax widget"""
+    def __init__(self, wdgtype, inputid=None, **kwargs):
+        super(AjaxWidget, self).__init__(**kwargs)
+        init_ajax_attributes(self.attrs, wdgtype)
+        if inputid is not None:
+            self.attrs['cubicweb:inputid'] = inputid
+
+    def render(self, form, field):
+        self.add_media(form)
+        attrs = self._render_attrs(form, field)[-1]
+        return tags.div(**attrs)
+
+
+class AutoCompletionWidget(TextInput):
+    """ajax widget for StringField, proposing matching existing values as you
+    type.
+    """
+    needs_js = ('cubicweb.widgets.js', 'jquery.autocomplete.js')
+    needs_css = ('jquery.autocomplete.css',)
+    wdgtype = 'SuggestField'
+    loadtype = 'auto'
+
+    def _render_attrs(self, form, field):
+        name, values, attrs = super(AutoCompletionWidget, self)._render_attrs(form, field)
+        if not values[0]:
+            values = (INTERNAL_FIELD_VALUE,)
+        init_ajax_attributes(attrs, self.wdgtype, self.loadtype)
+        # XXX entity form specific
+        attrs['cubicweb:dataurl'] = self._get_url(form.edited_entity)
+        return name, values, attrs
+
+    def _get_url(self, entity):
+        return entity.req.build_url('json', fname=entity.autocomplete_initfuncs[self.rschema],
+                                pageid=entity.req.pageid, mode='remote')
+
+
+class StaticFileAutoCompletionWidget(AutoCompletionWidget):
+    """XXX describe me"""
+    wdgtype = 'StaticFileSuggestField'
+
+    def _get_url(self, entity):
+        return entity.req.datadir_url + entity.autocomplete_initfuncs[self.rschema]
+
+
+class RestrictedAutoCompletionWidget(AutoCompletionWidget):
+    """XXX describe me"""
+    wdgtype = 'RestrictedSuggestField'
+
+
+class AddComboBoxWidget(Select):
+    def _render_attrs(self, form, field):
+        name, values, attrs = super(AddComboBoxWidget, self)._render_attrs(form, field)
+        init_ajax_attributes(self.attrs, 'AddComboBox')
+        # XXX entity form specific
+        entity = form.edited_entity
+        attrs['cubicweb:etype_to'] = entity.e_schema
+        etype_from = entity.e_schema.subject_relation(self.name).objects(entity.e_schema)[0]
+        attrs['cubicweb:etype_from'] = etype_from
+
+    def render(self, form, field):
+        return super(AddComboBoxWidget, self).render(form, field) + u'''
+<div id="newvalue">
+  <input type="text" id="newopt" />
+  <a href="javascript:noop()" id="add_newopt"> </a></div>
+'''
+
+# buttons ######################################################################
+
+class Button(Input):
+    """<input type='button'>, base class for global form buttons
+
+    note label is a msgid which will be translated at form generation time, you
+    should not give an already translated string.
+    """
+    type = 'button'
+    def __init__(self, label=stdmsgs.BUTTON_OK, attrs=None,
+                 setdomid=None, settabindex=None,
+                 name='', value='', onclick=None, cwaction=None):
+        super(Button, self).__init__(attrs, setdomid, settabindex)
+        self.label = label
+        self.name = name
+        self.value = ''
+        self.onclick = onclick
+        self.cwaction = cwaction
+        self.attrs.setdefault('klass', 'validateButton')
+
+    def render(self, form, field=None):
+        label = form.req._(self.label)
+        attrs = self.attrs.copy()
+        if self.cwaction:
+            assert self.onclick is None
+            attrs['onclick'] = "postForm('__action_%s', \'%s\', \'%s\')" % (
+                self.cwaction, self.label, form.domid)
+        elif self.onclick:
+            attrs['onclick'] = self.onclick
+        if self.name:
+            attrs['name'] = name
+            if self.setdomid:
+                attrs['id'] = self.name
+        if self.settabindex and not 'tabindex' in attrs:
+            attrs['tabindex'] = form.req.next_tabindex()
+        return tags.input(value=label, type=self.type, **attrs)
+
+
+class SubmitButton(Button):
+    """<input type='submit'>, main button to submit a form"""
+    type = 'submit'
+
+
+class ResetButton(Button):
+    """<input type='reset'>, main button to reset a form.
+    You usually don't want this.
+    """
+    type = 'reset'
+
+
+class ImgButton(object):
+    """<img> wrapped into a <a> tag with href triggering something (usually a
+    javascript call)
+
+    note label is a msgid which will be translated at form generation time, you
+    should not give an already translated string.
+    """
+    def __init__(self, domid, href, label, imgressource):
+        self.domid = domid
+        self.href = href
+        self.imgressource = imgressource
+        self.label = label
+
+    def render(self, form, field=None):
+        label = form.req._(self.label)
+        imgsrc = form.req.external_resource(self.imgressource)
+        return '<a id="%(domid)s" href="%(href)s">'\
+               '<img src="%(imgsrc)s" alt="%(label)s"/>%(label)s</a>' % {
+            'label': label, 'imgsrc': imgsrc,
+            'domid': self.domid, 'href': self.href}
+
+
+
+# XXX EntityLinkComboBoxWidget, [Raw]DynamicComboBoxWidget
diff -r 49075f57cf2c -r aa09e20dd8c0 web/htmlwidgets.py
--- a/web/htmlwidgets.py	Tue May 05 17:18:49 2009 +0200
+++ b/web/htmlwidgets.py	Thu May 14 12:48:11 2009 +0200
@@ -10,7 +10,7 @@
 
 from logilab.mtconverter import html_escape
 
-from cubicweb.common.utils import UStringIO
+from cubicweb.utils import UStringIO
 from cubicweb.common.uilib import toggle_action
 
 # XXX HTMLWidgets should have access to req (for datadir / static urls,
@@ -59,7 +59,7 @@
 
     main_div_class = 'boxContent'
     listing_class = 'boxListing'
-    
+
     def box_begin_content(self):
         self.w(u'<div class="%s">\n' % self.main_div_class)
         if self.islist:
@@ -71,12 +71,12 @@
         self.w(u'</div>\n')
         if self.shadow:
             self.w(u'<div class="shadow"> </div>')
-        
+
     def _render(self):
         if self.id:
             self.w(u'<div class="%s" id="%s">' % (self._class, self.id))
         else:
-            self.w(u'<div class="%s">' % self._class)            
+            self.w(u'<div class="%s">' % self._class)
         if self.title:
             if self.escape:
                 title = '<span>%s</span>' % html_escape(self.title)
@@ -100,7 +100,7 @@
         super(SideBoxWidget, self).__init__(title, id=id, _class='sideBox',
                                             shadow=False)
 
-                                            
+
 class MenuWidget(BoxWidget):
     main_div_class = 'menuContent'
     listing_class = 'menuListing'
@@ -109,7 +109,7 @@
         if self.islist:
             self.w(u'</ul>\n')
         self.w(u'</div>\n')
-    
+
 
 class RawBoxItem(HTMLWidget):
     """a simpe box item displaying raw data"""
@@ -122,9 +122,9 @@
             return u'<li>'
         else:
             return u'<li class="%s">' % self.liclass
-        
+
         return self.label
-    
+
     def _render(self):
         self.w(u'%s%s</li>' % (self._start_li(), self.label))
 
@@ -132,7 +132,7 @@
 class BoxMenu(RawBoxItem):
     """a menu in a box"""
     link_class = 'boxMenu'
-    
+
     def __init__(self, label, items=None, isitem=True, liclass=None, ident=None,
                  link_class=None):
         super(BoxMenu, self).__init__(label, liclass)
@@ -141,7 +141,7 @@
         self.ident = ident or u'boxmenu_%s' % label.replace(' ', '_').replace("'", '')
         if link_class:
             self.link_class = link_class
-            
+
     def append(self, item):
         self.items.append(item)
 
@@ -150,7 +150,7 @@
 
     def _end_menu(self):
         self.w(u'</ul>')
-        
+
     def _render(self):
         if self.isitem:
             self.w(self._start_li())
@@ -183,15 +183,15 @@
     def __init__(self, label, value):
         self.label = label
         self.value = value
-    
+
     def _render(self):
         self.w(u'<li><div><span class="label">%s</span> '
-               u'<span class="value">%s</span></div></li>' 
+               u'<span class="value">%s</span></div></li>'
                % (self.label, self.value))
 
 class BoxSeparator(HTMLWidget):
     """a menu separator"""
-    
+
     def _render(self):
         self.w(u'</ul><hr class="boxSeparator"/><ul>')
 
@@ -249,7 +249,7 @@
 
     highlight = "onmouseover=\"addElementClass(this, 'highlighted');\" " \
                 "onmouseout=\"removeElementClass(this, 'highlighted');\""
-    
+
     def __init__(self, model):
         self.model = model
         self.columns = []
@@ -278,7 +278,7 @@
                 attrs = ('%s="%s"' % (name, value) for name, value in attrs.iteritems())
                 self.w(u'<td %s>' % (' '.join(attrs)))
                 for cellvid, colindex in column.cellrenderers:
-                    self.model.render(cellvid, rowindex, colindex, w=self.w)
+                    self.model.render_cell(cellvid, rowindex, colindex, w=self.w)
                 self.w(u'</td>')
             self.w(u'</tr>')
         self.w(u'</tbody>')
diff -r 49075f57cf2c -r aa09e20dd8c0 web/httpcache.py
--- a/web/httpcache.py	Tue May 05 17:18:49 2009 +0200
+++ b/web/httpcache.py	Thu May 14 12:48:11 2009 +0200
@@ -2,15 +2,15 @@
 
 
 :organization: Logilab
-:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
 
-from mx.DateTime import DateTimeFromTicks, now, gmtime
+from datetime import datetime
 
 # time delta usable to convert localized time to GMT time
-GMTOFFSET = - (now() - gmtime())
+GMTOFFSET = - (datetime.now() - datetime.utcnow())
 
 class NoHTTPCacheManager(object):
     """default cache manager: set no-cache cache control policy"""
@@ -42,14 +42,14 @@
 
     def etag(self):
         return self.view.id + '/' + ','.join(sorted(self.req.user.groups))
-    
+
     def max_age(self):
         # 0 to actually force revalidation
         return 0
-    
+
     def last_modified(self):
         return self.view.last_modified()
-    
+
     def set_headers(self):
         req = self.req
         try:
@@ -92,11 +92,11 @@
 # monkey patching, so view doesn't depends on this module and we have all
 # http cache related logic here
 
-from cubicweb.common import view
+from cubicweb import view as viewmod
 
 def set_http_cache_headers(self):
     self.http_cache_manager(self).set_headers()
-view.View.set_http_cache_headers = set_http_cache_headers
+viewmod.View.set_http_cache_headers = set_http_cache_headers
 
 def last_modified(self):
     """return the date/time where this view should be considered as
@@ -105,11 +105,12 @@
     /!\ must return GMT time /!\
     """
     # XXX check view module's file modification time in dev mod ?
-    ctime = gmtime()
+    ctime = datetime.utcnow()
     if self.cache_max_age:
         mtime = self.req.header_if_modified_since()
         if mtime:
-            if (ctime - mtime).seconds > self.cache_max_age:
+            tdelta = (ctime - mtime)
+            if tdelta.days * 24*60*60 + tdelta.seconds > self.cache_max_age:
                 mtime = ctime
         else:
             mtime = ctime
@@ -117,15 +118,15 @@
         mtime = ctime
     # mtime = ctime will force page rerendering
     return mtime
-view.View.last_modified = last_modified
+viewmod.View.last_modified = last_modified
 
 # configure default caching
-view.View.http_cache_manager = NoHTTPCacheManager
+viewmod.View.http_cache_manager = NoHTTPCacheManager
 # max-age=0 to actually force revalidation when needed
-view.View.cache_max_age = 0
+viewmod.View.cache_max_age = 0
 
 
-view.EntityView.http_cache_manager = EntityHTTPCacheManager
+viewmod.EntityView.http_cache_manager = EntityHTTPCacheManager
 
-view.StartupView.http_cache_manager = MaxAgeHTTPCacheManager
-view.StartupView.cache_max_age = 60*60*2 # stay in http cache for 2 hours by default 
+viewmod.StartupView.http_cache_manager = MaxAgeHTTPCacheManager
+viewmod.StartupView.cache_max_age = 60*60*2 # stay in http cache for 2 hours by default
diff -r 49075f57cf2c -r aa09e20dd8c0 web/request.py
--- a/web/request.py	Tue May 05 17:18:49 2009 +0200
+++ b/web/request.py	Thu May 14 12:48:11 2009 +0200
@@ -1,7 +1,7 @@
 """abstract class for http request
 
 :organization: Logilab
-:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
@@ -17,15 +17,18 @@
 from rql.utils import rqlvar_maker
 
 from logilab.common.decorators import cached
+from logilab.common.deprecation import obsolete
 
-# XXX move _MARKER here once AppObject.external_resource has been removed
+from logilab.mtconverter import html_escape
+
 from cubicweb.dbapi import DBAPIRequest
-from cubicweb.common.appobject import _MARKER 
 from cubicweb.common.mail import header
 from cubicweb.common.uilib import remove_html_tags
-from cubicweb.common.utils import SizeConstrainedList, HTMLHead
-from cubicweb.web import (INTERNAL_FIELD_VALUE, LOGGER, NothingToEdit, RequestError,
-                       StatusResponse)
+from cubicweb.utils import SizeConstrainedList, HTMLHead
+from cubicweb.web import (INTERNAL_FIELD_VALUE, LOGGER, NothingToEdit,
+                          RequestError, StatusResponse)
+
+_MARKER = object()
 
 
 def list_form_param(form, param, pop=False):
@@ -56,8 +59,8 @@
 
 
 class CubicWebRequestBase(DBAPIRequest):
-    """abstract HTTP request, should be extended according to the HTTP backend"""    
-    
+    """abstract HTTP request, should be extended according to the HTTP backend"""
+
     def __init__(self, vreg, https, form=None):
         super(CubicWebRequestBase, self).__init__(vreg)
         self.message = None
@@ -73,7 +76,7 @@
         self.data = {}
         # search state: 'normal' or 'linksearch' (eg searching for an object
         # to create a relation with another)
-        self.search_state = ('normal',) 
+        self.search_state = ('normal',)
         # tabindex generator
         self.tabindexgen = count()
         self.next_tabindex = self.tabindexgen.next
@@ -106,27 +109,27 @@
                     return
         # 3. default language
         self.set_default_language(vreg)
-            
+
     def set_language(self, lang):
         self._ = self.__ = self.translations[lang]
         self.lang = lang
         self.debug('request language: %s', lang)
-        
+
     # input form parameters management ########################################
-    
+
     # common form parameters which should be protected against html values
     # XXX can't add 'eid' for instance since it may be multivalued
     # dont put rql as well, if query contains < and > it will be corrupted!
-    no_script_form_params = set(('vid', 
-                                 'etype', 
+    no_script_form_params = set(('vid',
+                                 'etype',
                                  'vtitle', 'title',
                                  '__message',
                                  '__redirectvid', '__redirectrql'))
-        
+
     def setup_params(self, params):
         """WARNING: we're intentionaly leaving INTERNAL_FIELD_VALUE here
 
-        subclasses should overrides to 
+        subclasses should overrides to
         """
         if params is None:
             params = {}
@@ -146,7 +149,7 @@
                 del self.form[k]
             else:
                 self.form[k] = v
-    
+
     def no_script_form_param(self, param, default=None, value=None):
         """ensure there is no script in a user form param
 
@@ -167,11 +170,11 @@
                 value = value[0]
             return remove_html_tags(value)
         return value
-        
+
     def list_form_param(self, param, form=None, pop=False):
         """get param from form parameters and return its value as a list,
         skipping internal markers if any
-        
+
         * if the parameter isn't defined, return an empty list
         * if the parameter is a single (unicode) value, return a list
           containing that value
@@ -182,8 +185,8 @@
         """
         if form is None:
             form = self.form
-        return list_form_param(form, param, pop)            
-    
+        return list_form_param(form, param, pop)
+
 
     def reset_headers(self):
         """used by AutomaticWebTest to clear html headers between tests on
@@ -193,11 +196,11 @@
         return self
 
     # web state helpers #######################################################
-    
+
     def set_message(self, msg):
         assert isinstance(msg, unicode)
         self.message = msg
-    
+
     def update_search_state(self):
         """update the current search state"""
         searchstate = self.form.get('__mode')
@@ -215,6 +218,19 @@
         if self.cnx is not None:
             self.set_session_data('search_state', searchstate)
 
+    def match_search_state(self, rset):
+        """when searching an entity to create a relation, return True if entities in
+        the given rset may be used as relation end
+        """
+        try:
+            searchedtype = self.search_state[1][-1]
+        except IndexError:
+            return False # no searching for association
+        for etype in rset.column_types(0):
+            if etype != searchedtype:
+                return False
+        return True
+
     def update_breadcrumbs(self):
         """stores the last visisted page in session data"""
         searchstate = self.get_session_data('search_state')
@@ -234,7 +250,7 @@
     def register_onetime_callback(self, func, *args):
         cbname = 'cb_%s' % (
             sha.sha('%s%s%s%s' % (time.time(), func.__name__,
-                                  random.random(), 
+                                  random.random(),
                                   self.user.login)).hexdigest())
         def _cb(req):
             try:
@@ -242,12 +258,12 @@
             except TypeError:
                 from warnings import warn
                 warn('user callback should now take request as argument')
-                ret = func(*args)            
+                ret = func(*args)
             self.unregister_callback(self.pageid, cbname)
             return ret
         self.set_page_data(cbname, _cb)
         return cbname
-    
+
     def unregister_callback(self, pageid, cbname):
         assert pageid is not None
         assert cbname.startswith('cb_')
@@ -260,14 +276,17 @@
             callbacks = [key for key in sessdata if key.startswith('cb_')]
             for callback in callbacks:
                 self.del_session_data(callback)
-    
+
     # web edition helpers #####################################################
-    
+
     @cached # so it's writed only once
     def fckeditor_config(self):
+        self.add_js('fckeditor/fckeditor.js')
         self.html_headers.define_var('fcklang', self.lang)
         self.html_headers.define_var('fckconfigpath',
-                                     self.build_url('data/fckcwconfig.js'))
+                                     self.build_url('data/cubicweb.fckcwconfig.js'))
+    def use_fckeditor(self):
+        return self.vreg.config.fckeditor_installed() and self.property_value('ui.fckeditor')
 
     def edited_eids(self, withtype=False):
         """return a list of edited eids"""
@@ -314,7 +333,7 @@
             print eid, params
             raise RequestError(self._('missing parameters for entity %s') % eid)
         return params
-    
+
     def get_pending_operations(self, entity, relname, role):
         operations = {'insert' : [], 'delete' : []}
         for optype in ('insert', 'delete'):
@@ -326,7 +345,7 @@
                     if role == 'object' and entity.eid == eidto:
                         operations[optype].append(eidfrom)
         return operations
-    
+
     def get_pending_inserts(self, eid=None):
         """shortcut to access req's pending_insert entry
 
@@ -361,7 +380,7 @@
         """
         self.del_session_data(errorurl)
         self.remove_pending_operations()
-    
+
     # high level methods for HTTP headers management ##########################
 
     # must be cached since login/password are popped from the form dictionary
@@ -379,7 +398,7 @@
                 return None, None
         else:
             return self.header_authorization()
-    
+
     def get_cookie(self):
         """retrieve request cookies, returns an empty cookie if not found"""
         try:
@@ -407,7 +426,7 @@
         morsel['Max-Age'] = 0
         # The only way to set up cookie age for IE is to use an old "expired"
         # syntax. IE doesn't support Max-Age there is no library support for
-        # managing 
+        # managing
         # ===> Do _NOT_ comment this line :
         morsel['expires'] = 'Thu, 01-Jan-1970 00:00:00 GMT'
         self.add_header('Set-Cookie', morsel.OutputString())
@@ -460,9 +479,26 @@
             if localfile:
                 cssfile = self.datadir_url + cssfile
             add_css(cssfile, media)
-    
+
+    def build_ajax_replace_url(self, nodeid, rql, vid, replacemode='replace',
+                               **extraparams):
+        """builds an ajax url that will replace `nodeid`s content
+        :param nodeid: the dom id of the node to replace
+        :param rql: rql to execute
+        :param vid: the view to apply on the resultset
+        :param replacemode: defines how the replacement should be done.
+        Possible values are :
+         - 'replace' to replace the node's content with the generated HTML
+         - 'swap' to replace the node itself with the generated HTML
+         - 'append' to append the generated HTML to the node's content
+        """
+        url = self.build_url('view', rql=rql, vid=vid, __notemplate=1,
+                             **extraparams)
+        return "javascript: loadxhtml('%s', '%s', '%s')" % (
+            nodeid, html_escape(url), replacemode)
+
     # urls/path management ####################################################
-    
+
     def url(self, includeparams=True):
         """return currently accessed url"""
         return self.base_url() + self.relative_path(includeparams)
@@ -470,7 +506,7 @@
     def _datadir_url(self):
         """return url of the application's data directory"""
         return self.base_url() + 'data%s/' % self.vreg.config.instance_md5_version()
-    
+
     def selected(self, url):
         """return True if the url is equivalent to currently accessed url"""
         reqpath = self.relative_path().lower()
@@ -486,7 +522,7 @@
     def base_url_path(self):
         """returns the absolute path of the base url"""
         return urlsplit(self.base_url())[2]
-        
+
     @cached
     def from_controller(self):
         """return the id (string) of the controller issuing the request"""
@@ -496,7 +532,7 @@
         if controller in registered_controllers:
             return controller
         return 'view'
-    
+
     def external_resource(self, rid, default=_MARKER):
         """return a path to an external resource, using its identifier
 
@@ -525,9 +561,9 @@
         self._validate_cache()
         if self.http_method() == 'HEAD':
             raise StatusResponse(200, '')
-        
+
     # abstract methods to override according to the web front-end #############
-        
+
     def http_method(self):
         """returns 'POST', 'GET', 'HEAD', etc."""
         raise NotImplementedError()
@@ -537,7 +573,7 @@
         exists and is still usable
         """
         raise NotImplementedError()
-        
+
     def relative_path(self, includeparams=True):
         """return the normalized path of the request (ie at least relative
         to the application's root, but some other normalization may be needed
@@ -561,11 +597,11 @@
     def add_header(self, header, value):
         """add an output HTTP header"""
         raise NotImplementedError()
-    
+
     def remove_header(self, header):
         """remove an output HTTP header"""
         raise NotImplementedError()
-        
+
     def header_authorization(self):
         """returns a couple (auth-type, auth-value)"""
         auth = self.get_header("Authorization", None)
@@ -582,42 +618,54 @@
                            auth, ex.__class__.__name__, ex)
         return None, None
 
+    @obsolete("use parse_accept_header('Accept-Language')")
     def header_accept_language(self):
         """returns an ordered list of preferred languages"""
-        acceptedlangs = self.get_header('Accept-Language', '')
-        langs = []
-        for langinfo in acceptedlangs.split(','):
+        return [value.split('-')[0] for value in
+                self.parse_accept_header('Accept-Language')]
+
+    def parse_accept_header(self, header):
+        """returns an ordered list of preferred languages"""
+        accepteds = self.get_header(header, '')
+        values = []
+        for info in accepteds.split(','):
             try:
-                lang, score = langinfo.split(';')
-                score = float(score[2:]) # remove 'q='
+                value, scores = info.split(';', 1)
             except ValueError:
-                lang = langinfo
+                value = info
                 score = 1.0
-            lang = lang.split('-')[0]
-            langs.append( (score, lang) )
-        langs.sort(reverse=True)
-        return (lang for (score, lang) in langs)
+            else:
+                for score in scores.split(';'):
+                    try:
+                        scorekey, scoreval = score.split('=')
+                        if scorekey == 'q': # XXX 'level'
+                            score = float(score[2:]) # remove 'q='
+                    except ValueError:
+                        continue
+            values.append((score, value))
+        values.sort(reverse=True)
+        return (value for (score, value) in values)
 
     def header_if_modified_since(self):
         """If the HTTP header If-modified-since is set, return the equivalent
         mx date time value (GMT), else return None
         """
         raise NotImplementedError()
-    
+
     # page data management ####################################################
 
     def get_page_data(self, key, default=None):
         """return value associated to `key` in curernt page data"""
         page_data = self.cnx.get_session_data(self.pageid, {})
         return page_data.get(key, default)
-        
+
     def set_page_data(self, key, value):
         """set value associated to `key` in current page data"""
         self.html_headers.add_unload_pagedata()
         page_data = self.cnx.get_session_data(self.pageid, {})
         page_data[key] = value
         return self.cnx.set_session_data(self.pageid, page_data)
-        
+
     def del_page_data(self, key=None):
         """remove value associated to `key` in current page data
         if `key` is None, all page data will be cleared
@@ -638,16 +686,21 @@
     def ie_browser(self):
         useragent = self.useragent()
         return useragent and 'MSIE' in useragent
-    
+
     def xhtml_browser(self):
         useragent = self.useragent()
-        # MSIE does not support xml content-type
-        # quick fix: Opera supports xhtml and handles namespaces
-        # properly but it breaks jQuery.attr()
+        # * MSIE/Konqueror does not support xml content-type
+        # * Opera supports xhtml and handles namespaces properly but it breaks
+        #   jQuery.attr()
         if useragent and ('MSIE' in useragent or 'KHTML' in useragent
                           or 'Opera' in useragent):
             return False
         return True
 
+    def html_content_type(self):
+        if self.xhtml_browser():
+            return 'application/xhtml+xml'
+        return 'text/html'
+
 from cubicweb import set_log_methods
 set_log_methods(CubicWebRequestBase, LOGGER)
diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/data/schema/relations.rel
--- a/web/test/data/schema/relations.rel	Tue May 05 17:18:49 2009 +0200
+++ b/web/test/data/schema/relations.rel	Thu May 14 12:48:11 2009 +0200
@@ -1,2 +1,2 @@
 Personne travaille Societe
-EUser connait Personne
+CWUser connait Personne
diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/data/schema/testschema.py
--- a/web/test/data/schema/testschema.py	Tue May 05 17:18:49 2009 +0200
+++ b/web/test/data/schema/testschema.py	Thu May 14 12:48:11 2009 +0200
@@ -1,14 +1,14 @@
 class Salesterm(EntityType):
     described_by_test = SubjectRelation('File', cardinality='1*', composite='subject')
     amount = Int(constraints=[IntervalBoundConstraint(0, 100)])
-    
+
 class tags(RelationDefinition):
     subject = 'Tag'
-    object = ('BlogEntry', 'EUser')
+    object = ('BlogEntry', 'CWUser')
 
 class checked_by(RelationType):
     subject = 'BlogEntry'
-    object = 'EUser'
+    object = 'CWUser'
     cardinality = '?*'
     permissions = {
         'add': ('managers',),
diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/data/views.py
--- a/web/test/data/views.py	Tue May 05 17:18:49 2009 +0200
+++ b/web/test/data/views.py	Thu May 14 12:48:11 2009 +0200
@@ -21,6 +21,6 @@
             pass
         assert req.user.login == login
     return orig_publish(self, path, req)
-    
+
 orig_publish = CubicWebPublisher.main_publish
 CubicWebPublisher.main_publish = auto_login_publish
diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/runtests.py
--- a/web/test/runtests.py	Tue May 05 17:18:49 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# -*- coding: ISO-8859-1 -*-
-"""Script used to fire all tests"""
-
-__revision__ = '$Id: runtests.py,v 1.1 2005-06-17 14:09:18 adim Exp $'
-
-from logilab.common.testlib import main
-
-if __name__ == '__main__':
-    import sys, os
-    main(os.path.dirname(sys.argv[0]) or '.')
diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/test_views.py
--- a/web/test/test_views.py	Tue May 05 17:18:49 2009 +0200
+++ b/web/test/test_views.py	Thu May 14 12:48:11 2009 +0200
@@ -1,14 +1,12 @@
 """automatic tests"""
 
-from mx.DateTime import now
-
 from cubicweb.devtools.testlib import WebTest, AutomaticWebTest
-from cubicweb.common.view import AnyRsetView
+from cubicweb.view import AnyRsetView
 
 AutomaticWebTest.application_rql = [
-    'Any L,F WHERE E is EUser, E login L, E firstname F',
-    'Any L,F,E WHERE E is EUser, E login L, E firstname F',
-    'Any COUNT(X) WHERE X is EUser',
+    'Any L,F WHERE E is CWUser, E login L, E firstname F',
+    'Any L,F,E WHERE E is CWUser, E login L, E firstname F',
+    'Any COUNT(X) WHERE X is CWUser',
     ]
 
 class ComposityCopy(WebTest):
@@ -17,14 +15,14 @@
         """regression test: make sure we can ask a copy of a
         composite entity
         """
-        rset = self.execute('EUser X WHERE X login "admin"')
+        rset = self.execute('CWUser X WHERE X login "admin"')
         self.view('copy', rset)
 
 
 
 class SomeView(AnyRsetView):
     id = 'someview'
-    
+
     def call(self):
         self.req.add_js('spam.js')
         self.req.add_js('spam.js')
@@ -35,40 +33,34 @@
         self.auto_populate(10)
 
     def test_manual_tests(self):
-        rset = self.execute('Any P,F,S WHERE P is EUser, P firstname F, P surname S')
+        rset = self.execute('Any P,F,S WHERE P is CWUser, P firstname F, P surname S')
         self.view('table', rset, template=None, displayfilter=True, displaycols=[0,2])
-        rset = self.execute('Any P,F,S LIMIT 1 WHERE P is EUser, P firstname F, P surname S')
-        rset.req.form['rtype'] = 'firstname'
-        self.view('editrelation', rset, template=None)
-        rset.req.form['rtype'] = 'use_email'
-        self.view('editrelation', rset, template=None)
-        
 
     def test_sortable_js_added(self):
-        rset = self.execute('EUser X')
+        rset = self.execute('CWUser X')
         # sortable.js should not be included by default
         self.failIf('jquery.tablesorter.js' in self.view('oneline', rset))
         # but should be included by the tableview
-        rset = self.execute('Any P,F,S LIMIT 1 WHERE P is EUser, P firstname F, P surname S')
+        rset = self.execute('Any P,F,S LIMIT 1 WHERE P is CWUser, P firstname F, P surname S')
         self.failUnless('jquery.tablesorter.js' in self.view('table', rset))
 
     def test_js_added_only_once(self):
+        self.vreg._loadedmods[__name__] = {}
         self.vreg.register_vobject_class(SomeView)
-        rset = self.execute('EUser X')
+        rset = self.execute('CWUser X')
         source = self.view('someview', rset).source
         self.assertEquals(source.count('spam.js'), 1)
 
 
 
 class ExplicitViewsTest(WebTest):
-    
+
     def test_unrelateddivs(self):
-        rset = self.execute('Any X WHERE X is EUser, X login "admin"')
-        group = self.add_entity('EGroup', name=u'R&D')
+        rset = self.execute('Any X WHERE X is CWUser, X login "admin"')
+        group = self.add_entity('CWGroup', name=u'R&D')
         req = self.request(relation='in_group_subject')
         self.view('unrelateddivs', rset, req)
-        
-        
+
 
 if __name__ == '__main__':
     from logilab.common.testlib import unittest_main
diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_application.py
--- a/web/test/unittest_application.py	Tue May 05 17:18:49 2009 +0200
+++ b/web/test/unittest_application.py	Thu May 14 12:48:11 2009 +0200
@@ -44,7 +44,7 @@
 class RequestBaseTC(TestCase):
     def setUp(self):
         self.req = FakeRequest()
-        
+
 
     def test_list_arg(self):
         """tests the list_arg() function"""
@@ -73,13 +73,13 @@
         self.assertEquals(req.relative_path(False), 'login')
         self.assertEquals(req.from_controller(), 'login')
 
-        
+
 class UtilsTC(TestCase):
     """test suite for misc application utilities"""
 
     def setUp(self):
         self.ctrl = FakeController()
-    
+
     #def test_which_mapping(self):
     #    """tests which mapping is used (application or core)"""
     #    init_mapping()
@@ -95,7 +95,7 @@
         self.assertEquals(self.ctrl.execute_linkto(), None)
         self.assertEquals(self.ctrl._cursor.executed,
                           [])
-        
+
         self.ctrl.set_form({'__linkto' : 'works_for:12_13_14:object',
                               'eid': 8})
         self.ctrl.execute_linkto()
@@ -110,7 +110,7 @@
         self.assertEquals(self.ctrl._cursor.executed,
                           ['SET X works_for Y WHERE X eid 8, Y eid %s' % i
                            for i in (12, 13, 14)])
-        
+
 
         self.ctrl.new_cursor()
         self.ctrl.req.form = {'__linkto' : 'works_for:12_13_14:object'}
@@ -152,10 +152,10 @@
             return path, params
         else:
             self.fail('expected a Redirect exception')
-        
+
     def expect_redirect_publish(self, req, path='view'):
         return self.expect_redirect(lambda x: self.publish(x, path), req)
-    
+
     def test_cnx_user_groups_sync(self):
         user = self.user()
         self.assertEquals(user.groups, set(('managers',)))
@@ -168,22 +168,22 @@
         # cleanup
         self.execute('DELETE X in_group G WHERE X eid %s, G name "guests"' % user.eid)
         self.commit()
-    
+
     def test_nonregr_publish1(self):
-        req = self.request(u'EEType X WHERE X final FALSE, X meta FALSE')
+        req = self.request(u'CWEType X WHERE X final FALSE, X meta FALSE')
         self.app.publish('view', req)
-        
+
     def test_nonregr_publish2(self):
         req = self.request(u'Any count(N) WHERE N todo_by U, N is Note, U eid %s'
                            % self.user().eid)
         self.app.publish('view', req)
-        
+
     def test_publish_validation_error(self):
         req = self.request()
         user = self.user()
         req.form = {
             'eid':       `user.eid`,
-            '__type:'+`user.eid`:    'EUser',
+            '__type:'+`user.eid`:    'CWUser',
             'login:'+`user.eid`:     '', # ERROR: no login specified
             'edits-login:'+`user.eid`: unicode(user.login),
              # just a sample, missing some necessary information for real life
@@ -204,12 +204,12 @@
 
     def test_validation_error_dont_loose_subentity_data(self):
         """test creation of two linked entities
-        """        
+        """
         req = self.request()
         form = {'eid': ['X', 'Y'],
-                '__type:X': 'EUser',
+                '__type:X': 'CWUser',
                 # missing required field
-                'login:X': u'', 'edits-login:X': '', 
+                'login:X': u'', 'edits-login:X': '',
                 'surname:X': u'Mr Ouaoua', 'edits-surname:X': '',
                 '__type:Y': 'EmailAddress',
                 # but email address is set
@@ -229,13 +229,13 @@
         self.assertEquals(forminfo['errors'].errors, {'login': 'required attribute',
                                                       'upassword': 'required attribute'})
         self.assertEquals(forminfo['values'], form)
-        
+
     def _test_cleaned(self, kwargs, injected, cleaned):
         req = self.request(**kwargs)
         page = self.app.publish('view', req)
         self.failIf(injected in page, (kwargs, injected))
         self.failUnless(cleaned in page, (kwargs, cleaned))
-        
+
     def test_nonregr_script_kiddies(self):
         """test against current script injection"""
         injected = '<i>toto</i>'
@@ -245,7 +245,7 @@
                        {'vtitle': injected},
                        ):
             yield self._test_cleaned, kwargs, injected, cleaned
-        
+
     def test_site_wide_eproperties_sync(self):
         # XXX work in all-in-one configuration but not in twisted for instance
         # in which case we need a kindof repo -> http server notification
@@ -253,7 +253,7 @@
         vreg = self.app.vreg
         # default value
         self.assertEquals(vreg.property_value('ui.language'), 'en')
-        self.execute('INSERT EProperty X: X value "fr", X pkey "ui.language"')
+        self.execute('INSERT CWProperty X: X value "fr", X pkey "ui.language"')
         self.assertEquals(vreg.property_value('ui.language'), 'en')
         self.commit()
         self.assertEquals(vreg.property_value('ui.language'), 'fr')
@@ -261,7 +261,7 @@
         self.assertEquals(vreg.property_value('ui.language'), 'fr')
         self.commit()
         self.assertEquals(vreg.property_value('ui.language'), 'de')
-        self.execute('DELETE EProperty X WHERE X pkey "ui.language"')
+        self.execute('DELETE CWProperty X WHERE X pkey "ui.language"')
         self.assertEquals(vreg.property_value('ui.language'), 'de')
         self.commit()
         self.assertEquals(vreg.property_value('ui.language'), 'en')
@@ -278,7 +278,7 @@
         self.failIf(req.cnx is origcnx)
         self.assertEquals(req.user.login, 'turlututu')
         self.failUnless('turlututu' in page, page)
-        
+
     # authentication tests ####################################################
 
     def _init_auth(self, authmode, anonuser=None):
@@ -289,7 +289,7 @@
         req.cnx = None
         sh = self.app.session_handler
         # not properly cleaned between tests
-        self.open_sessions = sh.session_manager._sessions = {} 
+        self.open_sessions = sh.session_manager._sessions = {}
         return req, origcnx
 
     def _test_auth_succeed(self, req, origcnx):
@@ -299,16 +299,16 @@
         self.assertEquals(len(self.open_sessions), 1, self.open_sessions)
         self.assertEquals(cnx.login, origcnx.login)
         self.assertEquals(cnx.password, origcnx.password)
-        self.assertEquals(cnx.anonymous_connection, False) 
+        self.assertEquals(cnx.anonymous_connection, False)
         self.assertEquals(path, 'view')
         self.assertEquals(params, {'__message': 'welcome %s !' % origcnx.login})
-    
+
     def _test_auth_fail(self, req):
         self.assertRaises(AuthenticationError, self.app.connect, req)
         self.assertEquals(req.cnx, None)
-        self.assertEquals(len(self.open_sessions), 0) 
+        self.assertEquals(len(self.open_sessions), 0)
         clear_cache(req, 'get_authorization')
-        
+
     def test_http_auth_no_anon(self):
         req, origcnx = self._init_auth('http')
         self._test_auth_fail(req)
@@ -318,7 +318,7 @@
         req._headers['Authorization'] = 'basic %s' % authstr
         self._test_auth_succeed(req, origcnx)
         self.assertRaises(AuthenticationError, self.publish, req, 'logout')
-        self.assertEquals(len(self.open_sessions), 0) 
+        self.assertEquals(len(self.open_sessions), 0)
 
     def test_cookie_auth_no_anon(self):
         req, origcnx = self._init_auth('cookie')
@@ -331,17 +331,37 @@
         req.form['__password'] = origcnx.password
         self._test_auth_succeed(req, origcnx)
         self.assertRaises(AuthenticationError, self.publish, req, 'logout')
-        self.assertEquals(len(self.open_sessions), 0) 
+        self.assertEquals(len(self.open_sessions), 0)
+
+    def test_login_by_email(self):
+        login = self.request().user.login
+        address = login + u'@localhost'
+        self.execute('INSERT EmailAddress X: X address %(address)s, U primary_email X '
+                     'WHERE U login %(login)s', {'address': address, 'login': login})
+        self.commit()
+        # option allow-email-login not set
+        req, origcnx = self._init_auth('cookie')
+        req.form['__login'] = address
+        req.form['__password'] = origcnx.password
+        self._test_auth_fail(req)
+        # option allow-email-login set
+        self.set_option('allow-email-login', True)
+        req, origcnx = self._init_auth('cookie')
+        req.form['__login'] = address
+        req.form['__password'] = origcnx.password
+        self._test_auth_succeed(req, origcnx)
+        self.assertRaises(AuthenticationError, self.publish, req, 'logout')
+        self.assertEquals(len(self.open_sessions), 0)
 
     def _test_auth_anon(self, req):
         self.app.connect(req)
         acnx = req.cnx
         self.assertEquals(len(self.open_sessions), 1)
-        self.assertEquals(acnx.login, 'anon') 
-        self.assertEquals(acnx.password, 'anon') 
+        self.assertEquals(acnx.login, 'anon')
+        self.assertEquals(acnx.password, 'anon')
         self.failUnless(acnx.anonymous_connection)
         self._reset_cookie(req)
-        
+
     def _reset_cookie(self, req):
         # preparing the suite of the test
         # set session id in cookie
@@ -351,15 +371,15 @@
         clear_cache(req, 'get_authorization')
         # reset cnx as if it was a new incoming request
         req.cnx = None
-        
+
     def _test_anon_auth_fail(self, req):
-        self.assertEquals(len(self.open_sessions), 1) 
+        self.assertEquals(len(self.open_sessions), 1)
         self.app.connect(req)
         self.assertEquals(req.message, 'authentication failure')
         self.assertEquals(req.cnx.anonymous_connection, True)
-        self.assertEquals(len(self.open_sessions), 1) 
+        self.assertEquals(len(self.open_sessions), 1)
         self._reset_cookie(req)
-        
+
     def test_http_auth_anon_allowed(self):
         req, origcnx = self._init_auth('http', 'anon')
         self._test_auth_anon(req)
@@ -370,8 +390,8 @@
         req._headers['Authorization'] = 'basic %s' % authstr
         self._test_auth_succeed(req, origcnx)
         self.assertRaises(AuthenticationError, self.publish, req, 'logout')
-        self.assertEquals(len(self.open_sessions), 0) 
-        
+        self.assertEquals(len(self.open_sessions), 0)
+
     def test_cookie_auth_anon_allowed(self):
         req, origcnx = self._init_auth('cookie', 'anon')
         self._test_auth_anon(req)
@@ -382,10 +402,8 @@
         req.form['__password'] = origcnx.password
         self._test_auth_succeed(req, origcnx)
         self.assertRaises(AuthenticationError, self.publish, req, 'logout')
-        self.assertEquals(len(self.open_sessions), 0) 
+        self.assertEquals(len(self.open_sessions), 0)
 
-    
 
-        
 if __name__ == '__main__':
     unittest_main()
diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_controller.py
--- a/web/test/unittest_controller.py	Tue May 05 17:18:49 2009 +0200
+++ b/web/test/unittest_controller.py	Thu May 14 12:48:11 2009 +0200
@@ -2,20 +2,29 @@
 
 """
 
-from mx.DateTime import DateTimeType, DateTimeDeltaType
+from datetime import datetime, date, time
 
 from logilab.common.testlib import unittest_main
 
 from cubicweb.devtools import apptest
 
 class BaseControllerTC(apptest.ControllerTC):
-    def test_parse_datetime(self):
-        self.assertIsInstance(self.ctrl.parse_datetime('2006/06/24 12:18'), DateTimeType)
-        self.assertIsInstance(self.ctrl.parse_datetime('2006/06/24'), DateTimeType)
-        self.assertIsInstance(self.ctrl.parse_datetime('2006/06/24 12:18', 'Datetime'), DateTimeType)
-        self.assertIsInstance(self.ctrl.parse_datetime('2006/06/24', 'Datetime'), DateTimeType)
-        self.assertIsInstance(self.ctrl.parse_datetime('2006/06/24', 'Date'), DateTimeType)
-        self.assertIsInstance(self.ctrl.parse_datetime('12:18', 'Time'), DateTimeDeltaType)
+
+    def test_parse_datetime_ok(self):
+        self.assertIsInstance(self.ctrl.parse_datetime('2006/06/24 12:18'),
+                              datetime)
+        self.assertIsInstance(self.ctrl.parse_datetime('2006/06/24'),
+                              date)
+        self.assertIsInstance(self.ctrl.parse_datetime('2006/06/24 12:18', 'Datetime'),
+                              datetime)
+        self.assertIsInstance(self.ctrl.parse_datetime('2006/06/24', 'Datetime'),
+                              datetime)
+        self.assertIsInstance(self.ctrl.parse_datetime('2006/06/24', 'Date'),
+                              date)
+        self.assertIsInstance(self.ctrl.parse_datetime('12:18', 'Time'),
+                              time)
+
+    def test_parse_datetime_ko(self):
         self.assertRaises(ValueError,
                           self.ctrl.parse_datetime, '2006/06/24 12:188', 'Datetime')
         self.assertRaises(ValueError,
@@ -28,6 +37,6 @@
                           self.ctrl.parse_datetime, '2006/06/240', 'Date')
         self.assertRaises(ValueError,
                           self.ctrl.parse_datetime, '12:188', 'Time')
-        
+
 if __name__ == '__main__':
     unittest_main()
diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_form.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/test/unittest_form.py	Thu May 14 12:48:11 2009 +0200
@@ -0,0 +1,183 @@
+from logilab.common.testlib import unittest_main, mock_object
+from cubicweb import Binary
+from cubicweb.devtools.testlib import WebTest
+from cubicweb.web.form import EntityFieldsForm, FieldsForm
+from cubicweb.web.formrenderers import FormRenderer
+from cubicweb.web.formfields import (IntField, StringField, RichTextField,
+                                     DateTimeField, DateTimePicker,
+                                     FileField, EditableFileField)
+from cubicweb.web.formwidgets import PasswordInput
+from cubicweb.web.views.workflow import ChangeStateForm
+
+
+class FieldsFormTC(WebTest):
+
+    def test_form_field_format(self):
+        form = FieldsForm(self.request(), None)
+        self.assertEquals(form.form_field_format(None), 'text/html')
+        self.execute('INSERT CWProperty X: X pkey "ui.default-text-format", X value "text/rest", X for_user U WHERE U login "admin"')
+        self.commit()
+        self.assertEquals(form.form_field_format(None), 'text/rest')
+
+
+class EntityFieldsFormTC(WebTest):
+
+    def setUp(self):
+        super(EntityFieldsFormTC, self).setUp()
+        self.req = self.request()
+        self.entity = self.user(self.req)
+        self.renderer = FormRenderer()
+
+    def test_form_field_vocabulary_unrelated(self):
+        b = self.add_entity('BlogEntry', title=u'di mascii code', content=u'a best-seller')
+        t = self.add_entity('Tag', name=u'x')
+        form1 = EntityFieldsForm(self.request(), None, entity=t)
+        unrelated = [reid for rview, reid in form1.subject_relation_vocabulary('tags')]
+        self.failUnless(b.eid in unrelated, unrelated)
+        form2 = EntityFieldsForm(self.request(), None, entity=b)
+        unrelated = [reid for rview, reid in form2.object_relation_vocabulary('tags')]
+        self.failUnless(t.eid in unrelated, unrelated)
+        self.execute('SET X tags Y WHERE X is Tag, Y is BlogEntry')
+        unrelated = [reid for rview, reid in form1.subject_relation_vocabulary('tags')]
+        self.failIf(b.eid in unrelated, unrelated)
+        unrelated = [reid for rview, reid in form2.object_relation_vocabulary('tags')]
+        self.failIf(t.eid in unrelated, unrelated)
+
+    def test_form_field_vocabulary_new_entity(self):
+        e = self.etype_instance('CWUser')
+        form = EntityFieldsForm(self.request(), None, entity=e)
+        unrelated = [rview for rview, reid in form.subject_relation_vocabulary('in_group')]
+        # should be default groups but owners, i.e. managers, users, guests
+        self.assertEquals(unrelated, [u'guests', u'managers', u'users'])
+
+    def test_subject_in_state_vocabulary(self):
+        # on a new entity
+        e = self.etype_instance('CWUser')
+        form = EntityFieldsForm(self.request(), None, entity=e)
+        states = list(form.subject_in_state_vocabulary('in_state'))
+        self.assertEquals(len(states), 1)
+        self.assertEquals(states[0][0], u'activated') # list of (combobox view, state eid)
+        # on an existant entity
+        e = self.user()
+        form = EntityFieldsForm(self.request(), None, entity=e)
+        states = list(form.subject_in_state_vocabulary('in_state'))
+        self.assertEquals(len(states), 1)
+        self.assertEquals(states[0][0], u'deactivated') # list of (combobox view, state eid)
+
+
+
+    # form view tests #########################################################
+
+    def test_massmailing_formview(self):
+        self.execute('INSERT EmailAddress X: X address L + "@cubicweb.org", '
+                     'U use_email X WHERE U is CWUser, U login L')
+        rset = self.execute('CWUser X')
+        self.view('massmailing', rset, template=None)
+
+
+    # form tests ##############################################################
+
+    def test_form_inheritance(self):
+        class CustomChangeStateForm(ChangeStateForm):
+            hello = IntField(name='youlou')
+            creation_date = DateTimeField(widget=DateTimePicker)
+        form = CustomChangeStateForm(self.req, redirect_path='perdu.com',
+                                     entity=self.entity)
+        form.form_render(state=123, trcomment=u'')
+
+    def test_change_state_form(self):
+        form = ChangeStateForm(self.req, redirect_path='perdu.com',
+                               entity=self.entity)
+        form.form_render(state=123, trcomment=u'')
+
+    # fields tests ############################################################
+
+    def _render_entity_field(self, name, form):
+        form.form_build_context({})
+        return form.field_by_name(name).render(form, self.renderer)
+
+    def _test_richtextfield(self, expected):
+        class RTFForm(EntityFieldsForm):
+            description = RichTextField()
+        state = self.execute('State X WHERE X name "activated", X state_of ET, ET name "CWUser"').get_entity(0, 0)
+        form = RTFForm(self.req, redirect_path='perdu.com', entity=state)
+        # make it think it can use fck editor anyway
+        form.form_field_format = lambda x: 'text/html'
+        self.assertTextEquals(self._render_entity_field('description', form),
+                              expected % {'eid': state.eid})
+
+
+    def test_richtextfield_1(self):
+        self.req.use_fckeditor = lambda: False
+        self._test_richtextfield('''<select id="description_format:%(eid)s" name="description_format:%(eid)s" size="1" style="display: block" tabindex="0">
+<option value="text/cubicweb-page-template">text/cubicweb-page-template</option>
+<option value="text/html">text/html</option>
+<option value="text/plain">text/plain</option>
+<option selected="selected" value="text/rest">text/rest</option>
+</select><textarea cols="60" id="description:%(eid)s" name="description:%(eid)s" onkeypress="autogrow(this)" rows="5" tabindex="1"/>''')
+
+
+    def test_richtextfield_2(self):
+        self.req.use_fckeditor = lambda: True
+        self._test_richtextfield('<input name="description_format:%(eid)s" style="display: block" type="hidden" value="text/rest"/><textarea cols="80" cubicweb:type="wysiwyg" id="description:%(eid)s" name="description:%(eid)s" onkeypress="autogrow(this)" rows="20" tabindex="0"/>')
+
+
+    def test_filefield(self):
+        class FFForm(EntityFieldsForm):
+            data = FileField(format_field=StringField(name='data_format'),
+                             encoding_field=StringField(name='data_encoding'))
+        file = self.add_entity('File', name=u"pouet.txt", data_encoding=u'UTF-8',
+                               data=Binary('new widgets system'))
+        form = FFForm(self.req, redirect_path='perdu.com', entity=file)
+        self.assertTextEquals(self._render_entity_field('data', form),
+                              '''<input id="data:%(eid)s" name="data:%(eid)s" tabindex="0" type="file" value=""/>
+<a href="javascript: toggleVisibility('data:%(eid)s-advanced')" title="show advanced fields"><img src="http://testing.fr/cubicweb/data/puce_down.png" alt="show advanced fields"/></a>
+<div id="data:%(eid)s-advanced" class="hidden">
+<label for="data_format:%(eid)s">data_format</label><input id="data_format:%(eid)s" name="data_format:%(eid)s" tabindex="1" type="text" value="text/plain"/><br/><br/>
+<label for="data_encoding:%(eid)s">data_encoding</label><input id="data_encoding:%(eid)s" name="data_encoding:%(eid)s" tabindex="2" type="text" value="UTF-8"/><br/><br/>
+</div>
+<br/>
+<input name="data:%(eid)s__detach" type="checkbox"/>
+detach attached file
+''' % {'eid': file.eid})
+
+
+    def test_editablefilefield(self):
+        class EFFForm(EntityFieldsForm):
+            data = EditableFileField(format_field=StringField(name='data_format'),
+                                     encoding_field=StringField(name='data_encoding'))
+            def form_field_encoding(self, field):
+                return 'ascii'
+            def form_field_format(self, field):
+                return 'text/plain'
+        file = self.add_entity('File', name=u"pouet.txt", data_encoding=u'UTF-8', 
+                               data=Binary('new widgets system'))
+        form = EFFForm(self.req, redirect_path='perdu.com', entity=file)
+        self.assertTextEquals(self._render_entity_field('data', form),
+                              '''<input id="data:%(eid)s" name="data:%(eid)s" tabindex="0" type="file" value=""/>
+<a href="javascript: toggleVisibility('data:%(eid)s-advanced')" title="show advanced fields"><img src="http://testing.fr/cubicweb/data/puce_down.png" alt="show advanced fields"/></a>
+<div id="data:%(eid)s-advanced" class="hidden">
+<label for="data_format:%(eid)s">data_format</label><input id="data_format:%(eid)s" name="data_format:%(eid)s" tabindex="1" type="text" value="text/plain"/><br/><br/>
+<label for="data_encoding:%(eid)s">data_encoding</label><input id="data_encoding:%(eid)s" name="data_encoding:%(eid)s" tabindex="2" type="text" value="UTF-8"/><br/><br/>
+</div>
+<br/>
+<input name="data:%(eid)s__detach" type="checkbox"/>
+detach attached file
+<p><b>You can either submit a new file using the browse button above, or choose to remove already uploaded file by checking the "detach attached file" check-box, or edit file content online with the widget below.</b></p>
+<textarea cols="80" name="data:%(eid)s" onkeypress="autogrow(this)" rows="20" tabindex="3">new widgets system

''' % {'eid': file.eid}) + + + def test_passwordfield(self): + class PFForm(EntityFieldsForm): + upassword = StringField(widget=PasswordInput) + form = PFForm(self.req, redirect_path='perdu.com', entity=self.entity) + self.assertTextEquals(self._render_entity_field('upassword', form), + ''' +
+ + +confirm password''' % {'eid': self.entity.eid}) + + +if __name__ == '__main__': + unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_formfields.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/test/unittest_formfields.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,84 @@ +"""unittests for cw.web.formfields""" + +from logilab.common.testlib import TestCase, unittest_main +from cubicweb.devtools import TestServerConfiguration +from cubicweb.web.formwidgets import PasswordInput, TextArea +from cubicweb.web.formfields import * +from cubicweb.entities.wfobjs import State +from cubicweb.entities.authobjs import CWUser +from cubes.file.entities import File + +config = TestServerConfiguration('data') +config.bootstrap_cubes() +schema = config.load_schema() +state_schema = schema['State'] +cwuser_schema = schema['CWUser'] +file_schema = schema['File'] + +class GuessFieldTC(TestCase): + + def test_state_fields(self): + title_field = guess_field(state_schema, schema['name']) + self.assertIsInstance(title_field, StringField) + self.assertEquals(title_field.required, True) + +# synopsis_field = guess_field(state_schema, schema['synopsis']) +# self.assertIsInstance(synopsis_field, StringField) +# self.assertIsInstance(synopsis_field.widget, TextArea) +# self.assertEquals(synopsis_field.required, False) +# self.assertEquals(synopsis_field.help, 'an abstract for this state') + + description_field = guess_field(state_schema, schema['description']) + self.assertIsInstance(description_field, RichTextField) + self.assertEquals(description_field.required, False) + self.assertEquals(description_field.format_field, None) + + description_format_field = guess_field(state_schema, schema['description_format']) + self.assertEquals(description_format_field, None) + + description_format_field = guess_field(state_schema, schema['description_format'], skip_meta_attr=False) + self.assertEquals(description_format_field.internationalizable, True) + self.assertEquals(description_format_field.sort, True) + self.assertEquals(description_format_field.initial(None), 'text/rest') + +# wikiid_field = guess_field(state_schema, schema['wikiid']) +# self.assertIsInstance(wikiid_field, StringField) +# self.assertEquals(wikiid_field.required, False) + + + def test_euser_fields(self): + upassword_field = guess_field(cwuser_schema, schema['upassword']) + self.assertIsInstance(upassword_field, StringField) + self.assertIsInstance(upassword_field.widget, PasswordInput) + self.assertEquals(upassword_field.required, True) + + last_login_time_field = guess_field(cwuser_schema, schema['last_login_time']) + self.assertIsInstance(last_login_time_field, DateTimeField) + self.assertEquals(last_login_time_field.required, False) + + in_group_field = guess_field(cwuser_schema, schema['in_group']) + self.assertIsInstance(in_group_field, RelationField) + self.assertEquals(in_group_field.required, True) + self.assertEquals(in_group_field.role, 'subject') + self.assertEquals(in_group_field.help, 'groups grant permissions to the user') + + owned_by_field = guess_field(cwuser_schema, schema['owned_by'], 'object') + self.assertIsInstance(owned_by_field, RelationField) + self.assertEquals(owned_by_field.required, False) + self.assertEquals(owned_by_field.role, 'object') + + + def test_file_fields(self): + data_format_field = guess_field(file_schema, schema['data_format']) + self.assertEquals(data_format_field, None) + data_encoding_field = guess_field(file_schema, schema['data_encoding']) + self.assertEquals(data_encoding_field, None) + + data_field = guess_field(file_schema, schema['data']) + self.assertIsInstance(data_field, FileField) + self.assertEquals(data_field.required, True) + self.assertIsInstance(data_field.format_field, StringField) + self.assertIsInstance(data_field.encoding_field, StringField) + +if __name__ == '__main__': + unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_magicsearch.py --- a/web/test/unittest_magicsearch.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_magicsearch.py Thu May 14 12:48:11 2009 +0200 @@ -11,7 +11,7 @@ translations = { - u'EUser' : u"Utilisateur", + u'CWUser' : u"Utilisateur", # u'Workcase' : u"Affaire", u'EmailAddress' : u"Adresse", # u'Division' : u"Division", @@ -33,7 +33,7 @@ class QueryTranslatorTC(EnvBasedTC): """test suite for QueryTranslatorTC""" - + def setUp(self): super(QueryTranslatorTC, self).setUp() self.req = self.env.create_request() @@ -54,7 +54,7 @@ self.assertEquals(rql, "Any P WHERE P use_email C, C is EmailAddress, C alias 'Logilab'") rql = "Any P WHERE P is Utilisateur, P adel C, P nom 'Smith'" rql, = self.proc.preprocess_query(rql, self.req) - self.assertEquals(rql, "Any P WHERE P is EUser, P use_email C, P surname 'Smith'") + self.assertEquals(rql, "Any P WHERE P is CWUser, P use_email C, P surname 'Smith'") class QSPreProcessorTC(EnvBasedTC): @@ -79,11 +79,11 @@ def test_attribute_translation(self): """tests QSPreProcessor._get_attribute_name""" translate = self.proc._get_attribute_name - eschema = self.schema.eschema('EUser') + eschema = self.schema.eschema('CWUser') self.assertEquals(translate(u'prÃ©nom', eschema), "firstname") self.assertEquals(translate(u'nom', eschema), 'surname') #self.assert_(translate(u'nom') in ('name', 'surname')) - eschema = self.schema.eschema('EmailAddress') + eschema = self.schema.eschema('EmailAddress') self.assertEquals(translate(u'adresse', eschema), "address") self.assertEquals(translate(u'nom', eschema), 'alias') # should fail if the name is not an attribute for the given entity schema @@ -95,10 +95,10 @@ transform = self.proc._one_word_query self.assertEquals(transform('123'), ('Any X WHERE X eid %(x)s', {'x': 123}, 'x')) - self.assertEquals(transform('EUser'), - ('EUser E',)) + self.assertEquals(transform('CWUser'), + ('CWUser C',)) self.assertEquals(transform('Utilisateur'), - ('EUser E',)) + ('CWUser C',)) self.assertEquals(transform('Adresse'), ('EmailAddress E',)) self.assertEquals(transform('adresse'), @@ -108,39 +108,39 @@ def test_two_words_query(self): """tests the 'two words shortcut queries'""" transform = self.proc._two_words_query - self.assertEquals(transform('EUser', 'E'), - ("EUser E",)) - self.assertEquals(transform('EUser', 'Smith'), - ('EUser E WHERE E has_text %(text)s', {'text': 'Smith'})) + self.assertEquals(transform('CWUser', 'E'), + ("CWUser E",)) + self.assertEquals(transform('CWUser', 'Smith'), + ('CWUser C WHERE C has_text %(text)s', {'text': 'Smith'})) self.assertEquals(transform('utilisateur', 'Smith'), - ('EUser E WHERE E has_text %(text)s', {'text': 'Smith'})) + ('CWUser C WHERE C has_text %(text)s', {'text': 'Smith'})) self.assertEquals(transform(u'adresse', 'Logilab'), ('EmailAddress E WHERE E has_text %(text)s', {'text': 'Logilab'})) self.assertEquals(transform(u'adresse', 'Logi%'), ('EmailAddress E WHERE E alias LIKE %(text)s', {'text': 'Logi%'})) self.assertRaises(BadRQLQuery, transform, "pers", "taratata") - #self.assertEquals(transform('EUser', '%mi'), 'EUser E WHERE P surname LIKE "%mi"') + #self.assertEquals(transform('CWUser', '%mi'), 'CWUser E WHERE P surname LIKE "%mi"') def test_three_words_query(self): """tests the 'three words shortcut queries'""" transform = self.proc._three_words_query self.assertEquals(transform('utilisateur', u'prÃ©nom', 'cubicweb'), - ('EUser E WHERE E firstname %(text)s', {'text': 'cubicweb'})) + ('CWUser C WHERE C firstname %(text)s', {'text': 'cubicweb'})) self.assertEquals(transform('utilisateur', 'nom', 'cubicweb'), - ('EUser E WHERE E surname %(text)s', {'text': 'cubicweb'})) + ('CWUser C WHERE C surname %(text)s', {'text': 'cubicweb'})) self.assertEquals(transform(u'adresse', 'nom', 'cubicweb'), ('EmailAddress E WHERE E alias %(text)s', {'text': 'cubicweb'})) self.assertEquals(transform('EmailAddress', 'nom', 'cubicweb'), - ('EmailAddress E WHERE E alias %(text)s', {'text': 'cubicweb'})) + ('EmailAddress E WHERE E alias %(text)s', {'text': 'cubicweb'})) self.assertEquals(transform('utilisateur', u'prÃ©nom', 'cubicweb%'), - ('EUser E WHERE E firstname LIKE %(text)s', {'text': 'cubicweb%'})) + ('CWUser C WHERE C firstname LIKE %(text)s', {'text': 'cubicweb%'})) # expanded shortcuts - self.assertEquals(transform('EUser', 'use_email', 'Logilab'), - ('EUser E WHERE E use_email E1, E1 has_text %(text)s', {'text': 'Logilab'})) - self.assertEquals(transform('EUser', 'use_email', '%Logilab'), - ('EUser E WHERE E use_email E1, E1 alias LIKE %(text)s', {'text': '%Logilab'})) + self.assertEquals(transform('CWUser', 'use_email', 'Logilab'), + ('CWUser C WHERE C use_email C1, C1 has_text %(text)s', {'text': 'Logilab'})) + self.assertEquals(transform('CWUser', 'use_email', '%Logilab'), + ('CWUser C WHERE C use_email C1, C1 alias LIKE %(text)s', {'text': '%Logilab'})) self.assertRaises(BadRQLQuery, transform, 'word1', 'word2', 'word3') - + def test_multiple_words_query(self): """tests multiple_words_query()""" self.assertEquals(self.proc._multiple_words_query(['a', 'b', 'c', 'd', 'e']), @@ -150,33 +150,33 @@ """tests how quoted queries are handled""" queries = [ (u'Adresse "My own EmailAddress"', ('EmailAddress E WHERE E has_text %(text)s', {'text': u'My own EmailAddress'})), - (u'Utilisateur prÃ©nom "Jean Paul"', ('EUser E WHERE E firstname %(text)s', {'text': 'Jean Paul'})), - (u'Utilisateur firstname "Jean Paul"', ('EUser E WHERE E firstname %(text)s', {'text': 'Jean Paul'})), - (u'EUser firstname "Jean Paul"', ('EUser E WHERE E firstname %(text)s', {'text': 'Jean Paul'})), + (u'Utilisateur prÃ©nom "Jean Paul"', ('CWUser C WHERE C firstname %(text)s', {'text': 'Jean Paul'})), + (u'Utilisateur firstname "Jean Paul"', ('CWUser C WHERE C firstname %(text)s', {'text': 'Jean Paul'})), + (u'CWUser firstname "Jean Paul"', ('CWUser C WHERE C firstname %(text)s', {'text': 'Jean Paul'})), ] transform = self.proc._quoted_words_query for query, expected in queries: self.assertEquals(transform(query), expected) self.assertRaises(BadRQLQuery, transform, "unquoted rql") self.assertRaises(BadRQLQuery, transform, 'pers "Jean Paul"') - self.assertRaises(BadRQLQuery, transform, 'EUser firstname other "Jean Paul"') - + self.assertRaises(BadRQLQuery, transform, 'CWUser firstname other "Jean Paul"') + def test_process_query(self): """tests how queries are processed""" queries = [ - (u'Utilisateur', (u"EUser E",)), - (u'Utilisateur P', (u"EUser P",)), - (u'Utilisateur cubicweb', (u'EUser E WHERE E has_text %(text)s', {'text': u'cubicweb'})), - (u'EUser prÃ©nom cubicweb', (u'EUser E WHERE E firstname %(text)s', {'text': 'cubicweb'},)), + (u'Utilisateur', (u"CWUser C",)), + (u'Utilisateur P', (u"CWUser P",)), + (u'Utilisateur cubicweb', (u'CWUser C WHERE C has_text %(text)s', {'text': u'cubicweb'})), + (u'CWUser prÃ©nom cubicweb', (u'CWUser C WHERE C firstname %(text)s', {'text': 'cubicweb'},)), (u'Any X WHERE X is Something', (u"Any X WHERE X is Something",)), ] for query, expected in queries: self.assertEquals(self.proc.preprocess_query(query, self.req), expected) - + ## Processor Chains tests ############################################ - + class ProcessorChainTC(EnvBasedTC): """test suite for magic_search's processor chains""" @@ -195,11 +195,11 @@ # XXX this sounds like a language translator test... # and it fail (u'Utilisateur Smith', - ('EUser E WHERE E has_text %(text)s', {'text': u'Smith'})), + ('CWUser C WHERE C has_text %(text)s', {'text': u'Smith'})), (u'utilisateur nom Smith', - ('EUser E WHERE E surname %(text)s', {'text': u'Smith'})), + ('CWUser C WHERE C surname %(text)s', {'text': u'Smith'})), (u'Any P WHERE P is Utilisateur, P nom "Smith"', - ('Any P WHERE P is EUser, P surname "Smith"', None)), + ('Any P WHERE P is CWUser, P surname "Smith"', None)), ] for query, expected in queries: rset = self.proc.process_query(query, self.req) @@ -213,12 +213,12 @@ def test_explicit_component(self): self.assertRaises(RQLSyntaxError, - self.proc.process_query, u'rql: EUser E WHERE E noattr "Smith",', self.req) + self.proc.process_query, u'rql: CWUser E WHERE E noattr "Smith",', self.req) self.assertRaises(BadRQLQuery, - self.proc.process_query, u'rql: EUser E WHERE E noattr "Smith"', self.req) + self.proc.process_query, u'rql: CWUser E WHERE E noattr "Smith"', self.req) rset = self.proc.process_query(u'text: utilisateur Smith', self.req) self.assertEquals(rset.rql, 'Any X WHERE X has_text %(text)s') self.assertEquals(rset.args, {'text': u'utilisateur Smith'}) - + if __name__ == '__main__': unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_owl.py --- a/web/test/unittest_owl.py Tue May 05 17:18:49 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,4075 +0,0 @@ -"""unittests for schema2dot""" - -import os - -from logilab.common.testlib import TestCase, unittest_main -from logilab.common.compat import set -from cubicweb.devtools.testlib import WebTest - -from lxml import etree -from StringIO import StringIO - - -class OWLTC(WebTest): - - def test_schema2owl(self): - - parser = etree.XMLParser(dtd_validation=True) - - owl= StringIO(''' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -''') - - rdf = StringIO(''' - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ''') - - - xmlschema_rdf = etree.parse(rdf) - xmlschema_owl = etree.parse(owl) - - owlschema = etree.XMLSchema(xmlschema_owl) - valid = StringIO(''' - - - - - - - ]> - - - - - inst_jplorg2 Cubicweb OWL Ontology - - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - - n - - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - 1 - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - 1 - 1 - - - - - - 1 - 1 - - - - - - n - - - - - - n - - - - - - 1 - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - 1 - - - - - - 1 - - - - - - 1 - - - - - - 1 - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - n - - - - - - 1 - 1 - - - - - - n - - - - - - 1 - 1 - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - n - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ''') - doc = etree.parse(valid) - owlschema.validate(doc) - -if __name__ == '__main__': - unittest_main() - diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_urlpublisher.py --- a/web/test/unittest_urlpublisher.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_urlpublisher.py Thu May 14 12:48:11 2009 +0200 @@ -21,11 +21,11 @@ b = self.add_entity('BlogEntry', title=u'hell\'o', content=u'blabla') c = self.add_entity('Tag', name=u'yo') # take care: Tag's name normalized to lower case self.execute('SET C tags B WHERE C eid %(c)s, B eid %(b)s', {'c':c.eid, 'b':b.eid}, 'b') - + def process(self, url): req = self.req = self.request() return self.env.app.url_resolver.process(req, url) - + def test_raw_path(self): """tests raw path resolution'""" self.assertEquals(self.process('view'), ('view', None)) @@ -41,32 +41,32 @@ def test_rest_path(self): """tests the rest path resolution""" - ctrl, rset = self.process('EUser') + ctrl, rset = self.process('CWUser') self.assertEquals(ctrl, 'view') - self.assertEquals(rset.description[0][0], 'EUser') + self.assertEquals(rset.description[0][0], 'CWUser') self.assertEquals(rset.printable_rql(), - "Any X,AA,AB,AC,AD ORDERBY AA WHERE X is EUser, X login AA, X firstname AB, X surname AC, X modification_date AD") - ctrl, rset = self.process('EUser/login/admin') + "Any X,AA,AB,AC,AD ORDERBY AA WHERE X is CWUser, X login AA, X firstname AB, X surname AC, X modification_date AD") + ctrl, rset = self.process('CWUser/login/admin') self.assertEquals(ctrl, 'view') self.assertEquals(len(rset), 1) - self.assertEquals(rset.description[0][0], 'EUser') - self.assertEquals(rset.printable_rql(), 'Any X WHERE X is EUser, X login "admin"') - ctrl, rset = self.process('euser/admin') + self.assertEquals(rset.description[0][0], 'CWUser') + self.assertEquals(rset.printable_rql(), 'Any X WHERE X is CWUser, X login "admin"') + ctrl, rset = self.process('cwuser/admin') self.assertEquals(ctrl, 'view') self.assertEquals(len(rset), 1) - self.assertEquals(rset.description[0][0], 'EUser') - self.assertEquals(rset.printable_rql(), 'Any X WHERE X is EUser, X login "admin"') - ctrl, rset = self.process('euser/eid/%s'%rset[0][0]) + self.assertEquals(rset.description[0][0], 'CWUser') + self.assertEquals(rset.printable_rql(), 'Any X WHERE X is CWUser, X login "admin"') + ctrl, rset = self.process('cwuser/eid/%s'%rset[0][0]) self.assertEquals(ctrl, 'view') self.assertEquals(len(rset), 1) - self.assertEquals(rset.description[0][0], 'EUser') - self.assertEquals(rset.printable_rql(), 'Any X WHERE X is EUser, X eid 5') + self.assertEquals(rset.description[0][0], 'CWUser') + self.assertEquals(rset.printable_rql(), 'Any X WHERE X is CWUser, X eid 5') # test non-ascii paths - ctrl, rset = self.process('EUser/login/%C3%BFsa%C3%BFe') + ctrl, rset = self.process('CWUser/login/%C3%BFsa%C3%BFe') self.assertEquals(ctrl, 'view') self.assertEquals(len(rset), 1) - self.assertEquals(rset.description[0][0], 'EUser') - self.assertEquals(rset.printable_rql(), u'Any X WHERE X is EUser, X login "ÿsaÿe"') + self.assertEquals(rset.description[0][0], 'CWUser') + self.assertEquals(rset.printable_rql(), u'Any X WHERE X is CWUser, X login "ÿsaÿe"') # test quoted paths ctrl, rset = self.process('BlogEntry/title/hell%27o') self.assertEquals(ctrl, 'view') @@ -74,10 +74,10 @@ self.assertEquals(rset.description[0][0], 'BlogEntry') self.assertEquals(rset.printable_rql(), u'Any X WHERE X is BlogEntry, X title "hell\'o"') # errors - self.assertRaises(NotFound, self.process, 'EUser/eid/30000') + self.assertRaises(NotFound, self.process, 'CWUser/eid/30000') self.assertRaises(NotFound, self.process, 'Workcases') - self.assertRaises(NotFound, self.process, 'EUser/inexistant_attribute/joe') - + self.assertRaises(NotFound, self.process, 'CWUser/inexistant_attribute/joe') + def test_action_path(self): """tests the action path resolution""" self.assertRaises(Redirect, self.process, '1/edit') @@ -85,14 +85,14 @@ self.assertRaises(Redirect, self.process, 'Tag/yo/edit') self.assertRaises(NotFound, self.process, 'view/edit') self.assertRaises(NotFound, self.process, '1/non_action') - self.assertRaises(NotFound, self.process, 'EUser/login/admin/non_action') + self.assertRaises(NotFound, self.process, 'CWUser/login/admin/non_action') def test_regexp_path(self): """tests the regexp path resolution""" ctrl, rset = self.process('add/Task') self.assertEquals(ctrl, 'view') - self.assertEquals(rset, None) + self.assertEquals(rset, None) self.assertEquals(self.req.form, {'etype' : "Task", 'vid' : "creation"}) self.assertRaises(NotFound, self.process, 'add/foo/bar') @@ -103,11 +103,11 @@ try: path = str(FakeRequest().url_quote(u'été')) ctrl, rset = self.process(path) - self.assertEquals(rset, None) + self.assertEquals(rset, None) self.assertEquals(self.req.form, {'vid' : "foo"}) finally: SimpleReqRewriter.rules = oldrules - + if __name__ == '__main__': unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_urlrewrite.py --- a/web/test/unittest_urlrewrite.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_urlrewrite.py Thu May 14 12:48:11 2009 +0200 @@ -28,14 +28,14 @@ ('/manage', dict(vid='manage')), ('/notfound', {'vid': '404'}), ('/error', {'vid': 'error'}), - ('/schema/([^/]+?)/?$', {'rql': r'Any X WHERE X is EEType, X name "\1"', 'vid': 'eschema'}), + ('/schema/([^/]+?)/?$', {'rql': r'Any X WHERE X is CWEType, X name "\1"', 'vid': 'eschema'}), ('/add/([^/]+?)/?$' , dict(vid='creation', etype=r'\1')), ('/doc/images/(.+?)/?$', dict(fid='\\1', vid='wdocimages')), ('/doc/?$', dict(fid='main', vid='wdoc')), ('/doc/(.+?)/?$', dict(fid='\\1', vid='wdoc')), ('/changelog/?$', dict(vid='changelog')), # now in SchemaBasedRewriter - #('/search/(.+)$', dict(rql=r'Any X WHERE X has_text "\1"')), + #('/search/(.+)$', dict(rql=r'Any X WHERE X has_text "\1"')), ]) @@ -94,8 +94,8 @@ pmid, rset = rewriter.rewrite(req, u'/DaLToN/JoE') self.assertEquals(len(rset), 1) self.assertEquals(rset[0][0], self.p1.eid) - - + + if __name__ == '__main__': unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_views_actions.py --- a/web/test/unittest_views_actions.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_views_actions.py Thu May 14 12:48:11 2009 +0200 @@ -4,11 +4,11 @@ class ActionsTC(EnvBasedTC): def test_view_action(self): - req = self.request(__message='bla bla bla', vid='rss', rql='EUser X') - rset = self.execute('EUser X') + req = self.request(__message='bla bla bla', vid='rss', rql='CWUser X') + rset = self.execute('CWUser X') vaction = [action for action in self.vreg.possible_vobjects('actions', req, rset) if action.id == 'view'][0] - self.assertEquals(vaction.url(), 'http://testing.fr/cubicweb/view?rql=EUser%20X') + self.assertEquals(vaction.url(), 'http://testing.fr/cubicweb/view?rql=CWUser%20X') def test_sendmail_action(self): req = self.request() @@ -20,6 +20,6 @@ rset = self.execute('Any X WHERE X login "anon"', req=req) self.failIf([action for action in self.vreg.possible_vobjects('actions', req, rset) if action.id == 'sendemail']) - + if __name__ == '__main__': unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_views_basecontrollers.py --- a/web/test/unittest_views_basecontrollers.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_views_basecontrollers.py Thu May 14 12:48:11 2009 +0200 @@ -11,34 +11,34 @@ from cubicweb.common.uilib import rql_for_eid from cubicweb.web import INTERNAL_FIELD_VALUE, Redirect, RequestError -from cubicweb.web.views.basecontrollers import xmlize +from cubicweb.web.views.basecontrollers import xhtml_wrap -from cubicweb.entities.authobjs import EUser +from cubicweb.entities.authobjs import CWUser class EditControllerTC(ControllerTC): def setUp(self): ControllerTC.setUp(self) - self.failUnless('users' in self.schema.eschema('EGroup').get_groups('read')) - + self.failUnless('users' in self.schema.eschema('CWGroup').get_groups('read')) + def tearDown(self): ControllerTC.tearDown(self) - self.failUnless('users' in self.schema.eschema('EGroup').get_groups('read')) - + self.failUnless('users' in self.schema.eschema('CWGroup').get_groups('read')) + def test_noparam_edit(self): """check behaviour of this controller without any form parameter """ - + self.req.form = {} self.assertRaises(ValidationError, self.publish, self.req) - + def test_validation_unique(self): """test creation of two linked entities - """ + """ user = self.user() - self.req.form = {'eid': 'X', '__type:X': 'EUser', - 'login:X': u'admin', 'edits-login:X': u'', - 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', + self.req.form = {'eid': 'X', '__type:X': 'CWUser', + 'login:X': u'admin', 'edits-login:X': u'', + 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', } self.assertRaises(ValidationError, self.publish, self.req) @@ -47,13 +47,13 @@ """checking that a manager user can edit itself """ user = self.user() - basegroups = [str(eid) for eid, in self.execute('EGroup G WHERE X in_group G, X eid %(x)s', {'x': user.eid})] - groupeids = [eid for eid, in self.execute('EGroup G WHERE G name in ("managers", "users")')] + basegroups = [str(eid) for eid, in self.execute('CWGroup G WHERE X in_group G, X eid %(x)s', {'x': user.eid})] + groupeids = [eid for eid, in self.execute('CWGroup G WHERE G name in ("managers", "users")')] groups = [str(eid) for eid in groupeids] stateeid = [eid for eid, in self.execute('State S WHERE S name "activated"')][0] self.req.form = { 'eid': `user.eid`, - '__type:'+`user.eid`: 'EUser', + '__type:'+`user.eid`: 'CWUser', 'login:'+`user.eid`: unicode(user.login), 'firstname:'+`user.eid`: u'Th\xe9nault', 'surname:'+`user.eid`: u'Sylvain', @@ -78,10 +78,10 @@ user = self.create_user('user') cnx = self.login('user') req = self.request() - #self.assertEquals(self.ctrl.schema['EUser']._groups['read'], + #self.assertEquals(self.ctrl.schema['CWUser']._groups['read'], # ('managers', 'users')) req.form = { - 'eid': `user.eid`, '__type:'+`user.eid`: 'EUser', + 'eid': `user.eid`, '__type:'+`user.eid`: 'CWUser', '__maineid' : str(user.eid), 'upassword:'+`user.eid`: 'tournicoton', 'upassword-confirm:'+`user.eid`: 'tournicoton', @@ -89,7 +89,7 @@ } path, params = self.expect_redirect_publish(req) cnx.commit() # commit to check we don't get late validation error for instance - self.assertEquals(path, 'euser/user') + self.assertEquals(path, 'cwuser/user') self.failIf('vid' in params) def testr_user_editing_itself_no_relation(self): @@ -97,10 +97,10 @@ relations (meaning no changes) """ user = self.user() - groupeids = [eid for eid, in self.execute('EGroup G WHERE X in_group G, X eid %(x)s', {'x': user.eid})] + groupeids = [eid for eid, in self.execute('CWGroup G WHERE X in_group G, X eid %(x)s', {'x': user.eid})] self.req.form = { 'eid': `user.eid`, - '__type:'+`user.eid`: 'EUser', + '__type:'+`user.eid`: 'CWUser', 'login:'+`user.eid`: unicode(user.login), 'firstname:'+`user.eid`: u'Th\xe9nault', 'surname:'+`user.eid`: u'Sylvain', @@ -117,42 +117,42 @@ self.assertEquals([g.eid for g in e.in_group], groupeids) stateeids = [eid for eid, in self.execute('State S WHERE S name "activated"')] self.assertEquals([s.eid for s in e.in_state], stateeids) - - + + def test_create_multiple_linked(self): - gueid = self.execute('EGroup G WHERE G name "users"')[0][0] + gueid = self.execute('CWGroup G WHERE G name "users"')[0][0] self.req.form = {'eid': ['X', 'Y'], - - '__type:X': 'EUser', + + '__type:X': 'CWUser', '__maineid' : 'X', - 'login:X': u'adim', 'edits-login:X': u'', - 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', + 'login:X': u'adim', 'edits-login:X': u'', + 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', 'surname:X': u'Di Mascio', 'edits-surname:X': '', - 'in_group:X': `gueid`, 'edits-in_group:X': INTERNAL_FIELD_VALUE, - + 'in_group:X': `gueid`, 'edits-in_group:X': INTERNAL_FIELD_VALUE, + '__type:Y': 'EmailAddress', 'address:Y': u'dima@logilab.fr', 'edits-address:Y': '', - 'use_email:X': 'Y', 'edits-use_email:X': INTERNAL_FIELD_VALUE, + 'use_email:X': 'Y', 'edits-use_email:X': INTERNAL_FIELD_VALUE, } path, params = self.expect_redirect_publish() # should be redirected on the created person - self.assertEquals(path, 'euser/adim') + self.assertEquals(path, 'cwuser/adim') e = self.execute('Any P WHERE P surname "Di Mascio"').get_entity(0, 0) self.assertEquals(e.surname, 'Di Mascio') email = e.use_email[0] self.assertEquals(email.address, 'dima@logilab.fr') - + def test_edit_multiple_linked(self): peid = self.create_user('adim').eid self.req.form = {'eid': [`peid`, 'Y'], - '__type:%s'%peid: 'EUser', + '__type:%s'%peid: 'CWUser', 'surname:%s'%peid: u'Di Masci', 'edits-surname:%s'%peid: '', - + '__type:Y': 'EmailAddress', 'address:Y': u'dima@logilab.fr', 'edits-address:Y': '', 'use_email:%s'%peid: 'Y', 'edits-use_email:%s'%peid: INTERNAL_FIELD_VALUE, - + '__redirectrql': 'Any X WHERE X eid %s'%peid, } path, params = self.expect_redirect_publish() @@ -162,14 +162,14 @@ self.assertEquals(e.surname, 'Di Masci') email = e.use_email[0] self.assertEquals(email.address, 'dima@logilab.fr') - + emaileid = email.eid self.req.form = {'eid': [`peid`, `emaileid`], - '__type:%s'%peid: 'EUser', + '__type:%s'%peid: 'CWUser', 'surname:%s'%peid: u'Di Masci', 'edits-surname:%s'%peid: 'Di Masci', '__type:%s'%emaileid: 'EmailAddress', 'address:%s'%emaileid: u'adim@logilab.fr', 'edits-address:%s'%emaileid: 'dima@logilab.fr', - 'use_email:%s'%peid: `emaileid`, 'edits-use_email:%s'%peid: `emaileid`, + 'use_email:%s'%peid: `emaileid`, 'edits-use_email:%s'%peid: `emaileid`, '__redirectrql': 'Any X WHERE X eid %s'%peid, } path, params = self.expect_redirect_publish() @@ -180,21 +180,21 @@ email = e.use_email[0] self.assertEquals(email.address, 'adim@logilab.fr') - + def test_password_confirm(self): """test creation of two linked entities - """ + """ user = self.user() self.req.form = {'__cloned_eid:X': user.eid, - 'eid': 'X', '__type:X': 'EUser', - 'login:X': u'toto', 'edits-login:X': u'', - 'upassword:X': u'toto', 'edits-upassword:X': u'', + 'eid': 'X', '__type:X': 'CWUser', + 'login:X': u'toto', 'edits-login:X': u'', + 'upassword:X': u'toto', 'edits-upassword:X': u'', } self.assertRaises(ValidationError, self.publish, self.req) self.req.form = {'__cloned_eid:X': user.eid, - 'eid': 'X', '__type:X': 'EUser', - 'login:X': u'toto', 'edits-login:X': u'', - 'upassword:X': u'toto', 'upassword-confirm:X': u'tutu', 'edits-upassword:X': u'', + 'eid': 'X', '__type:X': 'CWUser', + 'login:X': u'toto', 'edits-login:X': u'', + 'upassword:X': u'toto', 'upassword-confirm:X': u'tutu', 'edits-upassword:X': u'', } self.assertRaises(ValidationError, self.publish, self.req) @@ -220,14 +220,14 @@ 'described_by_test:X': str(feid), 'edits-described_by_test:X': INTERNAL_FIELD_VALUE, } self.expect_redirect_publish() - # should be redirected on the created + # should be redirected on the created #eid = params['rql'].split()[-1] e = self.execute('Salesterm X').get_entity(0, 0) self.assertEquals(e.amount, 10) def test_req_pending_insert(self): """make sure req's pending insertions are taken into account""" - tmpgroup = self.add_entity('EGroup', name=u"test") + tmpgroup = self.add_entity('CWGroup', name=u"test") user = self.user() self.req.set_session_data('pending_insert', set([(user.eid, 'in_group', tmpgroup.eid)])) path, params = self.expect_redirect_publish() @@ -240,7 +240,7 @@ def test_req_pending_delete(self): """make sure req's pending deletions are taken into account""" user = self.user() - groupeid = self.execute('INSERT EGroup G: G name "test", U in_group G WHERE U eid %(x)s', + groupeid = self.execute('INSERT CWGroup G: G name "test", U in_group G WHERE U eid %(x)s', {'x': user.eid})[0][0] usergroups = [gname for gname, in self.execute('Any N WHERE G name N, U in_group G, U eid %(u)s', {'u': user.eid})] @@ -258,13 +258,13 @@ def custom_login_edit(self, formparams, value, relations): formparams['login'] = value.upper() relations.append('X login %(login)s') - EUser.custom_login_edit = custom_login_edit + CWUser.custom_login_edit = custom_login_edit try: user = self.user() eid = repr(user.eid) self.req.form = { 'eid': eid, - '__type:'+eid: 'EUser', + '__type:'+eid: 'CWUser', 'login:'+eid: u'foo', 'edits-login:'+eid: unicode(user.login), } @@ -272,8 +272,8 @@ rset = self.execute('Any L WHERE X eid %(x)s, X login L', {'x': user.eid}, 'x') self.assertEquals(rset[0][0], 'FOO') finally: - del EUser.custom_login_edit - + del CWUser.custom_login_edit + def test_redirect_apply_button(self): redirectrql = rql_for_eid(4012) # whatever self.req.form = { @@ -329,7 +329,7 @@ self.req.form = {'eid': str(eid), '__type:%s'%eid: 'EmailAddress', '__action_delete': ''} path, params = self.expect_redirect_publish() - self.assertEquals(path, 'euser/admin') + self.assertEquals(path, 'cwuser/admin') self.assertEquals(params, {u'__message': u'entity deleted'}) eid1 = self.add_entity('BlogEntry', title=u'hop', content=u'hop').eid eid2 = self.add_entity('EmailAddress', address=u'hop@logilab.fr').eid @@ -342,74 +342,74 @@ self.assertEquals(params, {u'__message': u'entities deleted'}) def test_nonregr_egroup_etype_editing(self): - """non-regression test checking that a manager user can edit a EEType entity (EGroup) + """non-regression test checking that a manager user can edit a CWEType entity (CWGroup) """ - groupeids = [eid for eid, in self.execute('EGroup G WHERE G name "managers"')] + groupeids = [eid for eid, in self.execute('CWGroup G WHERE G name "managers"')] groups = [str(eid) for eid in groupeids] - eeetypeeid = self.execute('EEType X WHERE X name "EGroup"')[0][0] - basegroups = [str(eid) for eid, in self.execute('EGroup G WHERE X read_permission G, X eid %(x)s', {'x': eeetypeeid})] + eeetypeeid = self.execute('CWEType X WHERE X name "CWGroup"')[0][0] + basegroups = [str(eid) for eid, in self.execute('CWGroup G WHERE X read_permission G, X eid %(x)s', {'x': eeetypeeid})] self.req.form = { 'eid': `eeetypeeid`, - '__type:'+`eeetypeeid`: 'EEType', - 'name:'+`eeetypeeid`: u'EGroup', + '__type:'+`eeetypeeid`: 'CWEType', + 'name:'+`eeetypeeid`: u'CWGroup', 'final:'+`eeetypeeid`: False, 'meta:'+`eeetypeeid`: True, - 'description:'+`eeetypeeid`: u'users group', + 'description:'+`eeetypeeid`: u'users group', 'read_permission:'+`eeetypeeid`: groups, # - 'edits-name:'+`eeetypeeid`: u'EGroup', + 'edits-name:'+`eeetypeeid`: u'CWGroup', 'edits-final:'+`eeetypeeid`: False, 'edits-meta:'+`eeetypeeid`: True, - 'edits-description:'+`eeetypeeid`: u'users group', + 'edits-description:'+`eeetypeeid`: u'users group', 'edits-read_permission:'+`eeetypeeid`: basegroups, } try: path, params = self.expect_redirect_publish() e = self.execute('Any X WHERE X eid %(x)s', {'x': eeetypeeid}, 'x').get_entity(0, 0) - self.assertEquals(e.name, 'EGroup') + self.assertEquals(e.name, 'CWGroup') self.assertEquals([g.eid for g in e.read_permission], groupeids) finally: # restore - self.execute('SET X read_permission Y WHERE X name "EGroup", Y eid IN (%s), NOT X read_permission Y' % (','.join(basegroups))) + self.execute('SET X read_permission Y WHERE X name "CWGroup", Y eid IN (%s), NOT X read_permission Y' % (','.join(basegroups))) self.commit() - + def test_nonregr_eetype_etype_editing(self): - """non-regression test checking that a manager user can edit a EEType entity (EEType) + """non-regression test checking that a manager user can edit a CWEType entity (CWEType) """ - groupeids = sorted(eid for eid, in self.execute('EGroup G WHERE G name in ("managers", "users")')) + groupeids = sorted(eid for eid, in self.execute('CWGroup G WHERE G name in ("managers", "users")')) groups = [str(eid) for eid in groupeids] - eeetypeeid = self.execute('EEType X WHERE X name "EEType"')[0][0] - basegroups = [str(eid) for eid, in self.execute('EGroup G WHERE X read_permission G, X eid %(x)s', {'x': eeetypeeid})] + eeetypeeid = self.execute('CWEType X WHERE X name "CWEType"')[0][0] + basegroups = [str(eid) for eid, in self.execute('CWGroup G WHERE X read_permission G, X eid %(x)s', {'x': eeetypeeid})] self.req.form = { 'eid': `eeetypeeid`, - '__type:'+`eeetypeeid`: 'EEType', - 'name:'+`eeetypeeid`: u'EEType', + '__type:'+`eeetypeeid`: 'CWEType', + 'name:'+`eeetypeeid`: u'CWEType', 'final:'+`eeetypeeid`: False, 'meta:'+`eeetypeeid`: True, - 'description:'+`eeetypeeid`: u'users group', + 'description:'+`eeetypeeid`: u'users group', 'read_permission:'+`eeetypeeid`: groups, - 'edits-name:'+`eeetypeeid`: u'EEType', + 'edits-name:'+`eeetypeeid`: u'CWEType', 'edits-final:'+`eeetypeeid`: False, 'edits-meta:'+`eeetypeeid`: True, - 'edits-description:'+`eeetypeeid`: u'users group', + 'edits-description:'+`eeetypeeid`: u'users group', 'edits-read_permission:'+`eeetypeeid`: basegroups, } try: path, params = self.expect_redirect_publish() e = self.execute('Any X WHERE X eid %(x)s', {'x': eeetypeeid}, 'x').get_entity(0, 0) - self.assertEquals(e.name, 'EEType') + self.assertEquals(e.name, 'CWEType') self.assertEquals(sorted(g.eid for g in e.read_permission), groupeids) finally: # restore - self.execute('SET X read_permission Y WHERE X name "EEType", Y eid IN (%s), NOT X read_permission Y' % (','.join(basegroups))) + self.execute('SET X read_permission Y WHERE X name "CWEType", Y eid IN (%s), NOT X read_permission Y' % (','.join(basegroups))) self.commit() - + def test_nonregr_strange_text_input(self): """non-regression test checking text input containing "13:03:43" this seems to be postgres (tsearch?) specific - """ + """ self.req.form = { 'eid': 'A', '__type:A': 'BlogEntry', '__maineid' : 'A', @@ -424,32 +424,32 @@ def test_nonregr_multiple_empty_email_addr(self): - gueid = self.execute('EGroup G WHERE G name "users"')[0][0] + gueid = self.execute('CWGroup G WHERE G name "users"')[0][0] self.req.form = {'eid': ['X', 'Y'], - - '__type:X': 'EUser', - 'login:X': u'adim', 'edits-login:X': u'', - 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', - 'in_group:X': `gueid`, 'edits-in_group:X': INTERNAL_FIELD_VALUE, - + + '__type:X': 'CWUser', + 'login:X': u'adim', 'edits-login:X': u'', + 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', + 'in_group:X': `gueid`, 'edits-in_group:X': INTERNAL_FIELD_VALUE, + '__type:Y': 'EmailAddress', 'address:Y': u'', 'edits-address:Y': '', 'alias:Y': u'', 'edits-alias:Y': '', - 'use_email:X': 'Y', 'edits-use_email:X': INTERNAL_FIELD_VALUE, + 'use_email:X': 'Y', 'edits-use_email:X': INTERNAL_FIELD_VALUE, } self.assertRaises(ValidationError, self.publish, self.req) def test_nonregr_copy(self): user = self.user() self.req.form = {'__cloned_eid:X': user.eid, - 'eid': 'X', '__type:X': 'EUser', + 'eid': 'X', '__type:X': 'CWUser', '__maineid' : 'X', - 'login:X': u'toto', 'edits-login:X': u'', - 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', + 'login:X': u'toto', 'edits-login:X': u'', + 'upassword:X': u'toto', 'upassword-confirm:X': u'toto', 'edits-upassword:X': u'', } path, params = self.expect_redirect_publish() - self.assertEquals(path, 'euser/toto') - e = self.execute('Any X WHERE X is EUser, X login "toto"').get_entity(0, 0) + self.assertEquals(path, 'cwuser/toto') + e = self.execute('Any X WHERE X is CWUser, X login "toto"').get_entity(0, 0) self.assertEquals(e.login, 'toto') self.assertEquals(e.in_group[0].name, 'managers') @@ -464,8 +464,8 @@ self.execute('SET P use_email E, P primary_email E WHERE P eid %(p)s, E eid %(e)s', {'p' : p.eid, 'e' : e.eid}) self.req.form = {'__cloned_eid:X': p.eid, - 'eid': 'X', '__type:X': 'EUser', - 'login': u'dodo', 'edits-login': u'dodo', + 'eid': 'X', '__type:X': 'CWUser', + 'login': u'dodo', 'edits-login': u'dodo', 'surname:X': u'Boom', 'edits-surname:X': u'', '__errorurl' : "whatever but required", } @@ -479,7 +479,7 @@ self.req.form['rql'] = 'Any X WHERE X eid %s' % p.eid self.req.form['vid'] = 'copy' self.env.app.publish('view', self.req) - rset = self.execute('EUser P WHERE P surname "Boom"') + rset = self.execute('CWUser P WHERE P surname "Boom"') self.assertEquals(len(rset), 0) finally: p.__class__.skip_copy_for = old_skips @@ -510,7 +510,7 @@ self.login('anon') req = self.request() self.assertRaises(Unauthorized, self.env.app.select_controller, 'sendmail', req) - + class JSONControllerTC(EnvBasedTC): @@ -527,42 +527,45 @@ ## tests ################################################################## def test_simple_exec(self): - ctrl = self.ctrl(self.request(rql='EUser P WHERE P login "John"', - pageid='123')) + req = self.request(rql='CWUser P WHERE P login "John"', + pageid='123', fname='view') + ctrl = self.ctrl(req) + rset = self.john.as_rset() + rset.req = req self.assertTextEquals(ctrl.publish(), - xmlize(self.john.view('primary'))) + xhtml_wrap(ctrl.view('primary', rset))) - def test_json_exec(self): - rql = 'Any T,N WHERE T is Tag, T name N' - ctrl = self.ctrl(self.request(mode='json', rql=rql, pageid='123')) - self.assertEquals(ctrl.publish(), - simplejson.dumps(self.execute(rql).rows)) +# def test_json_exec(self): +# rql = 'Any T,N WHERE T is Tag, T name N' +# ctrl = self.ctrl(self.request(mode='json', rql=rql, pageid='123')) +# self.assertEquals(ctrl.publish(), +# simplejson.dumps(self.execute(rql).rows)) def test_remote_add_existing_tag(self): self.remote_call('tag_entity', self.john.eid, ['python']) self.assertUnorderedIterableEquals([tname for tname, in self.execute('Any N WHERE T is Tag, T name N')], ['python', 'cubicweb']) - self.assertEquals(self.execute('Any N WHERE T tags P, P is EUser, T name N').rows, + self.assertEquals(self.execute('Any N WHERE T tags P, P is CWUser, T name N').rows, [['python']]) - + def test_remote_add_new_tag(self): self.remote_call('tag_entity', self.john.eid, ['javascript']) self.assertUnorderedIterableEquals([tname for tname, in self.execute('Any N WHERE T is Tag, T name N')], ['python', 'cubicweb', 'javascript']) - self.assertEquals(self.execute('Any N WHERE T tags P, P is EUser, T name N').rows, + self.assertEquals(self.execute('Any N WHERE T tags P, P is CWUser, T name N').rows, [['javascript']]) def test_edit_field(self): - nbusers = len(self.execute('EUser P')) + nbusers = len(self.execute('CWUser P')) eid = self.john.eid self.remote_call('edit_field', 'apply', ('eid', 'firstname:%s' % eid, '__maineid', '__type:%s'% eid, 'edits-firstname:%s' % eid ), - (str(eid), u'Remi', str(eid), 'EUser', self.john.firstname), + (str(eid), u'Remi', str(eid), 'CWUser', self.john.firstname), 'firstname', eid) self.commit() - rset = self.execute('EUser P') - # make sure we did not insert a new euser here + rset = self.execute('CWUser P') + # make sure we did not insert a new cwuser here self.assertEquals(len(rset), nbusers) john = self.execute('Any X WHERE X eid %(x)s', {'x': self.john.eid}, 'x').get_entity(0, 0) self.assertEquals(john.eid, self.john.eid) @@ -570,12 +573,12 @@ def test_pending_insertion(self): - res, req = self.remote_call('add_pending_insert', ['12', 'tags', '13']) + res, req = self.remote_call('add_pending_inserts', [['12', 'tags', '13']]) deletes = req.get_pending_deletes() self.assertEquals(deletes, []) inserts = req.get_pending_inserts() self.assertEquals(inserts, ['12:tags:13']) - res, req = self.remote_call('add_pending_insert', ['12', 'tags', '14']) + res, req = self.remote_call('add_pending_inserts', [['12', 'tags', '14']]) deletes = req.get_pending_deletes() self.assertEquals(deletes, []) inserts = req.get_pending_inserts() @@ -609,7 +612,7 @@ def test_remove_pending_operations(self): self.remote_call('add_pending_delete', ['12', 'tags', '13']) - _, req = self.remote_call('add_pending_insert', ['12', 'tags', '14']) + _, req = self.remote_call('add_pending_inserts', [['12', 'tags', '14']]) inserts = req.get_pending_inserts() self.assertEquals(inserts, ['12:tags:14']) deletes = req.get_pending_deletes() @@ -617,7 +620,7 @@ req.remove_pending_operations() self.assertEquals(req.get_pending_deletes(), []) self.assertEquals(req.get_pending_inserts(), []) - + def test_add_inserts(self): res, req = self.remote_call('add_pending_inserts', @@ -625,7 +628,7 @@ inserts = req.get_pending_inserts() self.assertEquals(inserts, ['12:tags:13', '12:tags:14']) req.remove_pending_operations() - + # silly tests def test_external_resource(self): @@ -636,11 +639,11 @@ simplejson.dumps(['bimboom'])) def test_format_date(self): - self.assertEquals(self.remote_call('format_date', '"2007-01-01 12:00:00"')[0], + self.assertEquals(self.remote_call('format_date', '2007-01-01 12:00:00')[0], simplejson.dumps('2007/01/01')) - + - + if __name__ == '__main__': unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_views_baseforms.py --- a/web/test/unittest_views_baseforms.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_views_baseforms.py Thu May 14 12:48:11 2009 +0200 @@ -1,26 +1,25 @@ """cubicweb.web.views.baseforms unit tests""" from StringIO import StringIO +from datetime import date import re + from logilab.common.testlib import unittest_main +from logilab.common.decorators import clear_cache from cubicweb.devtools.apptest import EnvBasedTC - from cubicweb.entities import AnyEntity +from cubicweb.web import widgets -from mx.DateTime import DateTime -from cubicweb.web import widgets -orig_today = widgets.today -orig_now = widgets.now +orig_now = widgets.datetime.now def setup_module(options): def _today(): - return DateTime(0000, 1, 1) - widgets.today = widgets.now = _today + return date(0000, 1, 1) + widgets.datetime.now = _today def teardown_module(options, results): - widgets.today = orig_today - widgets.now = orig_now + widgets.datetime.now = orig_now def cleanup_text(text): @@ -32,7 +31,7 @@ def setup_database(self): self.create_user('joe') - + def _build_creation_form(self, etype): req = self.request() req.next_tabindex() @@ -45,12 +44,12 @@ view.w = buffer.write view.edit_form(entity, {}) return buffer.getvalue() - + def _test_view_for(self, etype, expected): self.assertTextEquals(expected, cleanup_text(self._build_creation_form(etype))) - + def test_base(self): - self._test_view_for('EGroup', '''\ + self._test_view_for('CWGroup', '''\

egroup (creation)

@@ -58,7 +57,7 @@

main informations

- + @@ -89,14 +88,14 @@ def test_with_inline_view(self): activated = self.execute('Any X WHERE X is State, X name "activated"')[0][0] - self._test_view_for('EUser', '''

euser (creation)

validating...

main informations

- + @@ -160,7 +159,7 @@

-+ add a EmailAddress. ++ add a EmailAddress.

@@ -180,7 +179,7 @@ def test_redirection_after_creation(self): req = self.request() - req.form['etype'] = 'EUser' + req.form['etype'] = 'CWUser' view = self.vreg.select_view('creation', req, None) self.assertEquals(view.redirect_url(), 'http://testing.fr/cubicweb/euser') req.form['__redirectrql'] = 'Any X WHERE X eid 3012' @@ -199,7 +198,7 @@ entity = vreg.etype_class('Salesterm')(req, None, None) view = vreg.select_view('creation', req, None) self.failUnless(view.need_multipart(entity)) - + def test_nonregr_check_add_permission_on_relation(self): @@ -207,6 +206,7 @@ class BlogEntryPlus(BlogEntry): __rtags__ = {'checked_by': 'primary'} self.vreg.register_vobject_class(BlogEntryPlus) + clear_cache(self.vreg, 'etype_class') # an admin should be able to edit the checked_by relation html = self._build_creation_form('BlogEntry') self.failUnless('name="edits-checked_by:A"' in html) @@ -214,7 +214,7 @@ self.login('joe') html = self._build_creation_form('BlogEntry') self.failIf('name="edits-checked_by:A"' in html) - + from cubicweb.devtools.testlib import WebTest from cubicweb.devtools.htmlparser import DTDValidator @@ -229,7 +229,7 @@ def test_cloned_elements_in_copy_form(self): - rset = self.execute('EUser P WHERE P login "Doe"') + rset = self.execute('CWUser P WHERE P login "Doe"') output = self.view('copy', rset) clones = [attrs for _, attrs in output.input_tags if attrs.get('name', '').startswith('__cloned_eid')] diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_views_basetemplates.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/test/unittest_views_basetemplates.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,16 @@ +from cubicweb.devtools.testlib import WebTest +from cubicweb.devtools.htmlparser import DTDValidator + + +class LogFormTemplateTC(WebTest): + + def _login_labels(self): + valid = self.content_type_validators.get('text/html', DTDValidator)() + page = valid.parse_string(self.vreg.main_template(self.request(), 'login')) + return page.find_tag('label') + + def test_label(self): + self.set_option('allow-email-login', 'yes') + self.assertEquals(self._login_labels(), ['login or email', 'password']) + self.set_option('allow-email-login', 'no') + self.assertEquals(self._login_labels(), ['login', 'password']) diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_views_baseviews.py --- a/web/test/unittest_views_baseviews.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_views_baseviews.py Thu May 14 12:48:11 2009 +0200 @@ -6,17 +6,17 @@ from cubicweb.devtools.apptest import EnvBasedTC from cubicweb.web.htmlwidgets import TableWidget -from cubicweb.web.views.baseviews import vid_from_rset +from cubicweb.web.views import vid_from_rset def loadjson(value): return loads(html_unescape(value)) class VidFromRsetTC(EnvBasedTC): - + def test_no_rset(self): req = self.request() self.assertEquals(vid_from_rset(req, None, self.schema), 'index') - + def test_no_entity(self): req = self.request() rset = self.execute('Any X WHERE X login "blabla"') @@ -36,38 +36,38 @@ req = self.request() rset = self.execute('Any X WHERE X eid 1') self.assertEquals(vid_from_rset(req, rset, self.schema), 'primary') - + def test_more_than_one_entity(self): req = self.request() - rset = self.execute('Any X WHERE X is EUser') + rset = self.execute('Any X WHERE X is CWUser') self.assertEquals(vid_from_rset(req, rset, self.schema), 'list') rset = self.execute('Any X, L WHERE X login L') self.assertEquals(vid_from_rset(req, rset, self.schema), 'list') - + def test_more_than_one_entity_by_row(self): req = self.request() rset = self.execute('Any X, G WHERE X in_group G') self.assertEquals(vid_from_rset(req, rset, self.schema), 'table') - + def test_more_than_one_entity_by_row_2(self): req = self.request() rset = self.execute('Any X, GN WHERE X in_group G, G name GN') self.assertEquals(vid_from_rset(req, rset, self.schema), 'table') - + def test_aggregat(self): req = self.request() rset = self.execute('Any X, COUNT(T) GROUPBY X WHERE X is T') self.assertEquals(vid_from_rset(req, rset, self.schema), 'table') - rset = self.execute('Any MAX(X) WHERE X is EUser') + rset = self.execute('Any MAX(X) WHERE X is CWUser') self.assertEquals(vid_from_rset(req, rset, self.schema), 'table') def test_subquery(self): rset = self.execute( 'DISTINCT Any X,N ORDERBY N ' 'WITH X,N BEING (' -' (DISTINCT Any P,N WHERE P is EUser, P login N)' +' (DISTINCT Any P,N WHERE P is CWUser, P login N)' ' UNION' -' (DISTINCT Any W,N WHERE W is EGroup, W name N))') +' (DISTINCT Any W,N WHERE W is CWGroup, W name N))') req = self.request() self.assertEquals(vid_from_rset(req, rset, self.schema), 'table') @@ -81,7 +81,7 @@ req = self.request() view = self.vreg.select_view('table', req, rset) return e, rset, view - + def test_headers(self): self.skip('implement me') diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_views_editforms.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/test/unittest_views_editforms.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,153 @@ +from logilab.common.testlib import unittest_main +from cubicweb.devtools.apptest import EnvBasedTC +from cubicweb.devtools.testlib import WebTest +from cubicweb.web.views.autoform import AutomaticEntityForm as AEF +from cubicweb.web.formwidgets import AutoCompletionWidget +def rbc(entity, category): + return [(rschema.type, x) for rschema, tschemas, x in AEF.erelations_by_category(entity, category)] + +class AutomaticEntityFormTC(EnvBasedTC): + + def test_custom_widget(self): + AEF.rfields_kwargs.tag_subject_of(('CWUser', 'login', '*'), + {'widget':AutoCompletionWidget}) + form = self.vreg.select_object('forms', 'edition', self.request(), None, + entity=self.user()) + field = form.field_by_name('login') + self.assertIsInstance(field.widget, AutoCompletionWidget) + AEF.rfields_kwargs.del_rtag('CWUser', 'login', '*', 'subject') + + + def test_euser_relations_by_category(self): + #for (rtype, role, stype, otype), tag in AEF.rcategories._tagdefs.items(): + # if rtype == 'tags': + # print rtype, role, stype, otype, ':', tag + e = self.etype_instance('CWUser') + # see custom configuration in views.euser + self.assertEquals(rbc(e, 'primary'), + [('login', 'subject'), + ('upassword', 'subject'), + ('in_group', 'subject'), + ('in_state', 'subject'), + ('eid', 'subject'), + ]) + self.assertListEquals(rbc(e, 'secondary'), + [('firstname', 'subject'), + ('surname', 'subject') + ]) + self.assertListEquals(rbc(e, 'metadata'), + [('last_login_time', 'subject'), + ('created_by', 'subject'), + ('creation_date', 'subject'), + ('modification_date', 'subject'), + ('owned_by', 'subject'), + ('bookmarked_by', 'object'), + ]) + self.assertListEquals(rbc(e, 'generic'), + [('primary_email', 'subject'), + ('connait', 'subject'), + ('checked_by', 'object'), + ]) + # owned_by is defined both as subject and object relations on CWUser + self.assertListEquals(rbc(e, 'generated'), + [('use_email', 'subject'), + ('has_text', 'subject'), + ('identity', 'subject'), + ('is', 'subject'), + ('is_instance_of', 'subject'), + ('tags', 'object'), + ('for_user', 'object'), + ('created_by', 'object'), + ('wf_info_for', 'object'), + ('owned_by', 'object'), + ('identity', 'object'), + ]) + + def test_inlined_view(self): + self.failUnless(AEF.rinlined.etype_get('CWUser', 'use_email', 'subject')) + self.failIf(AEF.rinlined.etype_get('CWUser', 'primary_email', 'subject')) + + def test_personne_relations_by_category(self): + e = self.etype_instance('Personne') + self.assertListEquals(rbc(e, 'primary'), + [('nom', 'subject'), + ('eid', 'subject') + ]) + self.assertListEquals(rbc(e, 'secondary'), + [('prenom', 'subject'), + ('sexe', 'subject'), + ('promo', 'subject'), + ('titre', 'subject'), + ('ass', 'subject'), + ('web', 'subject'), + ('tel', 'subject'), + ('fax', 'subject'), + ('datenaiss', 'subject'), + ('test', 'subject'), + ('description', 'subject'), + ('salary', 'subject') + ]) + self.assertListEquals(rbc(e, 'metadata'), + [('created_by', 'subject'), + ('creation_date', 'subject'), + ('modification_date', 'subject'), + ('owned_by', 'subject'), + ]) + self.assertListEquals(rbc(e, 'generic'), + [('travaille', 'subject'), + ('connait', 'object') + ]) + self.assertListEquals(rbc(e, 'generated'), + [('has_text', 'subject'), + ('identity', 'subject'), + ('is', 'subject'), + ('is_instance_of', 'subject'), + ('identity', 'object'), + ]) + + def test_edition_form(self): + rset = self.execute('CWUser X LIMIT 1') + form = self.vreg.select_object('forms', 'edition', rset.req, rset, + row=0, col=0) + # should be also selectable by specifying entity + self.vreg.select_object('forms', 'edition', self.request(), None, + entity=rset.get_entity(0, 0)) + self.failIf(any(f for f in form.fields if f is None)) + + +class FormViewsTC(WebTest): + def test_delete_conf_formview(self): + rset = self.execute('CWGroup X') + self.view('deleteconf', rset, template=None).source + + def test_automatic_edition_formview(self): + rset = self.execute('CWUser X') + self.view('edition', rset, row=0, template=None).source + + def test_automatic_edition_formview(self): + rset = self.execute('CWUser X') + self.view('copy', rset, row=0, template=None).source + + def test_automatic_creation_formview(self): + self.view('creation', None, etype='CWUser', template=None).source + + def test_automatic_muledit_formview(self): + rset = self.execute('CWUser X') + self.view('muledit', rset, template=None).source + + def test_automatic_reledit_formview(self): + rset = self.execute('CWUser X') + self.view('reledit', rset, row=0, rtype='login', template=None).source + + def test_automatic_inline_edit_formview(self): + geid = self.execute('CWGroup X LIMIT 1')[0][0] + rset = self.execute('CWUser X LIMIT 1') + self.view('inline-edition', rset, row=0, rtype='in_group', peid=geid, template=None).source + + def test_automatic_inline_creation_formview(self): + geid = self.execute('CWGroup X LIMIT 1')[0][0] + self.view('inline-creation', None, etype='CWUser', rtype='in_group', peid=geid, template=None).source + + +if __name__ == '__main__': + unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_views_navigation.py --- a/web/test/unittest_views_navigation.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_views_navigation.py Thu May 14 12:48:11 2009 +0200 @@ -9,7 +9,7 @@ BreadCrumbEntityVComponent.visible = True class NavigationTC(EnvBasedTC): - + def test_navigation_selection(self): rset = self.execute('Any X,N WHERE X name N') req = self.request() @@ -39,29 +39,29 @@ req.set_search_state('W:X:Y:Z') navcomp = self.vreg.select_component('navigation', req, rset) self.assertIsInstance(navcomp, SortedNavigation) - - + + def test_sorted_navigation(self): rset = self.execute('Any X,N ORDERBY N WHERE X name N') req = self.request() req.set_search_state('W:X:Y:Z') navcomp = self.vreg.select_component('navigation', rset.req, rset) - html = navcomp.dispatch() + html = navcomp.render() rset = self.execute('Any RDEF ORDERBY RT WHERE RDEF relation_type RT') navcomp = self.vreg.select_component('navigation', req, rset) - html = navcomp.dispatch() + html = navcomp.render() rset = self.execute('Any RDEF ORDERBY RDEF WHERE RDEF relation_type RT') navcomp = self.vreg.select_component('navigation', req, rset) - html = navcomp.dispatch() - rset = self.execute('EFRDef RDEF ORDERBY RDEF') + html = navcomp.render() + rset = self.execute('CWAttribute RDEF ORDERBY RDEF') navcomp = self.vreg.select_component('navigation', req, rset) - html = navcomp.dispatch() + html = navcomp.render() rset = self.execute('Any RDEF ORDERBY N WHERE RDEF relation_type RT, RT name N') navcomp = self.vreg.select_component('navigation', req, rset) - html = navcomp.dispatch() + html = navcomp.render() rset = self.execute('Any N, COUNT(RDEF) GROUPBY N ORDERBY N WHERE RDEF relation_type RT, RT name N') navcomp = self.vreg.select_component('navigation', rset.req, rset) - html = navcomp.dispatch() + html = navcomp.render() @@ -69,7 +69,7 @@ def test_component_context(self): view = mock_object(is_primary=lambda x: True) - rset = self.execute('EUser X LIMIT 1') + rset = self.execute('CWUser X LIMIT 1') req = self.request() objs = self.vreg.possible_vobjects('contentnavigation', req, rset, view=view, context='navtop') @@ -81,21 +81,21 @@ # breadcrumbs should _NOT_ be in footers by default clsids = set(obj.id for obj in objs) self.failIf('breadcrumbs' in clsids) - self.execute('INSERT EProperty P: P pkey "contentnavigation.breadcrumbs.context", ' + self.execute('INSERT CWProperty P: P pkey "contentnavigation.breadcrumbs.context", ' 'P value "navbottom"') # breadcrumbs should now be in footers req.cnx.commit() objs = self.vreg.possible_vobjects('contentnavigation', req, rset, view=view, context='navbottom') - + clsids = [obj.id for obj in objs] self.failUnless('breadcrumbs' in clsids) objs = self.vreg.possible_vobjects('contentnavigation', req, rset, view=view, context='navtop') - + clsids = [obj.id for obj in objs] self.failIf('breadcrumbs' in clsids) - + if __name__ == '__main__': unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_views_searchrestriction.py --- a/web/test/unittest_views_searchrestriction.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_views_searchrestriction.py Thu May 14 12:48:11 2009 +0200 @@ -15,7 +15,7 @@ mainvar = prepare_facets_rqlst(rqlst)[0] insert_attr_select_relation(rqlst.children[0], mainvar, rel, role, attr) return rqlst.as_string() - + @property def select(self): return self.parse('Any B,(NOW - CD),S,V,U,GROUP_CONCAT(TN),VN,P,CD,BMD ' @@ -24,30 +24,30 @@ 'B modification_date BMD, T? tags B, T name TN, ' 'V? bookmarked_by B, V title VN, B created_by U?, ' 'B in_group P, P name "managers"') - + def test_1(self): self.assertEquals(self._generate(self.select, 'in_state', 'subject', 'name'), "DISTINCT Any A,C ORDERBY C WHERE B in_group P, P name 'managers', " - "B in_state A, A name C, B is EUser") - + "B in_state A, A name C, B is CWUser") + def test_2(self): self.assertEquals(self._generate(self.select, 'tags', 'object', 'name'), "DISTINCT Any A,C ORDERBY C WHERE B in_group P, P name 'managers', " - "A tags B, A name C, B is EUser") - + "A tags B, A name C, B is CWUser") + def test_3(self): self.assertEquals(self._generate(self.select, 'created_by', 'subject', 'login'), "DISTINCT Any A,C ORDERBY C WHERE B in_group P, P name 'managers', " - "B created_by A, A login C, B is EUser") - + "B created_by A, A login C, B is CWUser") + def test_4(self): - self.assertEquals(self._generate(self.parse('Any X WHERE X is EUser'), 'created_by', 'subject', 'login'), - "DISTINCT Any A,B ORDERBY B WHERE X is EUser, X created_by A, A login B") - + self.assertEquals(self._generate(self.parse('Any X WHERE X is CWUser'), 'created_by', 'subject', 'login'), + "DISTINCT Any A,B ORDERBY B WHERE X is CWUser, X created_by A, A login B") + def test_5(self): - self.assertEquals(self._generate(self.parse('Any X,L WHERE X is EUser, X login L'), 'created_by', 'subject', 'login'), - "DISTINCT Any A,B ORDERBY B WHERE X is EUser, X created_by A, A login B") - + self.assertEquals(self._generate(self.parse('Any X,L WHERE X is CWUser, X login L'), 'created_by', 'subject', 'login'), + "DISTINCT Any A,B ORDERBY B WHERE X is CWUser, X created_by A, A login B") + def test_nonregr1(self): select = self.parse('Any T,V WHERE T bookmarked_by V?, ' 'V in_state VS, VS name "published", T created_by U') @@ -57,14 +57,14 @@ def test_nonregr2(self): #'DISTINCT Any X,TMP,N WHERE P name TMP, X version_of P, P is Project, X is Version, not X in_state S,S name "published", X num N ORDERBY TMP,N' - select = self.parse('DISTINCT Any V,TN,L ORDERBY TN,L WHERE T nom TN, V connait T, T is Personne, V is EUser,' + select = self.parse('DISTINCT Any V,TN,L ORDERBY TN,L WHERE T nom TN, V connait T, T is Personne, V is CWUser,' 'NOT V in_state VS, VS name "published", V login L') rschema = self.schema['connait'] for s, o in rschema.iter_rdefs(): rschema.set_rproperty(s, o, 'cardinality', '++') try: self.assertEquals(self._generate(select, 'in_state', 'subject', 'name'), - "DISTINCT Any A,B ORDERBY B WHERE V is EUser, " + "DISTINCT Any A,B ORDERBY B WHERE V is CWUser, " "NOT V in_state VS, VS name 'published', " "V in_state A, A name B") finally: @@ -73,11 +73,11 @@ def test_nonregr3(self): #'DISTINCT Any X,TMP,N WHERE P name TMP, X version_of P, P is Project, X is Version, not X in_state S,S name "published", X num N ORDERBY TMP,N' - select = self.parse('DISTINCT Any X, MAX(Y) GROUPBY X WHERE X is EUser, Y is Bookmark, X in_group A') + select = self.parse('DISTINCT Any X, MAX(Y) GROUPBY X WHERE X is CWUser, Y is Bookmark, X in_group A') self.assertEquals(self._generate(select, 'in_group', 'subject', 'name'), - "DISTINCT Any B,C ORDERBY C WHERE X is EUser, X in_group B, B name C") + "DISTINCT Any B,C ORDERBY C WHERE X is CWUser, X in_group B, B name C") - + if __name__ == '__main__': from logilab.common.testlib import unittest_main unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_viewselector.py --- a/web/test/unittest_viewselector.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_viewselector.py Thu May 14 12:48:11 2009 +0200 @@ -1,32 +1,29 @@ # -*- coding: iso-8859-1 -*- """XXX rename, split, reorganize this """ - -import os.path as osp +from __future__ import with_statement -from logilab.common.testlib import TestCase, unittest_main -from cubicweb.devtools.apptest import EnvBasedTC - - -from cubicweb import CW_SOFTWARE_ROOT as BASE, Binary -from cubicweb.common.selectors import match_user_group +from logilab.common.testlib import unittest_main -from cubicweb.web._exceptions import NoSelectableObject +from cubicweb.devtools.apptest import EnvBasedTC +from cubicweb import CW_SOFTWARE_ROOT as BASE, Binary +from cubicweb.selectors import (match_user_groups, implements, + specified_etype_implements, rql_condition, + traced_selection) +from cubicweb.web import NoSelectableObject from cubicweb.web.action import Action -from cubicweb.web.views import (baseviews, tableview, baseforms, calendar, - management, embedding, actions, startup, - euser, schemaentities, xbel, vcard, - treeview, idownloadable, wdoc, debug) -from cubicweb.entities.lib import Card -from cubicweb.interfaces import IMileStone -from cubicweb.web.views import owl +from cubicweb.web.views import (primary, baseviews, tableview, editforms, + calendar, management, embedding, actions, + startup, cwuser, schema, xbel, vcard, owl, + treeview, idownloadable, wdoc, debug, + cwproperties, workflow, xmlrss, csvexport) USERACTIONS = [('myprefs', actions.UserPreferencesAction), ('myinfos', actions.UserInfoAction), ('logout', actions.LogoutAction)] SITEACTIONS = [('siteconfig', actions.SiteConfigurationAction), ('manage', actions.ManageAction), - ('schema', actions.ViewSchemaAction)] + ('schema', schema.ViewSchemaAction)] class ViewSelectorTC(EnvBasedTC): @@ -34,7 +31,6 @@ def setup_database(self): self.add_entity('BlogEntry', title=u"une news !", content=u"cubicweb c'est beau") self.add_entity('Bookmark', title=u"un signet !", path=u"view?vid=index") - self.add_entity('Card', title=u'mandatory', content=u"DoC !") self.add_entity('EmailAddress', address=u"devel@logilab.fr", alias=u'devel') self.add_entity('Tag', name=u'x') @@ -63,132 +59,131 @@ print 'no more', [v for v in expected if not v in content.keys()] print 'missing', [v for v in content.keys() if not v in expected] raise - - - def test_possible_views(self): - # no entity + + + def test_possible_views_none_rset(self): req = self.request() self.assertListEqual(self.pviews(req, None), [('changelog', wdoc.ChangeLogView), ('debug', debug.DebugView), - ('epropertiesform', management.EpropertiesForm), + ('epropertiesform', cwproperties.EPropertiesForm), ('index', startup.IndexView), ('info', management.ProcessInformationView), ('manage', startup.ManageView), ('owl', owl.OWLView), ('schema', startup.SchemaView), - ('systemepropertiesform', management.SystemEpropertiesForm)]) - # no entity but etype + ('systemepropertiesform', cwproperties.SystemEPropertiesForm)]) + + def test_possible_views_noresult(self): rset, req = self.env.get_rset_and_req('Any X WHERE X eid 999999') self.assertListEqual(self.pviews(req, rset), - [#('changelog', wdoc.ChangeLogView), - #('epropertiesform', management.EpropertiesForm), - #('index', startup.IndexView), - #('info', management.ProcessInformationView), - #('manage', startup.ManageView), - #('schema', startup.SchemaView), - #('systemepropertiesform', management.SystemEpropertiesForm) - ]) - # one entity - rset, req = self.env.get_rset_and_req('EGroup X WHERE X name "managers"') + []) + + def test_possible_views_one_egroup(self): + rset, req = self.env.get_rset_and_req('CWGroup X WHERE X name "managers"') self.assertListEqual(self.pviews(req, rset), - [('csvexport', baseviews.CSVRsetView), - ('ecsvexport', baseviews.CSVEntityView), + [('csvexport', csvexport.CSVRsetView), + ('ecsvexport', csvexport.CSVEntityView), ('editable-table', tableview.EditableTableView), ('filetree', treeview.FileTreeView), ('list', baseviews.ListView), ('oneline', baseviews.OneLineView), ('owlabox', owl.OWLABOXView), - ('primary', baseviews.PrimaryView), - ('rsetxml', baseviews.XMLRsetView), - ('rss', baseviews.RssView), + ('primary', primary.PrimaryView), + ('rsetxml', xmlrss.XMLRsetView), + ('rss', xmlrss.RSSView), + ('secondary', baseviews.SecondaryView), + ('security', management.SecurityManagementView), + ('table', tableview.TableView), + ('text', baseviews.TextView), + ('treeview', treeview.TreeView), + ('xbel', xbel.XbelView), + ('xml', xmlrss.XMLView), + ]) + + def test_possible_views_multiple_egroups(self): + rset, req = self.env.get_rset_and_req('CWGroup X') + self.assertListEqual(self.pviews(req, rset), + [('csvexport', csvexport.CSVRsetView), + ('ecsvexport', csvexport.CSVEntityView), + ('editable-table', tableview.EditableTableView), + ('filetree', treeview.FileTreeView), + ('list', baseviews.ListView), + ('oneline', baseviews.OneLineView), + ('owlabox', owl.OWLABOXView), + ('primary', primary.PrimaryView), + ('rsetxml', xmlrss.XMLRsetView), + ('rss', xmlrss.RSSView), ('secondary', baseviews.SecondaryView), ('security', management.SecurityManagementView), ('table', tableview.TableView), ('text', baseviews.TextView), ('treeview', treeview.TreeView), ('xbel', xbel.XbelView), - ('xml', baseviews.XmlView), + ('xml', xmlrss.XMLView), ]) - # list of entities of the same type - rset, req = self.env.get_rset_and_req('EGroup X') + + def test_possible_views_multiple_different_types(self): + rset, req = self.env.get_rset_and_req('Any X') self.assertListEqual(self.pviews(req, rset), - [('csvexport', baseviews.CSVRsetView), - ('ecsvexport', baseviews.CSVEntityView), + [('csvexport', csvexport.CSVRsetView), + ('ecsvexport', csvexport.CSVEntityView), ('editable-table', tableview.EditableTableView), ('filetree', treeview.FileTreeView), ('list', baseviews.ListView), ('oneline', baseviews.OneLineView), ('owlabox', owl.OWLABOXView), - ('primary', baseviews.PrimaryView), - ('rsetxml', baseviews.XMLRsetView), - ('rss', baseviews.RssView), + ('primary', primary.PrimaryView), + ('rsetxml', xmlrss.XMLRsetView), + ('rss', xmlrss.RSSView), ('secondary', baseviews.SecondaryView), ('security', management.SecurityManagementView), ('table', tableview.TableView), ('text', baseviews.TextView), ('treeview', treeview.TreeView), ('xbel', xbel.XbelView), - ('xml', baseviews.XmlView), + ('xml', xmlrss.XMLView), ]) - # list of entities of different types - rset, req = self.env.get_rset_and_req('Any X') + + def test_possible_views_any_rset(self): + rset, req = self.env.get_rset_and_req('Any N, X WHERE X in_group Y, Y name N') self.assertListEqual(self.pviews(req, rset), - [('csvexport', baseviews.CSVRsetView), - ('ecsvexport', baseviews.CSVEntityView), + [('csvexport', csvexport.CSVRsetView), + ('editable-table', tableview.EditableTableView), + ('rsetxml', xmlrss.XMLRsetView), + ('table', tableview.TableView), + ]) + + def test_possible_views_multiple_eusers(self): + rset, req = self.env.get_rset_and_req('CWUser X') + self.assertListEqual(self.pviews(req, rset), + [('csvexport', csvexport.CSVRsetView), + ('ecsvexport', csvexport.CSVEntityView), ('editable-table', tableview.EditableTableView), ('filetree', treeview.FileTreeView), + ('foaf', cwuser.FoafView), ('list', baseviews.ListView), ('oneline', baseviews.OneLineView), ('owlabox', owl.OWLABOXView), - ('primary', baseviews.PrimaryView), - ('rsetxml', baseviews.XMLRsetView), - ('rss', baseviews.RssView), + ('primary', primary.PrimaryView), + ('rsetxml', xmlrss.XMLRsetView), + ('rss', xmlrss.RSSView), ('secondary', baseviews.SecondaryView), ('security', management.SecurityManagementView), ('table', tableview.TableView), ('text', baseviews.TextView), ('treeview', treeview.TreeView), + ('vcard', vcard.VCardCWUserView), ('xbel', xbel.XbelView), - ('xml', baseviews.XmlView), - ]) - # whatever - rset, req = self.env.get_rset_and_req('Any N, X WHERE X in_group Y, Y name N') - self.assertListEqual(self.pviews(req, rset), - [('csvexport', baseviews.CSVRsetView), - ('editable-table', tableview.EditableTableView), - ('rsetxml', baseviews.XMLRsetView), - ('table', tableview.TableView), + ('xml', xmlrss.XMLView), ]) - # list of euser entities - rset, req = self.env.get_rset_and_req('EUser X') - self.assertListEqual(self.pviews(req, rset), - [('csvexport', baseviews.CSVRsetView), - ('ecsvexport', baseviews.CSVEntityView), - ('editable-table', tableview.EditableTableView), - ('filetree', treeview.FileTreeView), - ('foaf', euser.FoafView), - ('list', baseviews.ListView), - ('oneline', baseviews.OneLineView), - ('owlabox', owl.OWLABOXView), - ('primary', euser.EUserPrimaryView), - ('rsetxml', baseviews.XMLRsetView), - ('rss', baseviews.RssView), - ('secondary', baseviews.SecondaryView), - ('security', management.SecurityManagementView), - ('table', tableview.TableView), - ('text', baseviews.TextView), - ('treeview', treeview.TreeView), - ('vcard', vcard.VCardEUserView), - ('xbel', xbel.XbelView), - ('xml', baseviews.XmlView), - ]) - + def test_possible_actions_none_rset(self): req = self.request() self.assertDictEqual(self.pactions(req, None), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, + }) def test_possible_actions_no_entity(self): rset, req = self.env.get_rset_and_req('Any X WHERE X eid 999999') @@ -196,8 +191,9 @@ {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, }) + def test_possible_actions_same_type_entities(self): - rset, req = self.env.get_rset_and_req('EGroup X') + rset, req = self.env.get_rset_and_req('CWGroup X') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, @@ -205,6 +201,7 @@ 'moreactions': [('delete', actions.DeleteAction), ('addentity', actions.AddNewAction)], }) + def test_possible_actions_different_types_entities(self): rset, req = self.env.get_rset_and_req('Any X') self.assertDictEqual(self.pactions(req, rset), @@ -212,53 +209,44 @@ 'siteactions': SITEACTIONS, 'moreactions': [('delete', actions.DeleteAction)], }) + def test_possible_actions_final_entities(self): rset, req = self.env.get_rset_and_req('Any N, X WHERE X in_group Y, Y name N') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS}) - - def test_possible_actions_eetype_euser_entity(self): - rset, req = self.env.get_rset_and_req('EEType X WHERE X name "EUser"') + + def test_possible_actions_eetype_cwuser_entity(self): + rset, req = self.env.get_rset_and_req('CWEType X WHERE X name "CWUser"') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, 'mainactions': [('edit', actions.ModifyAction), - ('workflow', schemaentities.ViewWorkflowAction),], - 'moreactions': [('delete', actions.DeleteAction), - ('copy', actions.CopyAction)], + ('workflow', workflow.ViewWorkflowAction),], + 'moreactions': [('managepermission', actions.ManagePermissionsAction), + ('delete', actions.DeleteAction), + ('copy', actions.CopyAction), + ], }) - def test_load_subinterface_based_vojects(self): - self.vreg._lastmodifs = {} # clear cache - self.vreg.register_objects([osp.join(BASE, 'web', 'views', 'iprogress.py')]) - # check progressbar was kicked - self.failIf('progressbar' in self.vreg['views']) - class MyCard(Card): - __implements__ = (IMileStone,) - self.vreg.register_vobject_class(MyCard) - self.vreg._lastmodifs = {} # clear cache - self.vreg.register_objects([osp.join(BASE, 'web', 'views', 'iprogress.py')]) - # check progressbar isn't kicked - self.assertEquals(len(self.vreg['views']['progressbar']), 1) - def test_select_creation_form(self): rset = None req = self.request() # creation form - req.form['etype'] = 'EGroup' + req.form['etype'] = 'CWGroup' self.assertIsInstance(self.vreg.select_view('creation', req, rset), - baseforms.CreationForm) + editforms.CreationFormView) del req.form['etype'] # custom creation form - class EUserCreationForm(baseforms.CreationForm): - accepts = ('EUser',) - self.vreg.register_vobject_class(EUserCreationForm) - req.form['etype'] = 'EUser' + class CWUserCreationForm(editforms.CreationFormView): + __select__ = specified_etype_implements('CWUser') + self.vreg._loadedmods[__name__] = {} + self.vreg.register_vobject_class(CWUserCreationForm) + req.form['etype'] = 'CWUser' self.assertIsInstance(self.vreg.select_view('creation', req, rset), - EUserCreationForm) - + CWUserCreationForm) + def test_select_view(self): # no entity rset = None @@ -269,7 +257,7 @@ self.vreg.select_view, 'primary', req, rset) self.failUnlessRaises(NoSelectableObject, self.vreg.select_view, 'table', req, rset) - + # no entity rset, req = self.env.get_rset_and_req('Any X WHERE X eid 999999') self.failUnlessRaises(NoSelectableObject, @@ -281,13 +269,13 @@ self.failUnlessRaises(NoSelectableObject, self.vreg.select_view, 'table', req, rset) # one entity - rset, req = self.env.get_rset_and_req('EGroup X WHERE X name "managers"') + rset, req = self.env.get_rset_and_req('CWGroup X WHERE X name "managers"') self.assertIsInstance(self.vreg.select_view('primary', req, rset), - baseviews.PrimaryView) + primary.PrimaryView) self.assertIsInstance(self.vreg.select_view('list', req, rset), baseviews.ListView) self.assertIsInstance(self.vreg.select_view('edition', req, rset), - baseforms.EditionForm) + editforms.EditionFormView) self.assertIsInstance(self.vreg.select_view('table', req, rset), tableview.TableView) self.failUnlessRaises(NoSelectableObject, @@ -295,9 +283,9 @@ self.failUnlessRaises(NoSelectableObject, self.vreg.select_view, 'index', req, rset) # list of entities of the same type - rset, req = self.env.get_rset_and_req('EGroup X') + rset, req = self.env.get_rset_and_req('CWGroup X') self.assertIsInstance(self.vreg.select_view('primary', req, rset), - baseviews.PrimaryView) + primary.PrimaryView) self.assertIsInstance(self.vreg.select_view('list', req, rset), baseviews.ListView) self.assertIsInstance(self.vreg.select_view('table', req, rset), @@ -307,7 +295,7 @@ # list of entities of different types rset, req = self.env.get_rset_and_req('Any X') self.assertIsInstance(self.vreg.select_view('primary', req, rset), - baseviews.PrimaryView) + primary.PrimaryView) self.assertIsInstance(self.vreg.select_view('list', req, rset), baseviews.ListView) self.assertIsInstance(self.vreg.select_view('table', req, rset), @@ -331,19 +319,13 @@ self.failUnlessRaises(NoSelectableObject, self.vreg.select_view, 'edition', req, rset) # mixed query - rset, req = self.env.get_rset_and_req('Any U,G WHERE U is EUser, G is EGroup') + rset, req = self.env.get_rset_and_req('Any U,G WHERE U is CWUser, G is CWGroup') self.failUnlessRaises(NoSelectableObject, self.vreg.select_view, 'edition', req, rset) self.failUnlessRaises(NoSelectableObject, self.vreg.select_view, 'creation', req, rset) self.assertIsInstance(self.vreg.select_view('table', req, rset), tableview.TableView) - # euser primary view priority - rset, req = self.env.get_rset_and_req('EUser X WHERE X login "admin"') - self.assertIsInstance(self.vreg.select_view('primary', req, rset), - euser.EUserPrimaryView) - self.assertIsInstance(self.vreg.select_view('text', req, rset), - baseviews.TextView) def test_interface_selector(self): image = self.add_entity('Image', name=u'bim.png', data=Binary('bim')) @@ -351,8 +333,8 @@ rset, req = self.env.get_rset_and_req('Image X WHERE X name "bim.png"') self.assertIsInstance(self.vreg.select_view('primary', req, rset), idownloadable.IDownloadablePrimaryView) - - + + def test_score_entity_selector(self): image = self.add_entity('Image', name=u'bim.png', data=Binary('bim')) # image primary view priority @@ -363,9 +345,9 @@ # image primary view priority rset, req = self.env.get_rset_and_req('File X WHERE X name "bim.txt"') self.assertRaises(NoSelectableObject, self.vreg.select_view, 'image', req, rset) - - - + + + def _test_view(self, vid, rql, args): if rql is None: rset = None @@ -381,9 +363,9 @@ def test_form(self): for vid, rql, args in ( #('creation', 'Any X WHERE X eid 999999', {}), - ('edition', 'EGroup X WHERE X name "managers"', {}), - ('copy', 'EGroup X WHERE X name "managers"', {}), - ('muledit', 'EGroup X', {}), + ('edition', 'CWGroup X WHERE X name "managers"', {}), + ('copy', 'CWGroup X WHERE X name "managers"', {}), + ('muledit', 'CWGroup X', {}), #('muledit', 'Any X', {}), ): self._test_view(vid, rql, args) @@ -403,78 +385,49 @@ self.assertEquals(self.vreg.property_value('boxes.possible_views_box.visible'), False) self.assertEquals(self.vreg.property_value('boxes.possible_views_box.order'), 10) self.assertRaises(KeyError, self.vreg.property_value, 'boxes.actions_box') - + + - def test_owners_match_user_group(self): - """tests usage of 'owners' group with match_user_group""" - class SomeAction(Action): - id = 'yo' - category = 'foo' - __selectors__ = (match_user_group,) - require_groups = ('owners', ) - self.vreg.register_vobject_class(SomeAction) - self.failUnless(SomeAction in self.vreg['actions']['yo'], self.vreg['actions']) - try: - # login as a simple user - self.create_user('john') - self.login('john') - # it should not be possible to use SomeAction not owned objects - rset, req = self.env.get_rset_and_req('Any G WHERE G is EGroup, G name "managers"') - self.failIf('foo' in self.pactions(req, rset)) - # insert a new card, and check that we can use SomeAction on our object - self.execute('INSERT Card C: C title "zoubidou"') - self.commit() - rset, req = self.env.get_rset_and_req('Card C WHERE C title "zoubidou"') - self.failUnless('foo' in self.pactions(req, rset)) - # make sure even managers can't use the action - self.restore_connection() - rset, req = self.env.get_rset_and_req('Card C WHERE C title "zoubidou"') - self.failIf('foo' in self.pactions(req, rset)) - finally: - del self.vreg[SomeAction.__registry__][SomeAction.id] - - - - - -from cubicweb.web.action import EntityAction - -class EETypeRQLAction(EntityAction): +class CWETypeRQLAction(Action): id = 'testaction' - accepts = ('EEType',) - condition = 'X name "EEType"' + __select__ = implements('CWEType') & rql_condition('X name "CWEType"') title = 'bla' class RQLActionTC(ViewSelectorTC): - + def setUp(self): super(RQLActionTC, self).setUp() - self.vreg.register_vobject_class(EETypeRQLAction) - + self.vreg._loadedmods[__name__] = {} + self.vreg.register_vobject_class(CWETypeRQLAction) + def tearDown(self): - super(RQLActionTC, self).tearDown() + super(RQLActionTC, self).tearDown() del self.vreg._registries['actions']['testaction'] - + def test(self): - rset, req = self.env.get_rset_and_req('EEType X WHERE X name "EEType"') + rset, req = self.env.get_rset_and_req('CWEType X WHERE X name "CWEType"') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, 'mainactions': [('edit', actions.ModifyAction)], - 'moreactions': [('delete', actions.DeleteAction), + 'moreactions': [('managepermission', actions.ManagePermissionsAction), + ('delete', actions.DeleteAction), ('copy', actions.CopyAction), - ('testaction', EETypeRQLAction)], + ('testaction', CWETypeRQLAction), + ], }) - rset, req = self.env.get_rset_and_req('EEType X WHERE X name "ERType"') + rset, req = self.env.get_rset_and_req('CWEType X WHERE X name "CWRType"') self.assertDictEqual(self.pactions(req, rset), {'useractions': USERACTIONS, 'siteactions': SITEACTIONS, 'mainactions': [('edit', actions.ModifyAction)], - 'moreactions': [('delete', actions.DeleteAction), - ('copy', actions.CopyAction)], + 'moreactions': [('managepermission', actions.ManagePermissionsAction), + ('delete', actions.DeleteAction), + ('copy', actions.CopyAction), + ], }) - + if __name__ == '__main__': diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_web.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/test/unittest_web.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,18 @@ +from logilab.common.testlib import TestCase, unittest_main +from cubicweb.web import ajax_replace_url as arurl +class AjaxReplaceUrlTC(TestCase): + + def test_ajax_replace_url(self): + # NOTE: for the simplest use cases, we could use doctest + self.assertEquals(arurl('foo', 'Person P'), + "javascript: replacePageChunk('foo', 'Person%20P');") + self.assertEquals(arurl('foo', 'Person P', 'oneline'), + "javascript: replacePageChunk('foo', 'Person%20P', 'oneline');") + self.assertEquals(arurl('foo', 'Person P', 'oneline', name='bar', age=12), + 'javascript: replacePageChunk(\'foo\', \'Person%20P\', \'oneline\', {"age": 12, "name": "bar"});') + self.assertEquals(arurl('foo', 'Person P', name='bar', age=12), + 'javascript: replacePageChunk(\'foo\', \'Person%20P\', \'null\', {"age": 12, "name": "bar"});') + + +if __name__ == '__main__': + unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_webconfig.py --- a/web/test/unittest_webconfig.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_webconfig.py Thu May 14 12:48:11 2009 +0200 @@ -10,7 +10,7 @@ self.config = ApptestConfiguration('data') self.config._cubes = ['file'] self.config.load_configuration() - + def test_nonregr_print_css_as_list(self): """make sure PRINT_CSS *must* is a list""" config = self.config @@ -26,8 +26,8 @@ self.failUnless('file' in self.config.locate_resource(rname).split(os.sep)) cubicwebcsspath = self.config.locate_resource('cubicweb.css').split(os.sep) self.failUnless('web' in cubicwebcsspath or 'shared' in cubicwebcsspath) # 'shared' if tests under apycot - + if __name__ == '__main__': unittest_main() - + diff -r 49075f57cf2c -r aa09e20dd8c0 web/test/unittest_widgets.py --- a/web/test/unittest_widgets.py Tue May 05 17:18:49 2009 +0200 +++ b/web/test/unittest_widgets.py Thu May 14 12:48:11 2009 +0200 @@ -1,21 +1,21 @@ -"""cubicweb.common.widget unit tests +"""cubicweb.common.widget unit tests""" -""" +from datetime import datetime +NOW = datetime.now() -from mx.DateTime import now -NOW = now() from logilab.common.testlib import unittest_main from cubicweb.devtools.apptest import EnvBasedTC +from cubicweb.common.mttransforms import HAS_TAL from cubicweb.web.widgets import widget, AutoCompletionWidget class WidgetsTC(EnvBasedTC): - + def get_widget(self, etype, rname, rtype): rschema = self.schema[rname] return widget(self.vreg, etype, rschema, rtype, role='subject') - + def test_hidden_widget(self): w = self.get_widget('State', 'eid', 'Int') @@ -30,7 +30,7 @@ u'') def test_textarea_widget(self): - self.add_entity('EProperty', pkey=u'ui.fckeditor', value=u'') + self.add_entity('CWProperty', pkey=u'ui.fckeditor', value=u'') self.commit() w = self.get_widget('State', 'description', 'String') self.assertEquals(w.name, 'description') @@ -41,6 +41,10 @@ entity self.assertEquals(w.required(entity), False) self.assertEquals(w.render(entity), '') + if HAS_TAL: + tal_format = u'\n' + else: + tal_format = u'' self.assertTextEquals(w.edit_render(entity), u''' @@ -48,12 +52,11 @@
''') +%s +
''' % tal_format) def test_textarea_widget_previous_value(self): - self.add_entity('EProperty', pkey=u'ui.fckeditor', value=u'') + self.add_entity('CWProperty', pkey=u'ui.fckeditor', value=u'') self.commit() w = self.get_widget('State', 'description', 'String') req = self.request() @@ -62,6 +65,10 @@ entity.eid = 'X' self.assertEquals(w.required(entity), False) self.assertEquals(w.render(entity), '') + if HAS_TAL: + tal_format = u'\n' + else: + tal_format = u'' self.assertTextEquals(w.edit_render(entity), u''' @@ -69,9 +76,8 @@
''') +%s +
''' % tal_format) def test_fckeditor_widget(self): w = self.get_widget('State', 'description', 'String') @@ -179,10 +185,9 @@ def test_datetime_widget(self): w = self.get_widget('Personne', 'datenaiss', 'Datetime') self.assertEquals(w.name, 'datenaiss') - now_ = now() - example = '%s, or without time: %s' % ( - now_.strftime(self.vreg.property_value('ui.datetime-format')), - now_.strftime(self.vreg.property_value('ui.date-format'))) + example = '%s, or without time: %s' % ( + NOW.strftime(self.vreg.property_value('ui.datetime-format')), + NOW.strftime(self.vreg.property_value('ui.date-format'))) self.assertEquals(w.render_example(self.request()), example) self.assertDictEquals(w.attrs, {'accesskey': 'd', 'maxlength': 16, 'size': 16}) entity = self.etype_instance('Personne') @@ -214,7 +219,7 @@ def test_float_widget(self): w = self.get_widget('Personne', 'salary', 'Float') self.assertEquals(w.name, 'salary') - format = now().strftime(self.vreg.property_value('ui.float-format')) + format = self.vreg.property_value('ui.float-format') self.assertEquals(w.render_example(self.request()), format % 1.23) self.assertDictEquals(w.attrs, {'accesskey': 's', 'maxlength': 15, 'size': 5}) entity = self.etype_instance('Personne') @@ -224,12 +229,12 @@ self.assertEquals(w.edit_render(entity), u'\n' '') - - + + def test_float_widget_previous_value(self): w = self.get_widget('Personne', 'salary', 'Float') self.assertEquals(w.name, 'salary') - format = now().strftime(self.vreg.property_value('ui.float-format')) + format = self.vreg.property_value('ui.float-format') self.assertEquals(w.render_example(self.request()), format % 1.23) self.assertDictEquals(w.attrs, {'accesskey': 's', 'maxlength': 15, 'size': 5}) req = self.request() @@ -277,11 +282,11 @@ def test_password_widget(self): - w = self.get_widget('EUser', 'upassword', 'Password') + w = self.get_widget('CWUser', 'upassword', 'Password') self.assertEquals(w.name, 'upassword') self.assertEquals(w.render_example(self.request()), '') self.assertDictEquals(w.attrs, {'accesskey': 'u'}) - entity = self.etype_instance('EUser') + entity = self.etype_instance('CWUser') entity.eid = 'X' self.assertEquals(w.required(entity), True) self.assertEquals(w.render(entity), '') @@ -307,7 +312,7 @@ self.assertTextEquals(w.edit_render(entity), u'\n' u'') - + finally: del entity.widgets['nom'] @@ -330,7 +335,7 @@ self.assertTextEquals(w.edit_render(entity), u'\n' u'') - + finally: del entity.widgets['nom'] @@ -338,7 +343,7 @@ def test_nonregr_float_widget_with_none(self): w = self.get_widget('Personne', 'salary', 'Float') self.assertEquals(w.name, 'salary') - format = now().strftime(self.vreg.property_value('ui.float-format')) + format = self.vreg.property_value('ui.float-format') self.assertEquals(w.render_example(self.request()), format % 1.23) self.assertDictEquals(w.attrs, {'accesskey': 's', 'maxlength': 15, 'size': 5}) req = self.request() @@ -358,7 +363,7 @@ entity.autocomplete_initfuncs = {'nom' : 'getnames'} w = self.get_widget(entity, 'travaille', 'Societe') self.failUnless(isinstance(w, AutoCompletionWidget)) - - + + if __name__ == '__main__': unittest_main() diff -r 49075f57cf2c -r aa09e20dd8c0 web/uicfg.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/uicfg.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,281 @@ +# :organization: Logilab +# :copyright: 2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +# :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +"""This module regroups a set of structures that may be used to configure +various places of the generated web interface. + +Primary view configuration +`````````````````````````` +:primaryview_section: + where to display a relation in primary view. Value may be one of: + * 'attributes', display in the attributes section + * 'relations', display in the relations section (below attributes) + * 'sideboxes', display in the side boxes (beside attributes) + * 'hidden', don't display + +:primaryview_display_ctrl: + + how to display a relation in primary view. Values are dict with some of the + following keys: + + :vid: + identifier of a view to use to display the result set. Defaults depends on + the section: + * 'attributes' section: 'reledit' view + * 'relations' section: 'autolimited' view + * 'sideboxes' section: 'sidebox' view + + :label: + label for the relations section or side box + + :limit: + boolean telling if the results should be limited according to the + configuration + + :filter: + callback taking the related result set as argument and returning it + filtered + + :order: + int used to control order within a section. When not specified, + automatically set according to order in which tags are added. + + Notice those values are only considered if the relation is in a displayed + section (controlled by :attr:`primaryview_section`) + + +Index view configuration +```````````````````````` +:indexview_etype_section: + entity type category in the index/manage page. May be one of + * 'application' + * 'system' + * 'schema' + * 'subobject' (not displayed by default) + + +Actions box configuration +````````````````````````` +:actionbox_appearsin_addmenu: + simple boolean relation tags used to control the "add entity" submenu. + Relations whose rtag is True will appears, other won't. + +Automatic form configuration +```````````````````````````` + +""" +__docformat__ = "restructuredtext en" + +from cubicweb.rtags import RelationTags, RelationTagsBool, RelationTagsSet +from cubicweb.web import formwidgets + +# primary view configuration ################################################## + +def dual_role(role): + return 'object' if role == 'subject' else 'subject' + +def card_from_role(card, role): + if role == 'subject': + return card[0] + assert role in ('object', 'sobject'), repr(role) + return card[1] + +def init_primaryview_section(rtag, sschema, rschema, oschema, role): + if rtag.get(sschema, rschema, oschema, role) is None: + card = card_from_role(rschema.rproperty(sschema, oschema, 'cardinality'), role) + composed = rschema.rproperty(sschema, oschema, 'composite') == dual_role(role) + if rschema.is_final(): + if rschema.meta or oschema.type in ('Password', 'Bytes'): + section = 'hidden' + else: + section = 'attributes' + elif card in '1+': + section = 'attributes' + elif composed: + section = 'relations' + else: + section = 'sideboxes' + rtag.tag_relation((sschema, rschema, oschema, role), section) + +primaryview_section = RelationTags(init_primaryview_section, + frozenset(('attributes', 'relations', + 'sideboxes', 'hidden'))) +for rtype in ('eid', 'creation_date', 'modification_date', + 'is', 'is_instance_of', 'identity', + 'owned_by', 'created_by', + 'in_state', 'wf_info_for', 'require_permission', + 'from_entity', 'to_entity', + 'see_also'): + primaryview_section.tag_subject_of(('*', rtype, '*'), 'hidden') + primaryview_section.tag_object_of(('*', rtype, '*'), 'hidden') + +for attr in ('name', 'meta', 'final'): + primaryview_section.tag_attribute(('CWEType', attr), 'hidden') +for attr in ('name', 'meta', 'final', 'symetric', 'inlined'): + primaryview_section.tag_attribute(('CWRType', attr), 'hidden') + + +class DisplayCtrlRelationTags(RelationTags): + def __init__(self, *args, **kwargs): + super(DisplayCtrlRelationTags, self).__init__(*args, **kwargs) + self._counter = 0 + + def tag_relation(self, key, tag): + assert isinstance(tag, dict) + super(DisplayCtrlRelationTags, self).tag_relation(key, tag) + self._counter += 1 + tag.setdefault('order', self._counter) + + +def init_primaryview_display_ctrl(rtag, sschema, rschema, oschema, role): + if role == 'subject': + oschema = '*' + label = rschema.type + else: + sschema = '*' + label = '%s_%s' % (rschema, role) + displayinfo = rtag.get(sschema, rschema, oschema, role) + if displayinfo is None: + displayinfo = {} + rtag.tag_relation((sschema, rschema, oschema, role), displayinfo) + displayinfo.setdefault('label', label) + +primaryview_display_ctrl = DisplayCtrlRelationTags(init_primaryview_display_ctrl) + + +# index view configuration #################################################### +# entity type section in the index/manage page. May be one of +# * 'application' +# * 'system' +# * 'schema' +# * 'subobject' (not displayed by default) + +indexview_etype_section = {'EmailAddress': 'subobject'} + + +# autoform.AutomaticEntityForm configuration ################################## + +# relations'section (eg primary/secondary/generic/metadata/generated) + +def init_autoform_section(rtag, sschema, rschema, oschema, role): + if rtag.get(sschema, rschema, oschema, role) is None: + if role == 'subject': + card = rschema.rproperty(sschema, oschema, 'cardinality')[0] + composed = rschema.rproperty(sschema, oschema, 'composite') == 'object' + else: + card = rschema.rproperty(sschema, oschema, 'cardinality')[1] + composed = rschema.rproperty(sschema, oschema, 'composite') == 'subject' + if sschema.is_metadata(rschema): + section = 'generated' + elif card in '1+': + if not rschema.is_final() and composed: + section = 'generated' + else: + section = 'primary' + elif rschema.is_final(): + section = 'secondary' + else: + section = 'generic' + rtag.tag_relation((sschema, rschema, oschema, role), section) + +autoform_section = RelationTags(init_autoform_section, + set(('primary', 'secondary', 'generic', + 'metadata', 'generated'))) +# use primary and not generated for eid since it has to be an hidden +autoform_section.tag_attribute(('*', 'eid'), 'primary') +autoform_section.tag_attribute(('*', 'description'), 'secondary') +autoform_section.tag_attribute(('*', 'creation_date'), 'metadata') +autoform_section.tag_attribute(('*', 'modification_date'), 'metadata') +autoform_section.tag_attribute(('*', 'has_text'), 'generated') +autoform_section.tag_subject_of(('*', 'in_state', '*'), 'primary') +autoform_section.tag_subject_of(('*', 'owned_by', '*'), 'metadata') +autoform_section.tag_subject_of(('*', 'created_by', '*'), 'metadata') +autoform_section.tag_subject_of(('*', 'is', '*'), 'generated') +autoform_section.tag_object_of(('*', 'is', '*'), 'generated') +autoform_section.tag_subject_of(('*', 'is_instance_of', '*'), 'generated') +autoform_section.tag_object_of(('*', 'is_instance_of', '*'), 'generated') +autoform_section.tag_subject_of(('*', 'identity', '*'), 'generated') +autoform_section.tag_object_of(('*', 'identity', '*'), 'generated') +autoform_section.tag_subject_of(('*', 'require_permission', '*'), 'generated') +autoform_section.tag_subject_of(('*', 'wf_info_for', '*'), 'generated') +autoform_section.tag_object_of(('*', 'wf_info_for', '*'), 'generated') +autoform_section.tag_subject_of(('*', 'for_user', '*'), 'generated') +autoform_section.tag_object_of(('*', 'for_user', '*'), 'generated') +autoform_section.tag_subject_of(('CWPermission', 'require_group', '*'), 'primary') +autoform_section.tag_attribute(('CWEType', 'final'), 'generated') +autoform_section.tag_attribute(('CWRType', 'final'), 'generated') +autoform_section.tag_attribute(('CWUser', 'firstname'), 'secondary') +autoform_section.tag_attribute(('CWUser', 'surname'), 'secondary') +autoform_section.tag_attribute(('CWUser', 'last_login_time'), 'metadata') +autoform_section.tag_subject_of(('CWUser', 'in_group', '*'), 'primary') +autoform_section.tag_object_of(('*', 'owned_by', 'CWUser'), 'generated') +autoform_section.tag_object_of(('*', 'created_by', 'CWUser'), 'generated') +autoform_section.tag_object_of(('*', 'bookmarked_by', 'CWUser'), 'metadata') +autoform_section.tag_attribute(('Bookmark', 'path'), 'primary') +autoform_section.tag_subject_of(('*', 'use_email', '*'), 'generated') # inlined actually +autoform_section.tag_subject_of(('*', 'primary_email', '*'), 'generic') + + +# relations'field class +autoform_field = RelationTags() + +# relations'field explicit kwargs (given to field's __init__) +autoform_field_kwargs = RelationTags() +autoform_field_kwargs.tag_attribute(('RQLExpression', 'expression'), + {'widget': formwidgets.TextInput}) +autoform_field_kwargs.tag_attribute(('Bookmark', 'path'), + {'widget': formwidgets.TextInput}) + + + +# inlined view flag for non final relations: when True for an entry, the +# entity(ies) at the other end of the relation will be editable from the +# form of the edited entity +autoform_is_inlined = RelationTagsBool() +autoform_is_inlined.tag_subject_of(('*', 'use_email', '*'), True) +autoform_is_inlined.tag_subject_of(('CWRelation', 'relation_type', '*'), True) +autoform_is_inlined.tag_subject_of(('CWRelation', 'from_entity', '*'), True) +autoform_is_inlined.tag_subject_of(('CWRelation', 'to_entity', '*'), True) + + +# set of tags of the form _on_new on relations. is a +# schema action (add/update/delete/read), and when such a tag is found +# permissions checking is by-passed and supposed to be ok +autoform_permissions_overrides = RelationTagsSet() + + +# boxes.EditBox configuration ################################################# + +# 'link' / 'create' relation tags, used to control the "add entity" submenu +def init_actionbox_appearsin_addmenu(rtag, sschema, rschema, oschema, role): + if rtag.get(sschema, rschema, oschema, role) is None: + card = rschema.rproperty(sschema, oschema, 'cardinality')[role == 'object'] + if not card in '?1' and \ + rschema.rproperty(sschema, oschema, 'composite') == role: + rtag.tag_relation((sschema, rschema, oschema, role), True) + +actionbox_appearsin_addmenu = RelationTagsBool(init_actionbox_appearsin_addmenu) +actionbox_appearsin_addmenu.tag_subject_of(('*', 'is', '*'), False) +actionbox_appearsin_addmenu.tag_object_of(('*', 'is', '*'), False) +actionbox_appearsin_addmenu.tag_subject_of(('*', 'is_instance_of', '*'), False) +actionbox_appearsin_addmenu.tag_object_of(('*', 'is_instance_of', '*'), False) +actionbox_appearsin_addmenu.tag_subject_of(('*', 'identity', '*'), False) +actionbox_appearsin_addmenu.tag_object_of(('*', 'identity', '*'), False) +actionbox_appearsin_addmenu.tag_subject_of(('*', 'owned_by', '*'), False) +actionbox_appearsin_addmenu.tag_subject_of(('*', 'created_by', '*'), False) +actionbox_appearsin_addmenu.tag_subject_of(('*', 'require_permission', '*'), False) +actionbox_appearsin_addmenu.tag_subject_of(('*', 'wf_info_for', '*'), False) +actionbox_appearsin_addmenu.tag_object_of(('*', 'wf_info_for', '*'), False) +actionbox_appearsin_addmenu.tag_object_of(('*', 'state_of', 'CWEType'), True) +actionbox_appearsin_addmenu.tag_object_of(('*', 'transition_of', 'CWEType'), True) +actionbox_appearsin_addmenu.tag_object_of(('*', 'relation_type', 'CWRType'), True) +actionbox_appearsin_addmenu.tag_object_of(('*', 'from_entity', 'CWEType'), False) +actionbox_appearsin_addmenu.tag_object_of(('*', 'to_entity', 'CWEType'), False) +actionbox_appearsin_addmenu.tag_object_of(('*', 'in_group', 'CWGroup'), True) +actionbox_appearsin_addmenu.tag_object_of(('*', 'owned_by', 'CWUser'), False) +actionbox_appearsin_addmenu.tag_object_of(('*', 'created_by', 'CWUser'), False) +actionbox_appearsin_addmenu.tag_object_of(('*', 'bookmarked_by', 'CWUser'), True) +actionbox_appearsin_addmenu.tag_subject_of(('Transition', 'destination_state', '*'), True) +actionbox_appearsin_addmenu.tag_object_of(('*', 'allowed_transition', 'Transition'), True) +actionbox_appearsin_addmenu.tag_object_of(('*', 'destination_state', 'State'), True) +actionbox_appearsin_addmenu.tag_subject_of(('State', 'allowed_transition', '*'), True) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/__init__.py --- a/web/views/__init__.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/__init__.py Thu May 14 12:48:11 2009 +0200 @@ -1,13 +1,17 @@ -"""Views/forms and actions for the CubicWeb web client +"""Views, forms, actions... for the CubicWeb web client :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" - + +import os +from tempfile import mktemp + from rql import nodes + def need_table_view(rset, schema): """return True if we think that a table view is more appropriate than a list or primary view to display the given result set @@ -48,11 +52,16 @@ return True return False - +VID_BY_MIMETYPE = {'text/xml': 'xml', + # XXX rss, owl... + } def vid_from_rset(req, rset, schema): """given a result set, return a view id""" if rset is None: return 'index' + for mimetype in req.parse_accept_header('Accept'): + if mimetype in VID_BY_MIMETYPE: + return VID_BY_MIMETYPE[mimetype] nb_rows = len(rset) # empty resultset if nb_rows == 0 : @@ -68,29 +77,34 @@ return 'list' return 'table' -def linksearch_match(req, rset): - """when searching an entity to create a relation, return True if entities in - the given rset may be used as relation end - """ - try: - searchedtype = req.search_state[1][-1] - except IndexError: - return 0 # no searching for association - for etype in rset.column_types(0): - if etype != searchedtype: - return 0 - return 1 - + def linksearch_select_url(req, rset): """when searching an entity to create a relation, return an url to select entities in the given rset """ req.add_js( ('cubicweb.ajax.js', 'cubicweb.edition.js') ) - target, link_eid, r_type, searchedtype = req.search_state[1] + target, eid, r_type, searchedtype = req.search_state[1] if target == 'subject': - id_fmt = '%s:%s:%%s' % (link_eid, r_type) + id_fmt = '%s:%s:%%s' % (eid, r_type) else: - id_fmt = '%%s:%s:%s' % (r_type, link_eid) + id_fmt = '%%s:%s:%s' % (r_type, eid) triplets = '-'.join(id_fmt % row[0] for row in rset.rows) - return "javascript: selectForAssociation('%s', '%s');" % (triplets, - link_eid) + return "javascript: selectForAssociation('%s', '%s');" % (triplets, eid) + + +class TmpFileViewMixin(object): + binary = True + content_type = 'application/octet-stream' + cache_max_age = 60*60*2 # stay in http cache for 2 hours by default + + def call(self): + self.cell_call() + + def cell_call(self, row=0, col=0): + self.row, self.col = row, col # in case one need it + tmpfile = mktemp('.png') + try: + self._generate(tmpfile) + self.w(open(tmpfile).read()) + finally: + os.unlink(tmpfile) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/actions.py --- a/web/views/actions.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/actions.py Thu May 14 12:48:11 2009 +0200 @@ -6,71 +6,109 @@ """ __docformat__ = "restructuredtext en" -from cubicweb.common.selectors import (searchstate_accept, match_user_group, yes, - one_line_rset, two_lines_rset, one_etype_rset, - authenticated_user, none_rset, - match_search_state, chainfirst, chainall) - -from cubicweb.web.action import Action, EntityAction, LinkToEntityAction -from cubicweb.web.views import linksearch_select_url, linksearch_match -from cubicweb.web.views.baseviews import vid_from_rset +from cubicweb.vregistry import objectify_selector +from cubicweb.selectors import (EntitySelector, + one_line_rset, two_lines_rset, one_etype_rset, relation_possible, + non_final_entity, + authenticated_user, match_user_groups, match_search_state, + has_permission, has_add_permission, + ) +from cubicweb.web.action import Action +from cubicweb.web.views import linksearch_select_url, vid_from_rset +from cubicweb.web.views.autoform import AutomaticEntityForm _ = unicode + +class has_editable_relation(EntitySelector): + """accept if some relations for an entity found in the result set is + editable by the logged user. + + See `EntitySelector` documentation for behaviour when row is not specified. + """ + + def score_entity(self, entity): + # if user has no update right but it can modify some relation, + # display action anyway + for dummy in AutomaticEntityForm.esrelations_by_category( + entity, 'generic', 'add'): + return 1 + for rschema, targetschemas, role in AutomaticEntityForm.erelations_by_category( + entity, ('primary', 'secondary'), 'add'): + if not rschema.is_final(): + return 1 + return 0 + +@objectify_selector +def match_searched_etype(cls, req, rset, **kwargs): + return req.match_search_state(rset) + +@objectify_selector +def view_is_not_default_view(cls, req, rset, **kwargs): + # interesting if it propose another view than the current one + vid = req.form.get('vid') + if vid and vid != vid_from_rset(req, rset, cls.schema): + return 1 + return 0 + +@objectify_selector +def addable_etype_empty_rset(cls, req, rset, **kwargs): + if rset is not None and not rset.rowcount: + rqlst = rset.syntax_tree() + if len(rqlst.children) > 1: + return 0 + select = rqlst.children[0] + if len(select.defined_vars) == 1 and len(select.solutions) == 1: + rset._searched_etype = select.solutions[0].itervalues().next() + eschema = cls.schema.eschema(rset._searched_etype) + if not (eschema.is_final() or eschema.is_subobject(strict=True)) \ + and eschema.has_perm(req, 'add'): + return 1 + return 0 + # generic primary actions ##################################################### -class SelectAction(EntityAction): +class SelectAction(Action): """base class for link search actions. By default apply on any size entity result search it the current state is 'linksearch' if accept match. """ - category = 'mainactions' - __selectors__ = (searchstate_accept,) - search_states = ('linksearch',) + id = 'select' + __select__ = match_search_state('linksearch') & match_searched_etype() + + title = _('select') + category = 'mainactions' order = 0 - - id = 'select' - title = _('select') - - @classmethod - def accept_rset(cls, req, rset, row, col): - return linksearch_match(req, rset) - + def url(self): return linksearch_select_url(self.req, self.rset) class CancelSelectAction(Action): + id = 'cancel' + __select__ = match_search_state('linksearch') + + title = _('cancel select') category = 'mainactions' - search_states = ('linksearch',) order = 10 - - id = 'cancel' - title = _('cancel select') - + def url(self): - target, link_eid, r_type, searched_type = self.req.search_state[1] - return self.build_url(rql="Any X WHERE X eid %s" % link_eid, + target, eid, r_type, searched_type = self.req.search_state[1] + return self.build_url(str(eid), vid='edition', __mode='normal') class ViewAction(Action): - category = 'mainactions' - __selectors__ = (match_user_group, searchstate_accept) - require_groups = ('users', 'managers') - order = 0 - id = 'view' + __select__ = (match_search_state('normal') & + match_user_groups('users', 'managers') & + view_is_not_default_view() & + non_final_entity()) + title = _('view') - - @classmethod - def accept_rset(cls, req, rset, row, col): - # interesting if it propose another view than the current one - vid = req.form.get('vid') - if vid and vid != vid_from_rset(req, rset, cls.schema): - return 1 - return 0 - + category = 'mainactions' + order = 0 + def url(self): params = self.req.form.copy() params.pop('vid', None) @@ -79,90 +117,82 @@ **params) -class ModifyAction(EntityAction): - category = 'mainactions' - __selectors__ = (one_line_rset, searchstate_accept) - schema_action = 'update' - order = 10 - +class ModifyAction(Action): id = 'edit' + __select__ = (match_search_state('normal') & + one_line_rset() & + (has_permission('update') | has_editable_relation('add'))) + title = _('modify') - - @classmethod - def has_permission(cls, entity, action): - if entity.has_perm(action): - return True - # if user has no update right but it can modify some relation, - # display action anyway - for dummy in entity.srelations_by_category(('generic', 'metadata'), - 'add'): - return True - for rschema, targetschemas, role in entity.relations_by_category( - ('primary', 'secondary'), 'add'): - if not rschema.is_final(): - return True - return False + category = 'mainactions' + order = 10 def url(self): entity = self.rset.get_entity(self.row or 0, self.col or 0) return entity.absolute_url(vid='edition') - + -class MultipleEditAction(EntityAction): +class MultipleEditAction(Action): + id = 'muledit' # XXX get strange conflicts if id='edit' + __select__ = (match_search_state('normal') & + two_lines_rset() & one_etype_rset() & + has_permission('update')) + + title = _('modify') category = 'mainactions' - __selectors__ = (two_lines_rset, one_etype_rset, - searchstate_accept) - schema_action = 'update' order = 10 - - id = 'muledit' # XXX get strange conflicts if id='edit' - title = _('modify') - + def url(self): return self.build_url('view', rql=self.rset.rql, vid='muledit') # generic secondary actions ################################################### -class ManagePermissions(LinkToEntityAction): - accepts = ('Any',) - category = 'moreactions' - id = 'addpermission' +class ManagePermissionsAction(Action): + id = 'managepermission' + __select__ = one_line_rset() & non_final_entity() & match_user_groups('managers') + title = _('manage permissions') - order = 100 + category = 'moreactions' + order = 15 - etype = 'EPermission' - rtype = 'require_permission' - target = 'object' - + @classmethod + def registered(cls, vreg): + super(ManagePermissionsAction, cls).registered(vreg) + if 'require_permission' in vreg.schema: + cls.__select__ = (one_line_rset() & non_final_entity() & + (match_user_groups('managers') + | relation_possible('require_permission', 'subject', 'CWPermission', + action='add'))) + return super(ManagePermissionsAction, cls).registered(vreg) + def url(self): - return self.rset.get_entity(0, 0).absolute_url(vid='security') + return self.rset.get_entity(self.row or 0, self.col or 0).absolute_url(vid='security') + - -class DeleteAction(EntityAction): - category = 'moreactions' - __selectors__ = (searchstate_accept,) - schema_action = 'delete' +class DeleteAction(Action): + id = 'delete' + __select__ = has_permission('delete') + + title = _('delete') + category = 'moreactions' order = 20 - - id = 'delete' - title = _('delete') - + def url(self): if len(self.rset) == 1: - entity = self.rset.get_entity(0, 0) + entity = self.rset.get_entity(self.row or 0, self.col or 0) return self.build_url(entity.rest_path(), vid='deleteconf') return self.build_url(rql=self.rset.printable_rql(), vid='deleteconf') - - -class CopyAction(EntityAction): + + +class CopyAction(Action): + id = 'copy' + __select__ = one_line_rset() & has_permission('add') + + title = _('copy') category = 'moreactions' - schema_action = 'add' order = 30 - - id = 'copy' - title = _('copy') - + def url(self): entity = self.rset.get_entity(self.row or 0, self.col or 0) return entity.absolute_url(vid='copy') @@ -172,34 +202,14 @@ """when we're seeing more than one entity with the same type, propose to add a new one """ + id = 'addentity' + __select__ = (match_search_state('normal') & + (addable_etype_empty_rset() + | (two_lines_rset() & one_etype_rset & has_add_permission())) + ) + category = 'moreactions' - id = 'addentity' order = 40 - - def etype_rset_selector(cls, req, rset, **kwargs): - if rset is not None and not rset.rowcount: - rqlst = rset.syntax_tree() - if len(rqlst.children) > 1: - return 0 - select = rqlst.children[0] - if len(select.defined_vars) == 1 and len(select.solutions) == 1: - rset._searched_etype = select.solutions[0].itervalues().next() - eschema = cls.schema.eschema(rset._searched_etype) - if not (eschema.is_final() or eschema.is_subobject(strict=True)) \ - and eschema.has_perm(req, 'add'): - return 1 - return 0 - - def has_add_perm_selector(cls, req, rset, **kwargs): - eschema = cls.schema.eschema(rset.description[0][0]) - if not (eschema.is_final() or eschema.is_subobject(strict=True)) \ - and eschema.has_perm(req, 'add'): - return 1 - return 0 - __selectors__ = (match_search_state, - chainfirst(etype_rset_selector, - chainall(two_lines_rset, one_etype_rset, - has_add_perm_selector))) @property def rsettype(self): @@ -218,114 +228,66 @@ # logged user actions ######################################################### class UserPreferencesAction(Action): + id = 'myprefs' + __select__ = authenticated_user() + + title = _('user preferences') category = 'useractions' - __selectors__ = authenticated_user, order = 10 - - id = 'myprefs' - title = _('user preferences') def url(self): return self.build_url(self.id) class UserInfoAction(Action): + id = 'myinfos' + __select__ = authenticated_user() + + title = _('personnal informations') category = 'useractions' - __selectors__ = authenticated_user, order = 20 - - id = 'myinfos' - title = _('personnal informations') def url(self): - return self.build_url('euser/%s'%self.req.user.login, vid='edition') + return self.build_url('cwuser/%s'%self.req.user.login, vid='edition') class LogoutAction(Action): - category = 'useractions' - __selectors__ = authenticated_user, - order = 30 - id = 'logout' - title = _('logout') + __select__ = authenticated_user() - def url(self): - return self.build_url(self.id) - - -# site actions ################################################################ - -class ManagersAction(Action): - category = 'siteactions' - __abstract__ = True - __selectors__ = match_user_group, - require_groups = ('managers',) + title = _('logout') + category = 'useractions' + order = 30 def url(self): return self.build_url(self.id) - -class SiteConfigurationAction(ManagersAction): - order = 10 - id = 'siteconfig' - title = _('site configuration') + +# site actions ################################################################ - -class ManageAction(ManagersAction): - order = 20 - id = 'manage' - title = _('manage') - +class ManagersAction(Action): + __abstract__ = True + __select__ = match_user_groups('managers') -class ViewSchemaAction(Action): category = 'siteactions' - id = 'schema' - title = _("site schema") - __selectors__ = yes, - order = 30 - + def url(self): return self.build_url(self.id) -# content type specific actions ############################################### +class SiteConfigurationAction(ManagersAction): + id = 'siteconfig' + title = _('site configuration') + order = 10 -class FollowAction(EntityAction): - category = 'mainactions' - accepts = ('Bookmark',) - - id = 'follow' - title = _('follow') - - def url(self): - return self.rset.get_entity(self.row or 0, self.col or 0).actual_url() -class UserPreferencesEntityAction(EntityAction): - __selectors__ = EntityAction.__selectors__ + (one_line_rset, match_user_group,) - require_groups = ('owners', 'managers') - category = 'mainactions' - accepts = ('EUser',) - - id = 'prefs' - title = _('preferences') - - def url(self): - login = self.rset.get_entity(self.row or 0, self.col or 0).login - return self.build_url('euser/%s'%login, vid='epropertiesform') +class ManageAction(ManagersAction): + id = 'manage' + title = _('manage') + order = 20 -# schema view action -def schema_view(cls, req, rset, row=None, col=None, view=None, - **kwargs): - if view is None or not view.id == 'schema': - return 0 - return 1 -class DownloadOWLSchemaAction(Action): - category = 'mainactions' - id = 'download_as_owl' - title = _('download schema as owl') - __selectors__ = none_rset, schema_view - - def url(self): - return self.build_url('view', vid='owl') +from logilab.common.deprecation import class_moved +from cubicweb.web.views.bookmark import FollowAction +FollowAction = class_moved(FollowAction) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/ajaxedit.py --- a/web/views/ajaxedit.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/ajaxedit.py Thu May 14 12:48:11 2009 +0200 @@ -1,13 +1,13 @@ """Set of views allowing edition of entities/relations using ajax :organization: Logilab -:copyright: 2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" -from cubicweb.common.selectors import (chainfirst, match_form_params, - match_kwargs) +from cubicweb import role +from cubicweb.selectors import match_form_params, match_kwargs from cubicweb.web.box import EditRelationBoxTemplate class AddRelationView(EditRelationBoxTemplate): @@ -18,13 +18,14 @@ class attributes. """ __registry__ = 'views' - __selectors__ = (chainfirst(match_form_params, match_kwargs),) + __select__ = (match_form_params('rtype', 'target') + | match_kwargs('rtype', 'target')) property_defs = {} # don't want to inherit this from Box id = 'xaddrelation' expected_kwargs = form_params = ('rtype', 'target') build_js = EditRelationBoxTemplate.build_reload_js_call - + def cell_call(self, row, col, rtype=None, target=None, etype=None): self.rtype = rtype or self.req.form['rtype'] self.target = target or self.req.form['target'] @@ -41,7 +42,7 @@ fakebox = [] self.w(u'

' % self.id) self.w(u'

%s

' % self.req._('relation %(relname)s of %(ent)s') - % {'relname': rschema.display_name(self.req, self.xtarget()[0]), + % {'relname': rschema.display_name(self.req, role(self)), 'ent': entity.view('incontext')}) self.w(u'

.*)\.logilab\.fr', match='host', + RewriteCond('(?P.*)\.logilab\.fr', match='host', rules=[('/(.*)', r'/m_%(cat)s/\1')]), ] """ __abstract__ = True id = 'urlrewriter' rules = [] - + def rewrite(self, host, path): for cond in self.rules: if cond.match(host=host, path=path): diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/authentication.py --- a/web/views/authentication.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/authentication.py Thu May 14 12:48:11 2009 +0200 @@ -1,7 +1,7 @@ """user authentication component :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -12,11 +12,11 @@ from cubicweb.dbapi import repo_connect, ConnectionProperties from cubicweb.web import ExplicitLogin, InvalidSession from cubicweb.web.application import AbstractAuthenticationManager - + class RepositoryAuthenticationManager(AbstractAuthenticationManager): """authenticate user associated to a request and check session validity""" - + def __init__(self): self.repo = self.config.repository(self.vreg) self.log_queries = self.config['query-log-file'] @@ -51,10 +51,22 @@ # associate the connection to the current request req.set_connection(cnx, user) return cnx - + + def login_from_email(self, login): + # XXX should not be called from web interface + session = self.repo.internal_session() + try: + rset = session.execute('Any L WHERE U login L, U primary_email M, ' + 'M address %(login)s', {'login': login}) + if rset.rowcount == 1: + login = rset[0][0] + finally: + session.close() + return login + def authenticate(self, req, _login=None, _password=None): """authenticate user and return corresponding user object - + :raise ExplicitLogin: if authentication is required (no authentication info found or wrong user/password) @@ -66,6 +78,8 @@ login, password = _login, _password else: login, password = req.get_authorization() + if self.vreg.config['allow-email-login'] and '@' in (login or u''): + login = self.login_from_email(login) if not login: # No session and no login -> try anonymous login, password = self.vreg.config.anonymous_user() diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/autoform.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/autoform.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,305 @@ +"""The automatic entity form. + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" +_ = unicode + +from logilab.common.decorators import iclassmethod + +from cubicweb import typed_eid +from cubicweb.web import stdmsgs, uicfg +from cubicweb.web.form import FieldNotFound, EntityFieldsForm +from cubicweb.web.formfields import guess_field +from cubicweb.web.formwidgets import Button, SubmitButton +from cubicweb.web.views.editforms import toggleable_relation_link, relation_id + + +class AutomaticEntityForm(EntityFieldsForm): + """base automatic form to edit any entity. + + Designed to be fully generated from schema but highly configurable through: + * rtags (rcategories, rfields, rwidgets, inlined, rpermissions) + * various standard form parameters + + You can also easily customise it by adding/removing fields in + AutomaticEntityForm instances. + """ + id = 'edition' + + cwtarget = 'eformframe' + cssclass = 'entityForm' + copy_nav_params = True + form_buttons = [SubmitButton(stdmsgs.BUTTON_OK), + Button(stdmsgs.BUTTON_APPLY, cwaction='apply'), + Button(stdmsgs.BUTTON_CANCEL, cwaction='cancel')] + attrcategories = ('primary', 'secondary') + # class attributes below are actually stored in the uicfg module since we + # don't want them to be reloaded + rcategories = uicfg.autoform_section + rfields = uicfg.autoform_field + rfields_kwargs = uicfg.autoform_field_kwargs + rinlined = uicfg.autoform_is_inlined + rpermissions_overrides = uicfg.autoform_permissions_overrides + + @classmethod + def erelations_by_category(cls, entity, categories=None, permission=None, + rtags=None): + """return a list of (relation schema, target schemas, role) matching + categories and permission + """ + if categories is not None: + if not isinstance(categories, (list, tuple, set, frozenset)): + categories = (categories,) + if not isinstance(categories, (set, frozenset)): + categories = frozenset(categories) + eschema = entity.e_schema + if rtags is None: + rtags = cls.rcategories + permsoverrides = cls.rpermissions_overrides + if entity.has_eid(): + eid = entity.eid + else: + eid = None + for rschema, targetschemas, role in eschema.relation_definitions(True): + # check category first, potentially lower cost than checking + # permission which may imply rql queries + if categories is not None: + targetschemas = [tschema for tschema in targetschemas + if rtags.etype_get(eschema, rschema, role, tschema) in categories] + if not targetschemas: + continue + if permission is not None: + # tag allowing to hijack the permission machinery when + # permission is not verifiable until the entity is actually + # created... + if eid is None and '%s_on_new' % permission in permsoverrides.etype_get(eschema, rschema, role): + yield (rschema, targetschemas, role) + continue + if rschema.is_final(): + if not rschema.has_perm(entity.req, permission, eid): + continue + elif role == 'subject': + if not ((eid is None and rschema.has_local_role(permission)) or + rschema.has_perm(entity.req, permission, fromeid=eid)): + continue + # on relation with cardinality 1 or ?, we need delete perm as well + # if the relation is already set + if (permission == 'add' + and rschema.cardinality(eschema, targetschemas[0], role) in '1?' + and eid and entity.related(rschema.type, role) + and not rschema.has_perm(entity.req, 'delete', fromeid=eid, + toeid=entity.related(rschema.type, role)[0][0])): + continue + elif role == 'object': + if not ((eid is None and rschema.has_local_role(permission)) or + rschema.has_perm(entity.req, permission, toeid=eid)): + continue + # on relation with cardinality 1 or ?, we need delete perm as well + # if the relation is already set + if (permission == 'add' + and rschema.cardinality(targetschemas[0], eschema, role) in '1?' + and eid and entity.related(rschema.type, role) + and not rschema.has_perm(entity.req, 'delete', toeid=eid, + fromeid=entity.related(rschema.type, role)[0][0])): + continue + yield (rschema, targetschemas, role) + + @classmethod + def esrelations_by_category(cls, entity, categories=None, permission=None): + """filter out result of relations_by_category(categories, permission) by + removing final relations + + return a sorted list of (relation's label, relation'schema, role) + """ + result = [] + for rschema, ttypes, role in cls.erelations_by_category( + entity, categories, permission): + if rschema.is_final(): + continue + result.append((rschema.display_name(entity.req, role), rschema, role)) + return sorted(result) + + @iclassmethod + def field_by_name(cls_or_self, name, role='subject', eschema=None): + """return field with the given name and role. If field is not explicitly + defined for the form but `eclass` is specified, guess_field will be + called. + """ + try: + return super(AutomaticEntityForm, cls_or_self).field_by_name(name, role) + except FieldNotFound: # XXX should raise more explicit exception + if eschema is None or not name in cls_or_self.schema: + raise + rschema = cls_or_self.schema.rschema(name) + # XXX use a sample target type. Document this. + tschemas = rschema.targets(eschema, role) + fieldcls = cls_or_self.rfields.etype_get(eschema, rschema, role, tschemas[0]) + kwargs = cls_or_self.rfields_kwargs.etype_get(eschema, rschema, role, tschemas[0]) + if kwargs is None: + kwargs = {} + if fieldcls: + if not isinstance(fieldcls, type): + return fieldcls # already and instance + return fieldcls(name=name, role=role, eidparam=True, **kwargs) + field = guess_field(eschema, rschema, role, eidparam=True, **kwargs) + if field is None: + raise + return field + + def __init__(self, *args, **kwargs): + super(AutomaticEntityForm, self).__init__(*args, **kwargs) + entity = self.edited_entity + if entity.has_eid(): + entity.complete() + for rschema, role in self.editable_attributes(): + try: + self.field_by_name(rschema.type, role) + continue # explicitly specified + except FieldNotFound: + # has to be guessed + try: + field = self.field_by_name(rschema.type, role, + eschema=entity.e_schema) + self.fields.append(field) + except FieldNotFound: + # meta attribute such as _format + continue + self.maxrelitems = self.req.property_value('navigation.related-limit') + self.force_display = bool(self.req.form.get('__force_display')) + + @property + def related_limit(self): + if self.force_display: + return None + return self.maxrelitems + 1 + + def relations_by_category(self, categories=None, permission=None): + """return a list of (relation schema, target schemas, role) matching + given category(ies) and permission + """ + return self.erelations_by_category(self.edited_entity, categories, + permission) + + def inlined_relations(self): + """return a list of (relation schema, target schemas, role) matching + given category(ies) and permission + """ + # we'll need an initialized varmaker if there are some inlined relation + self.initialize_varmaker() + return self.erelations_by_category(self.edited_entity, True, 'add', self.rinlined) + + def srelations_by_category(self, categories=None, permission=None): + """filter out result of relations_by_category(categories, permission) by + removing final relations + + return a sorted list of (relation's label, relation'schema, role) + """ + return self.esrelations_by_category(self.edited_entity, categories, + permission) + + def action(self): + """return the form's action attribute. Default to validateform if not + explicitly overriden. + """ + try: + return self._action + except AttributeError: + return self.build_url('validateform') + + def set_action(self, value): + """override default action""" + self._action = value + + action = property(action, set_action) + + def editable_attributes(self): + """return a list of (relation schema, role) to edit for the entity""" + return [(rschema, role) for rschema, _, role in self.relations_by_category( + self.attrcategories, 'add') if rschema != 'eid'] + + def relations_table(self): + """yiels 3-tuples (rtype, target, related_list) + where itself a list of : + - node_id (will be the entity element's DOM id) + - appropriate javascript's togglePendingDelete() function call + - status 'pendingdelete' or '' + - oneline view of related entity + """ + entity = self.edited_entity + pending_deletes = self.req.get_pending_deletes(entity.eid) + for label, rschema, role in self.srelations_by_category('generic', 'add'): + relatedrset = entity.related(rschema, role, limit=self.related_limit) + if rschema.has_perm(self.req, 'delete'): + toggleable_rel_link_func = toggleable_relation_link + else: + toggleable_rel_link_func = lambda x, y, z: u'' + related = [] + for row in xrange(relatedrset.rowcount): + nodeid = relation_id(entity.eid, rschema, role, + relatedrset[row][0]) + if nodeid in pending_deletes: + status = u'pendingDelete' + label = '+' + else: + status = u'' + label = 'x' + dellink = toggleable_rel_link_func(entity.eid, nodeid, label) + eview = self.view('oneline', relatedrset, row=row) + related.append((nodeid, dellink, status, eview)) + yield (rschema, role, related) + + def restore_pending_inserts(self, cell=False): + """used to restore edition page as it was before clicking on + 'search for ' + """ + eid = self.edited_entity.eid + cell = cell and "div_insert_" or "tr" + pending_inserts = set(self.req.get_pending_inserts(eid)) + for pendingid in pending_inserts: + eidfrom, rtype, eidto = pendingid.split(':') + if typed_eid(eidfrom) == eid: # subject + label = display_name(self.req, rtype, 'subject') + reid = eidto + else: + label = display_name(self.req, rtype, 'object') + reid = eidfrom + jscall = "javascript: cancelPendingInsert('%s', '%s', null, %s);" \ + % (pendingid, cell, eid) + rset = self.req.eid_rset(reid) + eview = self.view('text', rset, row=0) + # XXX find a clean way to handle baskets + if rset.description[0][0] == 'Basket': + eview = '%s (%s)' % (eview, display_name(self.req, 'Basket')) + yield rtype, pendingid, jscall, label, reid, eview + + # should_* method extracted to allow overriding + + def should_inline_relation_form(self, rschema, targettype, role): + """return true if the given relation with entity has role and a + targettype target should be inlined + """ + return self.rinlined.etype_get(self.edited_entity.id, rschema, role, targettype) + + def should_display_inline_creation_form(self, rschema, existant, card): + """return true if a creation form should be inlined + + by default true if there is no related entity and we need at least one + """ + return not existant and card in '1+' + + def should_display_add_new_relation_link(self, rschema, existant, card): + """return true if we should add a link to add a new creation form + (through ajax call) + + by default true if there is no related entity or if the relation has + multiple cardinality + """ + return not existant or card in '+*' + + +def etype_relation_field(etype, rtype, role='subject'): + eschema = AutomaticEntityForm.schema.eschema(etype) + return AutomaticEntityForm.field_by_name(rtype, role, eschema) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/basecomponents.py --- a/web/views/basecomponents.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/basecomponents.py Thu May 14 12:48:11 2009 +0200 @@ -2,35 +2,34 @@ * the rql input form * the logged user link -* the workflow history section for workflowable objects :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" from rql import parse -from cubicweb import Unauthorized -from cubicweb.common.uilib import html_escape, toggle_action -from cubicweb.common.selectors import yes, non_final_entity, one_line_rset +from cubicweb.selectors import yes, two_etypes_rset, match_form_params from cubicweb.schema import display_name -from cubicweb.common.selectors import (chainfirst, two_etypes_rset, - match_form_params) - -from cubicweb.web.htmlwidgets import MenuWidget, PopupBoxMenu, BoxSeparator, BoxLink -from cubicweb.web.component import (VComponent, SingletonVComponent, EntityVComponent, - RelatedObjectsVComponent) +from cubicweb.common.uilib import html_escape, toggle_action +from cubicweb.web import component +from cubicweb.web.htmlwidgets import (MenuWidget, PopupBoxMenu, BoxSeparator, + BoxLink) _ = unicode +VISIBLE_PROP_DEF = { + _('visible'): dict(type='Boolean', default=False, + help=_('display the component or not')), + } -class RQLInputForm(SingletonVComponent): +class RQLInputForm(component.Component): """build the rql input form, usually displayed in the header""" id = 'rqlinput' - visible = False - + property_defs = VISIBLE_PROP_DEF + def call(self, view=None): if hasattr(view, 'filter_box_context_info'): rset = view.filter_box_context_info()[0] @@ -55,30 +54,36 @@ self.w(u'

') -class ApplLogo(SingletonVComponent): +class ApplLogo(component.Component): """build the application logo, usually displayed in the header""" id = 'logo' - site_wide = True # don't want user to hide this component using an eproperty + property_defs = VISIBLE_PROP_DEF + # don't want user to hide this component using an cwproperty + site_wide = True + def call(self): self.w(u'

' % (self.req.base_url(), self.req.external_resource('LOGO'))) -class ApplHelp(SingletonVComponent): +class ApplHelp(component.Component): """build the help button, usually displayed in the header""" id = 'help' + property_defs = VISIBLE_PROP_DEF def call(self): self.w(u' ' % (self.build_url(_restpath='doc/main'), self.req._(u'help'),)) -class UserLink(SingletonVComponent): +class UserLink(component.Component): """if the user is the anonymous user, build a link to login else a link to the connected user object with a loggout link """ + property_defs = VISIBLE_PROP_DEF + # don't want user to hide this component using an cwproperty + site_wide = True id = 'loggeduserlink' - site_wide = True # don't want user to hide this component using an eproperty def call(self): if not self.req.cnx.anonymous_connection: @@ -98,25 +103,32 @@ box.render(w=self.w) else: self.anon_user_link() - + def anon_user_link(self): if self.config['auth-mode'] == 'cookie': self.w(self.req._('anonymous')) self.w(u''' [%s]''' % (self.req._('i18n_login_popup'))) + # FIXME maybe have an other option to explicitely authorise registration + # also provide a working register view +# if self.config['anonymous-user']: +# self.w(u''' [%s]''' +# % (self.req._('i18n_register_user'))) else: self.w(self.req._('anonymous')) self.w(u' [%s]' % (self.build_url('login'), self.req._('login'))) -class ApplicationMessage(SingletonVComponent): +class ApplicationMessage(component.Component): """display application's messages given using the __message parameter into a special div section """ - __selectors__ = yes, + __select__ = yes() id = 'applmessages' - site_wide = True # don't want user to hide this component using an eproperty + property_defs = VISIBLE_PROP_DEF + # don't want user to hide this component using an cwproperty + site_wide = True def call(self): msgs = [msg for msg in (self.req.get_shared_data('sources_error', pop=True), @@ -129,72 +141,42 @@ self.w(u'

') -class WFHistoryVComponent(EntityVComponent): - """display the workflow history for entities supporting it""" - id = 'wfhistory' - accepts = ('Any',) - context = 'navcontentbottom' - rtype = 'wf_info_for' - target = 'subject' - title = _('Workflow history') +class ApplicationName(component.Component): + """display the application name""" + id = 'appliname' + property_defs = VISIBLE_PROP_DEF + # don't want user to hide this component using an cwproperty + site_wide = True - def cell_call(self, row, col, view=None): - _ = self.req._ - eid = self.rset[row][col] - sel = 'Any FS,TS,WF,D' - rql = ' ORDERBY D DESC WHERE WF wf_info_for X,'\ - 'WF from_state FS, WF to_state TS, WF comment C,'\ - 'WF creation_date D' - if self.vreg.schema.eschema('EUser').has_perm(self.req, 'read'): - sel += ',U,C' - rql += ', WF owned_by U?' - displaycols = range(5) - headers = (_('from_state'), _('to_state'), _('comment'), _('date'), - _('EUser')) - else: - sel += ',C' - displaycols = range(4) - headers = (_('from_state'), _('to_state'), _('comment'), _('date')) - rql = '%s %s, X eid %%(x)s' % (sel, rql) - try: - rset = self.req.execute(rql, {'x': eid}, 'x') - except Unauthorized: - return - if rset: - self.wview('table', rset, title=_(self.title), displayactions=False, - displaycols=displaycols, headers=headers) + def call(self): + self.w(u'%s' % ( + self.req.base_url(), self.req.property_value('ui.site-title'))) -class ApplicationName(SingletonVComponent): - """display the application name""" - id = 'appliname' - - def call(self): - self.w(u'%s' % (self.req.base_url(), - self.req.property_value('ui.site-title'))) - - -class SeeAlsoVComponent(RelatedObjectsVComponent): +class SeeAlsoVComponent(component.RelatedObjectsVComponent): """display any entity's see also""" id = 'seealso' context = 'navcontentbottom' rtype = 'see_also' - target = 'object' + role = 'subject' order = 40 # register msg not generated since no entity use see_also in cubicweb itself title = _('contentnavigation_seealso') help = _('contentnavigation_seealso_description') - -class EtypeRestrictionComponent(SingletonVComponent): + +class EtypeRestrictionComponent(component.Component): """displays the list of entity types contained in the resultset to be able to filter accordingly. """ id = 'etypenavigation' - __select__ = classmethod(chainfirst(two_etypes_rset, match_form_params)) - form_params = ('__restrtype', '__restrtypes', '__restrrql') + __select__ = two_etypes_rset() | match_form_params('__restrtype', '__restrtypes', + '__restrrql') + property_defs = VISIBLE_PROP_DEF + # don't want user to hide this component using an cwproperty + site_wide = True visible = False # disabled by default - + def call(self): _ = self.req._ self.w(u'

') @@ -233,20 +215,9 @@ html.insert(0, u'%s' % _('Any')) self.w(u' | '.join(html)) self.w(u'

') - -class RSSFeedURL(VComponent): - id = 'rss_feed_url' - __selectors__ = (non_final_entity,) - - def feed_url(self): - return self.build_url(rql=self.limited_rql(), vid='rss') - -class RSSEntityFeedURL(VComponent): - id = 'rss_feed_url' - __selectors__ = (non_final_entity, one_line_rset) - - def feed_url(self): - return self.entity(0, 0).rss_feed_url() - +def registration_callback(vreg): + vreg.register_all(globals().values(), __name__, (SeeAlsoVComponent,)) + if 'see_also' in vreg.schema: + vreg.register(SeeAlsoVComponent) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/basecontrollers.py --- a/web/views/basecontrollers.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/basecontrollers.py Thu May 14 12:48:11 2009 +0200 @@ -13,16 +13,15 @@ import simplejson -from mx.DateTime.Parser import DateFromString - from logilab.common.decorators import cached -from cubicweb import NoSelectableObject, ValidationError, typed_eid -from cubicweb.common.selectors import yes +from cubicweb import NoSelectableObject, ValidationError, ObjectNotFound, typed_eid +from cubicweb.utils import strptime +from cubicweb.selectors import yes, match_user_groups +from cubicweb.view import STRICT_DOCTYPE from cubicweb.common.mail import format_mail -from cubicweb.common.view import STRICT_DOCTYPE, CW_XHTML_EXTENSIONS - -from cubicweb.web import ExplicitLogin, Redirect, RemoteCallFailed +from cubicweb.web import ExplicitLogin, Redirect, RemoteCallFailed, json_dumps +from cubicweb.web.formrenderers import FormRenderer from cubicweb.web.controller import Controller from cubicweb.web.views import vid_from_rset try: @@ -31,8 +30,43 @@ HAS_SEARCH_RESTRICTION = True except ImportError: # gae HAS_SEARCH_RESTRICTION = False - - + + +def xhtml_wrap(source): + head = u'\n' + STRICT_DOCTYPE + return head + u'

' % source.strip() + +def jsonize(func): + """decorator to sets correct content_type and calls `simplejson.dumps` on + results + """ + def wrapper(self, *args, **kwargs): + self.req.set_content_type('application/json') + return json_dumps(func(self, *args, **kwargs)) + wrapper.__name__ = func.__name__ + return wrapper + +def xhtmlize(func): + """decorator to sets correct content_type and calls `xmlize` on results""" + def wrapper(self, *args, **kwargs): + self.req.set_content_type(self.req.html_content_type()) + result = func(self, *args, **kwargs) + return xhtml_wrap(result) + wrapper.__name__ = func.__name__ + return wrapper + +def check_pageid(func): + """decorator which checks the given pageid is found in the + user's session data + """ + def wrapper(self, *args, **kwargs): + data = self.req.get_session_data(self.req.pageid) + if data is None: + raise RemoteCallFailed(self.req._('pageid-not-found')) + return func(self, *args, **kwargs) + return wrapper + + class LoginController(Controller): id = 'login' @@ -45,25 +79,72 @@ # Cookie authentication return self.appli.need_login_content(self.req) - + class LogoutController(Controller): id = 'logout' - + def publish(self, rset=None): """logout from the application""" return self.appli.session_handler.logout(self.req) class ViewController(Controller): + """standard entry point : + - build result set + - select and call main template + """ id = 'view' - template = 'main' - + template = 'main-template' + def publish(self, rset=None): """publish a request, returning an encoded string""" - template = self.req.property_value('ui.main-template') - if template not in self.vreg.registry('templates') : - template = self.template - return self.vreg.main_template(self.req, template, rset=rset) + view, rset = self._select_view_and_rset(rset) + self.add_to_breadcrumbs(view) + self.validate_cache(view) + template = self.appli.main_template_id(self.req) + return self.vreg.main_template(self.req, template, rset=rset, view=view) + + def _select_view_and_rset(self, rset): + req = self.req + if rset is None and not hasattr(req, '_rql_processed'): + req._rql_processed = True + rset = self.process_rql(req.form.get('rql')) + if rset and rset.rowcount == 1 and '__method' in req.form: + entity = rset.get_entity(0, 0) + try: + method = getattr(entity, req.form.pop('__method')) + method() + except Exception, ex: + self.exception('while handling __method') + req.set_message(req._("error while handling __method: %s") % req._(ex)) + vid = req.form.get('vid') or vid_from_rset(req, rset, self.schema) + try: + view = self.vreg.select_view(vid, req, rset) + except ObjectNotFound: + self.warning("the view %s could not be found", vid) + req.set_message(req._("The view %s could not be found") % vid) + vid = vid_from_rset(req, rset, self.schema) + view = self.vreg.select_view(vid, req, rset) + except NoSelectableObject: + 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")) + self.warning("the view %s can not be applied to this query", vid) + vid = vid_from_rset(req, rset, self.schema) + view = self.vreg.select_view(vid, req, rset) + return view, rset + + def add_to_breadcrumbs(self, view): + # update breadcrumps **before** validating cache, unless the view + # specifies explicitly it should not be added to breadcrumb or the + # view is a binary view + if view.add_to_breadcrumbs and not view.binary: + self.req.update_breadcrumbs() + + def validate_cache(self, view): + view.set_http_cache_headers() + self.req.validate_cache() def execute_linkto(self, eid=None): """XXX __linkto parameter may cause security issue @@ -85,7 +166,7 @@ else: rql = 'SET Y %s X WHERE X eid %%(x)s, Y eid %%(y)s' % rtype for teid in eids: - req.execute(rql, {'x': eid, 'y': typed_eid(teid)}, ('x', 'y')) + req.execute(rql, {'x': eid, 'y': typed_eid(teid)}, ('x', 'y')) class FormValidatorController(Controller): @@ -132,135 +213,46 @@ except AttributeError: eid = err.entity return (False, (eid, err.errors)) - -def xmlize(source): - head = u'\n' + STRICT_DOCTYPE % CW_XHTML_EXTENSIONS - return head + u'

' % source.strip() -def jsonize(func): - """sets correct content_type and calls `simplejson.dumps` on results - """ - def wrapper(self, *args, **kwargs): - self.req.set_content_type('application/json') - result = func(self, *args, **kwargs) - return simplejson.dumps(result) - return wrapper - - -def check_pageid(func): - """decorator which checks the given pageid is found in the - user's session data - """ - def wrapper(self, *args, **kwargs): - data = self.req.get_session_data(self.req.pageid) - if data is None: - raise RemoteCallFailed(self.req._('pageid-not-found')) - return func(self, *args, **kwargs) - return wrapper - class JSonController(Controller): id = 'json' - template = 'main' def publish(self, rset=None): - mode = self.req.form.get('mode', 'html') - self.req.pageid = self.req.form.get('pageid') - try: - func = getattr(self, '%s_exec' % mode) - except AttributeError, ex: - self.error('json controller got an unknown mode %r', mode) - self.error('\t%s', ex) - result = u'' - else: - try: - result = func(rset) - except RemoteCallFailed: - raise - except Exception, ex: - self.exception('an exception occured on json request(rset=%s): %s', - rset, ex) - raise RemoteCallFailed(repr(ex)) - return result.encode(self.req.encoding) + """call js_* methods. Expected form keys: - def _exec(self, rql, args=None, eidkey=None, rocheck=True): - """json mode: execute RQL and return resultset as json""" - if rocheck: - self.ensure_ro_rql(rql) - try: - return self.req.execute(rql, args, eidkey) - except Exception, ex: - self.exception("error in _exec(rql=%s): %s", rql, ex) - return None - return None - - @jsonize - def json_exec(self, rset=None): - """json mode: execute RQL and return resultset as json""" - rql = self.req.form.get('rql') - if rset is None and rql: - rset = self._exec(rql) - return rset and rset.rows or [] + :fname: the method name without the js_ prefix + :args: arguments list (json) - def _set_content_type(self, vobj, data): - """sets req's content type according to vobj's content type - (and xmlize data if needed) + note: it's the responsability of js_* methods to set the correct + response content type """ - content_type = vobj.content_type - if content_type == 'application/xhtml+xml': - self.req.set_content_type(content_type) - return xmlize(data) - return data - - def html_exec(self, rset=None): - """html mode: execute query and return the view as HTML""" - req = self.req - rql = req.form.get('rql') - if rset is None and rql: - rset = self._exec(rql) - - vid = req.form.get('vid') or vid_from_rset(req, rset, self.schema) + self.req.pageid = self.req.form.get('pageid') + fname = self.req.form['fname'] try: - view = self.vreg.select_view(vid, req, rset) - except NoSelectableObject: - vid = req.form.get('fallbackvid', 'noresult') - view = self.vreg.select_view(vid, req, rset) - divid = req.form.get('divid', 'pageContent') - # we need to call pagination before with the stream set - stream = view.set_stream() - if req.form.get('paginate'): - if divid == 'pageContent': - # mimick main template behaviour - stream.write(u'

') - vtitle = self.req.form.get('vtitle') - if vtitle: - stream.write(u'

%s

\n' % vtitle) - view.pagination(req, rset, view.w, not view.need_navigation) - if divid == 'pageContent': - stream.write(u'

') - view.dispatch() - if req.form.get('paginate') and divid == 'pageContent': - stream.write(u'

') - source = stream.getvalue() - return self._set_content_type(view, source) - - def rawremote_exec(self, rset=None): - """like remote_exec but doesn't change content type""" + func = getattr(self, 'js_%s' % fname) + except AttributeError: + raise RemoteCallFailed('no %s method' % fname) # no attribute means the callback takes no argument args = self.req.form.get('arg', ()) if not isinstance(args, (list, tuple)): args = (args,) - fname = self.req.form['fname'] args = [simplejson.loads(arg) for arg in args] try: - func = getattr(self, 'js_%s' % fname) - except AttributeError: - self.exception('rawremote_exec fname=%s', fname) - return u"" - return func(*args) + result = func(*args) + except RemoteCallFailed: + raise + except Exception, ex: + self.exception('an exception occured while calling js_%s(%s): %s', + fname, args, ex) + raise RemoteCallFailed(repr(ex)) + if result is None: + return '' + # get unicode on @htmlize methods, encoded string on @jsonize methods + elif isinstance(result, unicode): + return result.encode(self.req.encoding) + return result - remote_exec = jsonize(rawremote_exec) - def _rebuild_posted_form(self, names, values, action=None): form = {} for name, value in zip(names, values): @@ -280,8 +272,98 @@ if action: form['__action_%s' % action] = u'whatever' return form - + + def _exec(self, rql, args=None, eidkey=None, rocheck=True): + """json mode: execute RQL and return resultset as json""" + if rocheck: + self.ensure_ro_rql(rql) + try: + return self.req.execute(rql, args, eidkey) + except Exception, ex: + self.exception("error in _exec(rql=%s): %s", rql, ex) + return None + return None + + @xhtmlize + def js_view(self): + # XXX try to use the page-content template + req = self.req + rql = req.form.get('rql') + if rql: + rset = self._exec(rql) + else: + rset = None + vid = req.form.get('vid') or vid_from_rset(req, rset, self.schema) + try: + view = self.vreg.select_view(vid, req, rset) + except NoSelectableObject: + vid = req.form.get('fallbackvid', 'noresult') + view = self.vreg.select_view(vid, req, rset) + divid = req.form.get('divid', 'pageContent') + # we need to call pagination before with the stream set + stream = view.set_stream() + if req.form.get('paginate'): + if divid == 'pageContent': + # mimick main template behaviour + stream.write(u'

') + vtitle = self.req.form.get('vtitle') + if vtitle: + stream.write(u'

%s

\n' % vtitle) + view.pagination(req, rset, view.w, not view.need_navigation) + if divid == 'pageContent': + stream.write(u'

') + view.render() + extresources = req.html_headers.getvalue(skiphead=True) + if extresources: + stream.write(u'

\n') # XXX use a widget ? + stream.write(extresources) + stream.write(u'

\n') + if req.form.get('paginate') and divid == 'pageContent': + stream.write(u'

') + return stream.getvalue() + + @xhtmlize + def js_prop_widget(self, propkey, varname, tabindex=None): + """specific method for CWProperty handling""" + entity = self.vreg.etype_class('CWProperty')(self.req, None, None) + entity.eid = varname + entity['pkey'] = propkey + form = self.vreg.select_object('forms', 'edition', self.req, None, + entity=entity) + form.form_build_context() + vfield = form.field_by_name('value') + renderer = FormRenderer() + return vfield.render(form, renderer, tabindex=tabindex) \ + + renderer.render_help(form, vfield) + + @xhtmlize + def js_component(self, compid, rql, registry='components', extraargs=None): + if rql: + rset = self._exec(rql) + else: + rset = None + comp = self.vreg.select_object(registry, compid, self.req, rset) + if extraargs is None: + extraargs = {} + else: # we receive unicode keys which is not supported by the **syntax + extraargs = dict((str(key), value) + for key, value in extraargs.items()) + extraargs = extraargs or {} + return comp.render(**extraargs) + + @check_pageid + @xhtmlize + def js_inline_creation_form(self, peid, ttype, rtype, role): + view = self.vreg.select_view('inline-creation', self.req, None, + etype=ttype, peid=peid, rtype=rtype, + role=role) + return view.render(etype=ttype, peid=peid, rtype=rtype, role=role) + + @jsonize def js_validate_form(self, action, names, values): + return self.validate_form(action, names, values) + + def validate_form(self, action, names, values): # XXX this method (and correspoding js calls) should use the new # `RemoteCallFailed` mechansim self.req.form = self._rebuild_posted_form(names, values, action) @@ -300,64 +382,61 @@ else: eid = err.entity.eid return (False, (eid, err.errors)) - except Redirect, err: - return (True, err.location) + except Redirect, redir: + return (True, redir.location) except Exception, err: self.req.cnx.rollback() self.exception('unexpected error in js_validateform') - return (False, self.req._(str(err))) + return (False, self.req._(str(err).decode('utf-8'))) return (False, '???') - def js_edit_field(self, action, names, values, rtype, eid): - success, args = self.js_validate_form(action, names, values) + @jsonize + def js_edit_field(self, action, names, values, rtype, eid, default): + success, args = self.validate_form(action, names, values) if success: + # Any X,N where we don't seem to use N is an optimisation + # printable_value won't need to query N again rset = self.req.execute('Any X,N WHERE X eid %%(x)s, X %s N' % rtype, {'x': eid}, 'x') entity = rset.get_entity(0, 0) - return (success, args, entity.printable_value(rtype)) + value = entity.printable_value(rtype) + return (success, args, value or default) else: return (success, args, None) - - def js_rql(self, rql): - rset = self._exec(rql) - return rset and rset.rows or [] - + + @jsonize + def js_edit_relation(self, action, names, values, + rtype, role, eid, vid, default): + success, args = self.validate_form(action, names, values) + if success: + entity = self.req.eid_rset(eid).get_entity(0, 0) + rset = entity.related(rtype, role) + if rset: + output = self.view(vid, rset) + else: + output = default + return (success, args, output) + else: + return (success, args, None) + + @jsonize def js_i18n(self, msgids): """returns the translation of `msgid`""" return [self.req._(msgid) for msgid in msgids] + @jsonize def js_format_date(self, strdate): """returns the formatted date for `msgid`""" - date = DateFromString(strdate) + date = strptime(strdate, '%Y-%m-%d %H:%M:%S') return self.format_date(date) + @jsonize def js_external_resource(self, resource): """returns the URL of the external resource named `resource`""" return self.req.external_resource(resource) - def js_prop_widget(self, propkey, varname, tabindex=None): - """specific method for EProperty handling""" - w = self.vreg.property_value_widget(propkey, req=self.req) - entity = self.vreg.etype_class('EProperty')(self.req, None, None) - entity.eid = varname - self.req.form['value'] = self.vreg.property_info(propkey)['default'] - return w.edit_render(entity, tabindex, includehelp=True) - - def js_component(self, compid, rql, registry='components', extraargs=None): - if rql: - rset = self._exec(rql) - else: - rset = None - comp = self.vreg.select_object(registry, compid, self.req, rset) - if extraargs is None: - extraargs = {} - else: # we receive unicode keys which is not supported by the **syntax - extraargs = dict((str(key), value) - for key, value in extraargs.items()) - extraargs = extraargs or {} - return self._set_content_type(comp, comp.dispatch(**extraargs)) - @check_pageid + @jsonize def js_user_callback(self, cbname): page_data = self.req.get_session_data(self.req.pageid, {}) try: @@ -365,54 +444,16 @@ except KeyError: return None return cb(self.req) - - def js_unregister_user_callback(self, cbname): - self.req.unregister_callback(self.req.pageid, cbname) - - def js_unload_page_data(self): - self.req.del_session_data(self.req.pageid) - - def js_cancel_edition(self, errorurl): - """cancelling edition from javascript - - We need to clear associated req's data : - - errorurl - - pending insertions / deletions - """ - self.req.cancel_edition(errorurl) - - @check_pageid - def js_inline_creation_form(self, peid, ptype, ttype, rtype, role): - view = self.vreg.select_view('inline-creation', self.req, None, - etype=ttype, ptype=ptype, peid=peid, - rtype=rtype, role=role) - source = view.dispatch(etype=ttype, ptype=ptype, peid=peid, rtype=rtype, - role=role) - return self._set_content_type(view, source) - - def js_remove_pending_insert(self, (eidfrom, rel, eidto)): - self._remove_pending(eidfrom, rel, eidto, 'insert') - - def js_add_pending_insert(self, (eidfrom, rel, eidto)): - self._add_pending(eidfrom, rel, eidto, 'insert') - - def js_add_pending_inserts(self, tripletlist): - for eidfrom, rel, eidto in tripletlist: - self._add_pending(eidfrom, rel, eidto, 'insert') - - def js_remove_pending_delete(self, (eidfrom, rel, eidto)): - self._remove_pending(eidfrom, rel, eidto, 'delete') - - def js_add_pending_delete(self, (eidfrom, rel, eidto)): - self._add_pending(eidfrom, rel, eidto, 'delete') if HAS_SEARCH_RESTRICTION: + @jsonize def js_filter_build_rql(self, names, values): form = self._rebuild_posted_form(names, values) self.req.form = form builder = FilterRQLBuilder(self.req) return builder.build_rql() + @jsonize def js_filter_select_content(self, facetids, rql): rqlst = self.vreg.parse(self.req, rql) # XXX Union unsupported yet mainvar = prepare_facets_rqlst(rqlst)[0] @@ -422,13 +463,33 @@ update_map[facetid] = facet.possible_values() return update_map + def js_unregister_user_callback(self, cbname): + self.req.unregister_callback(self.req.pageid, cbname) + + def js_unload_page_data(self): + self.req.del_session_data(self.req.pageid) + + def js_cancel_edition(self, errorurl): + """cancelling edition from javascript + + We need to clear associated req's data : + - errorurl + - pending insertions / deletions + """ + self.req.cancel_edition(errorurl) + def js_delete_bookmark(self, beid): - try: - rql = 'DELETE B bookmarked_by U WHERE B eid %(b)s, U eid %(u)s' - self.req.execute(rql, {'b': typed_eid(beid), 'u' : self.req.user.eid}) - except Exception, ex: - self.exception(unicode(ex)) - return self.req._('Problem occured') + rql = 'DELETE B bookmarked_by U WHERE B eid %(b)s, U eid %(u)s' + self.req.execute(rql, {'b': typed_eid(beid), 'u' : self.req.user.eid}) + + def js_set_cookie(self, cookiename, cookievalue): + # XXX we should consider jQuery.Cookie + cookiename, cookievalue = str(cookiename), str(cookievalue) + cookies = self.req.get_cookie() + cookies[cookiename] = cookievalue + self.req.set_cookie(cookies, cookiename) + + # relations edition stuff ################################################## def _add_pending(self, eidfrom, rel, eidto, kind): key = 'pending_%s' % kind @@ -437,15 +498,26 @@ self.req.set_session_data(key, pendings) def _remove_pending(self, eidfrom, rel, eidto, kind): - key = 'pending_%s' % kind - try: - pendings = self.req.get_session_data(key) - pendings.remove( (typed_eid(eidfrom), rel, typed_eid(eidto)) ) - except: - self.exception('while removing pending eids') - else: - self.req.set_session_data(key, pendings) + key = 'pending_%s' % kind + pendings = self.req.get_session_data(key) + pendings.remove( (typed_eid(eidfrom), rel, typed_eid(eidto)) ) + self.req.set_session_data(key, pendings) + + def js_remove_pending_insert(self, (eidfrom, rel, eidto)): + self._remove_pending(eidfrom, rel, eidto, 'insert') + def js_add_pending_inserts(self, tripletlist): + for eidfrom, rel, eidto in tripletlist: + self._add_pending(eidfrom, rel, eidto, 'insert') + + def js_remove_pending_delete(self, (eidfrom, rel, eidto)): + self._remove_pending(eidfrom, rel, eidto, 'delete') + + def js_add_pending_delete(self, (eidfrom, rel, eidto)): + self._add_pending(eidfrom, rel, eidto, 'delete') + + # XXX specific code. Kill me and my AddComboBox friend + @jsonize def js_add_and_link_new_entity(self, etype_to, rel, eid_to, etype_from, value_from): # create a new entity eid_from = self.req.execute('INSERT %s T : T name "%s"' % ( etype_from, value_from ))[0][0] @@ -453,16 +525,10 @@ rql = 'SET F %(rel)s T WHERE F eid %(eid_to)s, T eid %(eid_from)s' % {'rel' : rel, 'eid_to' : eid_to, 'eid_from' : eid_from} return eid_from - def js_set_cookie(self, cookiename, cookievalue): - # XXX we should consider jQuery.Cookie - cookiename, cookievalue = str(cookiename), str(cookievalue) - cookies = self.req.get_cookie() - cookies[cookiename] = cookievalue - self.req.set_cookie(cookies, cookiename) class SendMailController(Controller): id = 'sendmail' - require_groups = ('managers', 'users') + __select__ = match_user_groups('managers', 'users') def recipients(self): """returns an iterator on email's recipients as entities""" @@ -494,12 +560,12 @@ msg = format_mail({'email' : self.req.user.get_email(), 'name' : self.req.user.dc_title(),}, [recipient], body, subject) - self.smtp.sendmail(helo_addr, [recipient], msg.as_string()) + self.smtp.sendmail(helo_addr, [recipient], msg.as_string()) def publish(self, rset=None): # XXX this allow anybody with access to an cubicweb application to use it as a mail relay body = self.req.form['mailbody'] - subject = self.req.form['mailsubject'] + subject = self.req.form['subject'] for recipient in self.recipients(): text = body % recipient.as_email_context() self.sendmail(recipient.get_email(), subject, text) @@ -510,11 +576,11 @@ class MailBugReportController(SendMailController): id = 'reportbug' - __selectors__ = (yes,) + __select__ = yes() def publish(self, rset=None): body = self.req.form['description'] self.sendmail(self.config['submit-mail'], _('%s error report') % self.config.appid, body) url = self.build_url(__message=self.req._('bug report sent')) raise Redirect(url) - + diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/baseforms.py --- a/web/views/baseforms.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/baseforms.py Thu May 14 12:48:11 2009 +0200 @@ -14,205 +14,19 @@ from logilab.mtconverter import html_escape from logilab.common.decorators import cached -from cubicweb.interfaces import IWorkflowable -from cubicweb.common.utils import make_uid -from cubicweb.common.uilib import cut -from cubicweb.common.selectors import (accept_etype, match_kwargs, - one_line_rset, implement_interface, - match_form_params, accept) -from cubicweb.common.view import EntityView -from cubicweb.web import INTERNAL_FIELD_VALUE, stdmsgs, eid_param +from cubicweb.selectors import (specified_etype_implements, accepts_etype_compat, + non_final_entity, match_kwargs, one_line_rset) +from cubicweb.view import View, EntityView +from cubicweb.web import INTERNAL_FIELD_VALUE, eid_param from cubicweb.web.controller import NAV_FORM_PARAMETERS from cubicweb.web.widgets import checkbox, InputWidget, ComboBoxWidget -from cubicweb.web.form import EntityForm, relation_id +from cubicweb.web.form import FormMixIn +from cubicweb.web.views.autoform import AutomaticEntityForm _ = unicode -class DeleteConfForm(EntityForm): - id = 'deleteconf' - title = _('delete') - domid = 'deleteconf' - onsubmit = None - # don't use navigation, all entities asked to be deleted should be displayed - # else we will only delete the displayed page - need_navigation = False - - def call(self): - """ask for confirmation before real deletion""" - _ = self.req._ - self.req.add_css('cubicweb.form.css') - self.req.add_js('cubicweb.edition.js') - self.w(u'\n' % _('this action is not reversible!')) - # XXX above message should have style of a warning - self.w(u'

%s

\n' % _('Do you want to delete the following element(s) ?')) - if self.onsubmit: - self.w(u'\n') - def display_rset(self): - self.w(u'

\n') - done = set() - for i in xrange(self.rset.rowcount): - if self.rset[i][0] in done: - continue - done.add(self.rset[i][0]) - self.cell_call(i, 0) - self.w(u'\n') - - def cell_call(self, row, col): - entity = self.entity(row, col) - self.w(u'

') - self.w(u'' % entity.eid) - self.w(u'\n' - % (eid_param('__type', entity.eid), self.rset.description[row][0])) - self.w(u'' % html_escape(entity.absolute_url())) - # don't use outofcontext view or any other that may contain inline edition form - self.w(html_escape(entity.view('textoutofcontext'))) - self.w(u'') - self.w(u'

') - - -class ChangeStateForm(EntityForm): - id = 'statuschange' - title = _('status change') - - __selectors__ = (implement_interface, match_form_params) - accepts_interfaces = (IWorkflowable,) - form_params = ('treid',) - - def cell_call(self, row, col, vid='secondary'): - entity = self.entity(row, col) - eid = entity.eid - state = entity.in_state[0] - transition = self.req.eid_rset(self.req.form['treid']).get_entity(0, 0) - dest = transition.destination() - self.req.add_js('cubicweb.edition.js') - self.req.add_css('cubicweb.form.css') - _ = self.req._ - self.w(self.error_message()) - self.w(u'

%s %s

\n' % (_(transition.name), entity.view('oneline'))) - msg = _('status will change from %(st1)s to %(st2)s') % { - 'st1': _(state.name), - 'st2': _(dest.name)} - self.w(u'

\n' % msg) - self.w(u'') - - def fill_form(self, entity, state, dest): - # hack to use the widget for comment_format - trinfo = self.vreg.etype_class('TrInfo')(self.req, None) - # widget are cached, copy it since we want to modify its name attribute - wdg = trinfo.get_widget('comment_format') - wdg.name = 'trcommentformat' - # set a value in entity to avoid lookup for a non existant attribute... - trinfo['trcommentformat'] = u'' - # comment format/content have to be grouped using the original entity eid - wdg.rname = eid_param('trcommentformat', entity.eid) - self.w(wdg.render_label(trinfo)) - self.w(wdg._edit_render(trinfo)) - self.w(u'
\n') - cformname = eid_param('trcomment', entity.eid) - self.w(u'%s\n' % (cformname, self.req._('comment:'))) - self.w(u'
\n' - % (cformname, self.req.next_tabindex())) - - def redirectpath(self, entity): - return entity.rest_path() - - -class ClickAndEditForm(EntityForm): - id = 'reledit' - __selectors__ = (match_kwargs, ) - expected_kwargs = ('rtype',) - - #FIXME editableField class could be toggleable from userprefs - - EDITION_BODY = ''' -

%(value)s

- -''' - def cell_call(self, row, col, rtype=None, role='subject', reload=False): - entity = self.entity(row, col) - if getattr(entity, rtype) is None: - value = self.req._('not specified') - else: - value = entity.printable_value(rtype) - if not entity.has_perm('update'): - self.w(value) - return - self.req.add_js( ('cubicweb.ajax.js', 'cubicweb.edition.js') ) - eid = entity.eid - edit_key = make_uid('%s-%s' % (rtype, eid)) - divid = 'd%s' % edit_key - widget = entity.get_widget(rtype, 'subject') - eschema = entity.e_schema - attrform = widget.edit_render(entity, useid='i%s' % edit_key) - ok = (u'' - % (self.req._(stdmsgs.BUTTON_OK), self.req.next_tabindex())) - cancel = (u'' - % (self.req._(stdmsgs.BUTTON_CANCEL), eid, rtype, divid, - self.req.next_tabindex())) - self.w(self.EDITION_BODY % { - 'eid': eid, - 'rtype': rtype, - 'etype': entity.e_schema, - 'attrform': attrform, - 'action' : self.build_url('edit'), # NOTE: actually never gets called - 'ok': ok, - 'cancel': cancel, - 'value': value, - 'reload': dumps(reload), - 'divid': divid, - }) - - -class EditionForm(EntityForm): +class EditionForm(FormMixIn, EntityView): """primary entity edition form When generating a new attribute_input, the editor will look for a method @@ -220,14 +34,14 @@ name of the attribute being edited. You may use this feature to compute dynamic default values such as the 'tomorrow' date or the user's login being connected - """ - __selectors__ = (one_line_rset, accept) + """ + id = 'edition' + __select__ = one_line_rset() & non_final_entity() - id = 'edition' title = _('edition') controller = 'edit' - skip_relations = EntityForm.skip_relations.copy() - + skip_relations = set() + EDITION_BODY = u'''\ %(errormsg)s

' % (name, value)) return u'\n'.join(output) - + def add_hidden_web_behaviour_params(self, entity): """inserts hidden params controlling how errors and redirection should be handled @@ -361,8 +174,8 @@ self._hiddens.append( ('__linkto', linkto, '') ) msg = '%s %s' % (msg, self.req._('and linked')) self._hiddens.append( ('__message', msg, '') ) - - + + def attributes_form(self, entity, kwargs, include_eid=True): """create a form to edit entity's attributes""" html = [] @@ -395,7 +208,7 @@ # XXX both (add, delete) return [(rschema, x) for rschema, _, x in entity.relations_by_category(('primary', 'secondary'), 'add') if rschema != 'eid'] - + def relations_form(self, entity, kwargs): srels_by_cat = entity.srelations_by_category(('generic', 'metadata'), 'add') if not srels_by_cat: @@ -454,7 +267,7 @@ w(u'') w(u'

') return '\n'.join(html) - + def inline_entities_form(self, entity, kwargs): """create a form to edit entity's inlined relations""" result = [] @@ -473,7 +286,7 @@ existant = entity.has_eid() and entity.related(rschema) if existant: # display inline-edition view for all existing related entities - result.append(self.view('inline-edition', existant, + result.append(self.view('inline-edition', existant, ptype=entity.e_schema, peid=entity.eid, rtype=rschema, role=x, **kwargs)) if x == 'subject': @@ -505,19 +318,20 @@ return '\n'.join(result) # should_* method extracted to allow overriding - + def should_inline_relation_form(self, entity, rschema, targettype, role): - return entity.rtags.is_inlined(rschema, targettype, role) + return AutomaticEntityForm.rinlined.etype_get(entity.id, rschema, role, + targettype) def should_display_inline_relation_form(self, rschema, existant, card): return not existant and card in '1+' def should_display_add_inline_relation_link(self, rschema, existant, card): return not existant or card in '+*' - + def reset_url(self, entity): return entity.absolute_url() - + def on_submit(self, entity): return u'return freezeFormButtons(\'%s\')' % (self.domid) @@ -525,22 +339,26 @@ return self.req._('element edited') - + class CreationForm(EditionForm): - __selectors__ = (accept_etype, ) + __select__ = specified_etype_implements('Any') + # XXX bw compat, use View.registered since we don't want accept_compat + # wrapper set in EntityView + registered = accepts_etype_compat(View.registered) id = 'creation' title = _('creation') - + def call(self, **kwargs): """creation view for an entity""" - self.req.add_js( ('cubicweb.ajax.js', 'cubicweb.edition.js') ) - self.req.add_css('cubicweb.form.css') + self.req.add_js( ('cubicweb.ajax.js',) ) + self.initialize_varmaker() etype = kwargs.pop('etype', self.req.form.get('etype')) try: entity = self.vreg.etype_class(etype)(self.req, None, None) except: self.w(self.req._('no such entity type %s') % etype) else: + entity.eid = self.varmaker.next() self.edit_form(entity, kwargs) def action_title(self, entity): @@ -567,16 +385,16 @@ @property def formid(self): return 'edition' - + def relations_form(self, entity, kwargs): return u'' def reset_url(self, entity=None): return self.build_url(self.req.form.get('etype', '').lower()) - + def submited_message(self): return self.req._('element created') - + def url(self): """return the url associated with this view""" return self.create_url(self.req.form.get('etype')) @@ -587,25 +405,26 @@ @cached def card(self, etype): return self.rschema.rproperty(self.parent_schema, etype, 'cardinality')[0] - + def action_title(self, entity): return self.rschema.display_name(self.req, self.role) - + def add_hidden_web_behaviour_params(self, entity): pass - + def edit_form(self, entity, ptype, peid, rtype, role='subject', **kwargs): self.rschema = self.schema.rschema(rtype) - self.role = role + self.role = role self.parent_schema = self.schema.eschema(ptype) self.parent_eid = peid super(InlineFormMixIn, self).edit_form(entity, kwargs) - + def should_inline_relation_form(self, entity, rschema, targettype, role): if rschema == self.rschema: return False - return entity.rtags.is_inlined(rschema, targettype, role) + return AutomaticEntityForm.rinlined.etype_get(entity.id, rschema, role, + targettype) @cached def keep_entity(self, entity): @@ -638,112 +457,15 @@ return ctx -class InlineEntityCreationForm(InlineFormMixIn, CreationForm): - id = 'inline-creation' - __selectors__ = (match_kwargs, accept_etype) - expected_kwargs = ('ptype', 'peid', 'rtype') - - EDITION_BODY = u'''\ -

%(title)s #1 [%(removemsg)s]

- %(attrform)s - %(relattrform)s -

- -

''' # do not insert trailing space or \n here ! - - def call(self, etype, ptype, peid, rtype, role='subject', **kwargs): - """ - :param etype: the entity type being created in the inline form - :param parent: the parent entity hosting the inline form - :param rtype: the relation bridging `etype` and `parent` - :param role: the role played by the `parent` in the relation - """ - self.req.add_css('cubicweb.form.css') - try: - entity = self.vreg.etype_class(etype)(self.req, None, None) - except: - self.w(self.req._('no such entity type %s') % etype) - return - self.edit_form(entity, ptype, peid, rtype, role, **kwargs) - - - - -class InlineEntityEditionForm(InlineFormMixIn, EditionForm): - id = 'inline-edition' - __selectors__ = (accept, match_kwargs) - expected_kwargs = ('ptype', 'peid', 'rtype') - - EDITION_BODY = u'''\ -

%(notice)s

%(title)s #%(count)s [%(removemsg)s]

- %(attrform)s -

- %(relattrform)s -

-%(base)s - - %(rinput)s -

''' # do not insert trailing space or \n here ! - - rel_input = u'''''' - - def call(self, **kwargs): - """redefine default View.call() method to avoid automatic - insertions of

between each row of - the resultset - """ - self.req.add_css('cubicweb.form.css') - rset = self.rset - for i in xrange(len(rset)): - self.wview(self.id, rset, row=i, **kwargs) - - def cell_call(self, row, col, ptype, peid, rtype, role='subject', **kwargs): - """ - :param parent: the parent entity hosting the inline form - :param rtype: the relation bridging `etype` and `parent` - :param role: the role played by the `parent` in the relation - """ - entity = self.entity(row, col) - self.edit_form(entity, ptype, peid, rtype, role, **kwargs) - - - def form_context(self, entity, kwargs): - ctx = super(InlineEntityEditionForm, self).form_context(entity, kwargs) - if self.keep_entity(entity): - ctx['rinput'] = self.rel_input % ctx - ctx['todelete'] = u'' - else: - ctx['rinput'] = u'' - ctx['todelete'] = u'checked="checked"' - ctx['count'] = entity.row + 1 - return ctx - - - class CopyEditionForm(EditionForm): id = 'copy' title = _('copy edition') def cell_call(self, row, col, **kwargs): - self.req.add_js(('cubicweb.ajax.js', 'cubicweb.edition.js')) - self.req.add_css('cubicweb.form.css') + self.req.add_js(('cubicweb.ajax.js',)) entity = self.complete_entity(row, col, skip_bytes=True) # make a copy of entity to avoid altering the entity in the - # request's cache. + # request's cache. self.newentity = copy(entity) self.copying = self.newentity.eid self.newentity.eid = None @@ -760,25 +482,24 @@ @property def formid(self): return 'edition' - + def relations_form(self, entity, kwargs): return u'' def reset_url(self, entity): return self.build_url('view', rql='Any X WHERE X eid %s' % self.copying) - + def attributes_form(self, entity, kwargs, include_eid=True): # we don't want __clone_eid on inlined edited entities if entity.eid == self.newentity.eid: self._hiddens.append((eid_param('__cloned_eid', entity.eid), self.copying, '')) return EditionForm.attributes_form(self, entity, kwargs, include_eid) - + def submited_message(self): return self.req._('element copied') - - + -class TableEditForm(EntityForm): +class TableEditForm(FormMixIn, EntityView): id = 'muledit' title = _('multiple edit') @@ -805,7 +526,7 @@ - + ''' @@ -814,15 +535,13 @@ %(error)s

%(widget)s

''' - + def call(self, **kwargs): """a view to edit multiple entities of the same type the first column should be the eid """ req = self.req form = req.form - req.add_js('cubicweb.edition.js') - req.add_css('cubicweb.form.css') _ = req._ sampleentity = self.complete_entity(0) attrheaders = [u'%s' % rdef[0].display_name(req, rdef[-1]) @@ -841,13 +560,13 @@ 'oktitle': _('validate modifications on selected items').capitalize(), 'cancelvalue': _('button_reset').capitalize(), 'canceltitle': _('revert changes').capitalize(), - } + } self.w(self.EDITION_BODY % ctx) - - + + def reset_url(self, entity=None): self.build_url('view', rql=self.rset.printable_rql()) - + def edit_form(self, entity): html = [] w = html.append @@ -878,128 +597,10 @@ 'widget': wobj.edit_render(entity)}) w(u'') return '\n'.join(html) - - -class UnrelatedDivs(EntityView): - id = 'unrelateddivs' - __selectors__ = (match_form_params,) - form_params = ('relation',) - - @property - def limit(self): - if self.req.form.get('__force_display'): - return None - return self.req.property_value('navigation.related-limit') + 1 - - def cell_call(self, row, col): - entity = self.entity(row, col) - relname, target = self.req.form.get('relation').rsplit('_', 1) - rschema = self.schema.rschema(relname) - hidden = 'hidden' in self.req.form - is_cell = 'is_cell' in self.req.form - self.w(self.build_unrelated_select_div(entity, rschema, target, - is_cell=is_cell, hidden=hidden)) - - def build_unrelated_select_div(self, entity, rschema, target, - is_cell=False, hidden=True): - options = [] - divid = 'div%s_%s_%s' % (rschema.type, target, entity.eid) - selectid = 'select%s_%s_%s' % (rschema.type, target, entity.eid) - if rschema.symetric or target == 'subject': - targettypes = rschema.objects(entity.e_schema) - etypes = '/'.join(sorted(etype.display_name(self.req) for etype in targettypes)) - else: - targettypes = rschema.subjects(entity.e_schema) - etypes = '/'.join(sorted(etype.display_name(self.req) for etype in targettypes)) - etypes = cut(etypes, self.req.property_value('navigation.short-line-size')) - options.append('' % (self.req._('select a'), etypes)) - options += self._get_select_options(entity, rschema, target) - options += self._get_search_options(entity, rschema, target, targettypes) - if 'Basket' in self.schema: # XXX - options += self._get_basket_options(entity, rschema, target, targettypes) - relname, target = self.req.form.get('relation').rsplit('_', 1) - return u"""\ -

- -

-""" % (hidden and 'hidden' or '', divid, selectid, html_escape(dumps(entity.eid)), - is_cell and 'true' or 'null', relname, '\n'.join(options)) - - def _get_select_options(self, entity, rschema, target): - """add options to search among all entities of each possible type""" - options = [] - eid = entity.eid - pending_inserts = self.req.get_pending_inserts(eid) - rtype = rschema.type - for eview, reid in entity.vocabulary(rschema, target, self.limit): - if reid is None: - options.append('' % html_escape(eview)) - else: - optionid = relation_id(eid, rtype, target, reid) - if optionid not in pending_inserts: - # prefix option's id with letters to make valid XHTML wise - options.append('' % - (optionid, reid, html_escape(eview))) - return options - - def _get_search_options(self, entity, rschema, target, targettypes): - """add options to search among all entities of each possible type""" - options = [] - _ = self.req._ - for eschema in targettypes: - mode = '%s:%s:%s:%s' % (target, entity.eid, rschema.type, eschema) - url = self.build_url(entity.rest_path(), vid='search-associate', - __mode=mode) - options.append((eschema.display_name(self.req), - '' % ( - html_escape(url), _('Search for'), eschema.display_name(self.req)))) - return [o for l, o in sorted(options)] - - def _get_basket_options(self, entity, rschema, target, targettypes): - options = [] - rtype = rschema.type - _ = self.req._ - for basketeid, basketname in self._get_basket_links(self.req.user.eid, - target, targettypes): - optionid = relation_id(entity.eid, rtype, target, basketeid) - options.append('' % ( - optionid, basketeid, _('link to each item in'), html_escape(basketname))) - return options - - def _get_basket_links(self, ueid, target, targettypes): - targettypes = set(targettypes) - for basketeid, basketname, elements in self._get_basket_info(ueid): - baskettypes = elements.column_types(0) - # if every elements in the basket can be attached to the - # edited entity - if baskettypes & targettypes: - yield basketeid, basketname - - def _get_basket_info(self, ueid): - basketref = [] - basketrql = 'Any B,N WHERE B is Basket, B owned_by U, U eid %(x)s, B name N' - basketresultset = self.req.execute(basketrql, {'x': ueid}, 'x') - for result in basketresultset: - basketitemsrql = 'Any X WHERE X in_basket B, B eid %(x)s' - rset = self.req.execute(basketitemsrql, {'x': result[0]}, 'x') - basketref.append((result[0], result[1], rset)) - return basketref -class ComboboxView(EntityView): - """the view used in combobox (unrelated entities) +# XXX bw compat - THIS IS A TEXT VIEW. DO NOT HTML_ESCAPE - """ - id = 'combobox' - accepts = ('Any',) - title = None - - def cell_call(self, row, col): - """the combo-box view for an entity: same as text out of context view - by default - """ - self.wview('textoutofcontext', self.rset, row=row, col=col) - +from logilab.common.deprecation import class_moved +from cubicweb.web.views import editviews +ComboboxView = class_moved(editviews.ComboboxView) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/basetemplates.py --- a/web/views/basetemplates.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/basetemplates.py Thu May 14 12:48:11 2009 +0200 @@ -10,23 +10,19 @@ from logilab.mtconverter import html_escape -from cubicweb import NoSelectableObject, ObjectNotFound -from cubicweb.common.view import Template, MainTemplate, NOINDEX, NOFOLLOW -from cubicweb.common.utils import make_uid -from cubicweb.common.utils import UStringIO - -from cubicweb.web.views.baseviews import vid_from_rset +from cubicweb.vregistry import objectify_selector +from cubicweb.selectors import match_kwargs +from cubicweb.view import View, MainTemplate, NOINDEX, NOFOLLOW, STRICT_DOCTYPE +from cubicweb.utils import make_uid, UStringIO # main templates ############################################################## +class LogInOutTemplate(MainTemplate): -class LogInOutTemplate(MainTemplate): - def call(self): self.set_request_content_type() w = self.w self.write_doctype() - lang = self.req.lang self.template_header('text/html', self.req._('login_action')) w(u'\n') self.content(w) @@ -41,17 +37,17 @@ w(NOINDEX) w(NOFOLLOW) w(u'\n'.join(additional_headers) + u'\n') - self.template('htmlheader', rset=self.rset) + self.wview('htmlheader', rset=self.rset) w(u'%s\n' % html_escape(page_title)) - + class LogInTemplate(LogInOutTemplate): id = 'login' title = 'log in' def content(self, w): - self.template('logform', rset=self.rset, id='loginBox', klass='') - + self.wview('logform', rset=self.rset, id='loginBox', klass='') + class LoggedOutTemplate(LogInOutTemplate): id = 'loggedout' @@ -67,110 +63,76 @@ html_escape(indexurl), self.req._('go back to the index page'))) - +@objectify_selector +def templatable_view(cls, req, rset, *args, **kwargs): + view = kwargs.pop('view', None) + if view is None: + return 1 + if view.binary: + return 0 + if req.form.has_key('__notemplate'): + return 0 + return view.templatable + + +class NonTemplatableViewTemplate(MainTemplate): + """main template for any non templatable views (xml, binaries, etc.)""" + id = 'main-template' + __select__ = ~templatable_view() + + def call(self, view): + view.set_request_content_type() + view.set_stream() + xhtml_wrap = (self.req.form.has_key('__notemplate') and view.templatable + and view.content_type == self.req.html_content_type()) + if xhtml_wrap: + view.w(u'\n' + STRICT_DOCTYPE) + view.w(u'

') + # have to replace our unicode stream using view's binary stream + view.render() + if xhtml_wrap: + view.w(u'

') + self._stream = view._stream + + class TheMainTemplate(MainTemplate): """default main template : - + - call header / footer templates - - build result set - - guess and call an appropriate view through the view manager """ - id = 'main' + id = 'main-template' + __select__ = templatable_view() - def _select_view_and_rset(self): - req = self.req - if self.rset is None and not hasattr(req, '_rql_processed'): - req._rql_processed = True - rset = self.process_rql(req.form.get('rql')) - else: - rset = self.rset - # handle special "method" param when necessary - # XXX this should probably not be in the template (controller ?), however: - # * we need to have the displayed rset - # * we don't want to handle it in each view - if rset and rset.rowcount == 1 and '__method' in req.form: - entity = rset.get_entity(0, 0) - try: - method = getattr(entity, req.form.pop('__method')) - method() - except Exception, ex: - self.exception('while handling __method') - req.set_message(req._("error while handling __method: %s") % req._(ex)) - vid = req.form.get('vid') or vid_from_rset(req, rset, self.schema) - try: - view = self.vreg.select_view(vid, req, rset) - except ObjectNotFound: - self.warning("the view %s could not be found", vid) - req.set_message(req._("The view %s could not be found") % vid) - vid = vid_from_rset(req, rset, self.schema) - view = self.vreg.select_view(vid, req, rset) - except NoSelectableObject: - 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")) - self.warning("the view %s can not be applied to this query", vid) - vid = vid_from_rset(req, rset, self.schema) - view = self.vreg.select_view(vid, req, rset) - return view, rset - - def call(self): - view, rset = self._select_view_and_rset() - req = self.req - # update breadcrumps **before** validating cache, unless the view - # specifies explicitly it should not be added to breadcrumb or the - # view is a binary view - if view.add_to_breadcrumbs and not view.binary: - req.update_breadcrumbs() - view.set_http_cache_headers() - req.validate_cache() - with_templates = not view.binary and view.templatable and \ - not req.form.has_key('__notemplate') - if not with_templates: - view.set_request_content_type() - self.set_stream(templatable=False) - else: - self.set_request_content_type() - content_type = self.content_type - self.template_header(content_type, view) - if view.binary: - # have to replace our unicode stream using view's binary stream - view.dispatch() - assert self._stream, 'duh, template used as a sub-view ?? (%s)' % self._stream - self._stream = view._stream - else: - view.dispatch(w=self.w) - if with_templates: - self.template_footer(view) - - - def process_rql(self, rql): - """execute rql if specified""" - if rql: - self.ensure_ro_rql(rql) - if not isinstance(rql, unicode): - rql = unicode(rql, self.req.encoding) - pp = self.vreg.select_component('magicsearch', self.req) - self.rset = pp.process_query(rql, self.req) - return self.rset - return None + def call(self, view): + self.set_request_content_type() + self.template_header(self.content_type, view) + w = self.w + w(u'

\n') + vtitle = self.req.form.get('vtitle') + if vtitle: + w(u'

%s

\n' % html_escape(vtitle)) + # display entity type restriction component + etypefilter = self.vreg.select_component('etypenavigation', + self.req, self.rset) + if etypefilter and etypefilter.propval('visible'): + etypefilter.render(w=w) + self.nav_html = UStringIO() + if view and view.need_navigation: + view.paginate(w=self.nav_html.write) + w(_(self.nav_html.getvalue())) + w(u'

\n') + view.render(w=w) + w(u'

\n') # close id=contentmain + w(_(self.nav_html.getvalue())) + w(u'

\n') # closes id=pageContent + self.template_footer(view) def template_header(self, content_type, view=None, page_title='', additional_headers=()): page_title = page_title or view.page_title() additional_headers = additional_headers or view.html_headers() self.template_html_header(content_type, page_title, additional_headers) self.template_body_header(view) - # display entity type restriction component - etypefilter = self.vreg.select_component('etypenavigation', - self.req, self.rset) - if etypefilter and etypefilter.propval('visible'): - etypefilter.dispatch(w=self.w) - self.nav_html = UStringIO() - self.pagination(self.req, self.rset, self.nav_html.write, - not (view and view.need_navigation)) - self.w(_(self.nav_html.getvalue())) - self.w(u'

\n') - + def template_html_header(self, content_type, page_title, additional_headers=()): w = self.whead lang = self.req.lang @@ -179,38 +141,31 @@ w(u'\n' % (content_type, self.req.encoding)) w(u'\n'.join(additional_headers) + u'\n') - self.template('htmlheader', rset=self.rset) + self.wview('htmlheader', rset=self.rset) if page_title: w(u'%s\n' % html_escape(page_title)) def template_body_header(self, view): w = self.w w(u'\n') - self.template('header', rset=self.rset, view=view) + self.wview('header', rset=self.rset, view=view) w(u'

\n') self.nav_column(view, 'left') w(u'\n') self.nav_column(view, 'right') self.w(u'

\n') rqlcomp = self.vreg.select_component('rqlinput', self.req, self.rset) if rqlcomp: - rqlcomp.dispatch(w=self.w, view=view) + rqlcomp.render(w=self.w, view=view) msgcomp = self.vreg.select_component('applmessages', self.req, self.rset) if msgcomp: - msgcomp.dispatch(w=self.w) + msgcomp.render(w=self.w) self.content_header(view) - w(u'

\n') - vtitle = self.req.form.get('vtitle') - if vtitle: - w(u'

%s

\n' % html_escape(vtitle)) - + def template_footer(self, view=None): - self.w(u'

\n') # close id=contentmain - self.w(_(self.nav_html.getvalue())) - self.w(u'\n') # closes id=pageContent self.content_footer(view) self.w(u'

\n') - self.template('footer', rset=self.rset) + self.wview('footer', rset=self.rset) self.w(u'') def nav_column(self, view, context): @@ -219,15 +174,15 @@ if boxes: self.w(u'

\n') for box in boxes: - box.dispatch(w=self.w, view=view) + box.render(w=self.w, view=view) self.w(u'

\n') def content_header(self, view=None): """by default, display informal messages in content header""" - self.template('contentheader', rset=self.rset, view=view) - + self.wview('contentheader', rset=self.rset, view=view) + def content_footer(self, view=None): - self.template('contentfooter', rset=self.rset, view=view) + self.wview('contentfooter', rset=self.rset, view=view) class ErrorTemplate(TheMainTemplate): @@ -235,8 +190,8 @@ main template. This template may be called for authentication error, which means that req.cnx and req.user may not be set. """ - id = 'error' - + id = 'error-template' + def call(self): """display an unexpected error""" self.set_request_content_type() @@ -244,9 +199,9 @@ view = self.vreg.select_view('error', self.req, self.rset) self.template_header(self.content_type, view, self.req._('an error occured'), [NOINDEX, NOFOLLOW]) - view.dispatch(w=self.w) + view.render(w=self.w) self.template_footer(view) - + def template_header(self, content_type, view=None, page_title='', additional_headers=()): w = self.whead lang = self.req.lang @@ -254,7 +209,7 @@ w(u'\n' % (content_type, self.req.encoding)) w(u'\n'.join(additional_headers)) - self.template('htmlheader', rset=self.rset) + self.wview('htmlheader', rset=self.rset) w(u'%s\n' % html_escape(page_title)) self.w(u'\n') @@ -265,7 +220,7 @@ class SimpleMainTemplate(TheMainTemplate): id = 'main-no-top' - + def template_header(self, content_type, view=None, page_title='', additional_headers=()): page_title = page_title or view.page_title() additional_headers = additional_headers or view.html_headers() @@ -275,7 +230,7 @@ whead(u'\n' % (content_type, self.req.encoding)) whead(u'\n'.join(additional_headers) + u'\n') - self.template('htmlheader', rset=self.rset) + self.wview('htmlheader', rset=self.rset) w = self.w w(u'%s\n' % html_escape(page_title)) w(u'\n') @@ -288,7 +243,7 @@ if boxes: w(u'

\n') for box in boxes: - box.dispatch(w=w) + box.render(w=w) self.w(u'

\n') w(u'') w(u'') @@ -296,20 +251,20 @@ vtitle = self.req.form.get('vtitle') if vtitle: w(u'

%s

' % html_escape(vtitle)) - + def topleft_header(self): self.w(u'\n') self.w(u'\n') self.w(u'\n') # page parts templates ######################################################## -class HTMLHeader(Template): +class HTMLHeader(View): """default html headers""" id = 'htmlheader' - + def call(self, **kwargs): self.favicon() self.stylesheets() @@ -321,7 +276,7 @@ favicon = self.req.external_resource('FAVICON', None) if favicon: self.whead(u'\n' % favicon) - + def stylesheets(self): req = self.req add_css = req.add_css @@ -331,11 +286,11 @@ add_css(css, u'print', localfile=False) for css in req.external_resource('IE_STYLESHEETS'): add_css(css, localfile=False, ieonly=True) - + def javascripts(self): for jscript in self.req.external_resource('JAVASCRIPTS'): self.req.add_js(jscript, localfile=False) - + def alternates(self): urlgetter = self.vreg.select_component('rss_feed_url', self.req, self.rset) if urlgetter is not None: @@ -347,13 +302,13 @@ req = self.req pid = make_uid(id(req)) req.pageid = pid - req.html_headers.define_var('pageid', pid); + req.html_headers.define_var('pageid', pid) -class HTMLPageHeader(Template): +class HTMLPageHeader(View): """default html page header""" id = 'header' - + def call(self, view, **kwargs): self.main_header(view) self.w(u''' @@ -362,38 +317,38 @@ self.w(u'''

''') - + def main_header(self, view): """build the top menu with authentification info and the rql box""" self.w(u'\n') self.w(u'\n') # appliname and breadcrumbs self.w(u'') # logged user and help self.w(u'') # lastcolumn self.w(u'\n') self.w(u'

') - self.vreg.select_component('logo', self.req, self.rset).dispatch(w=self.w) + self.vreg.select_component('logo', self.req, self.rset).render(w=self.w) self.w(u'

') comp = self.vreg.select_component('appliname', self.req, self.rset) if comp and comp.propval('visible'): - comp.dispatch(w=self.w) + comp.render(w=self.w) comp = self.vreg.select_component('breadcrumbs', self.req, self.rset, view=view) if comp and comp.propval('visible'): - comp.dispatch(w=self.w, view=view) + comp.render(w=self.w, view=view) self.w(u'

\n') comp = self.vreg.select_component('loggeduserlink', self.req, self.rset) - comp.dispatch(w=self.w) + comp.render(w=self.w) self.w(u'

') helpcomp = self.vreg.select_component('help', self.req, self.rset) if helpcomp: # may not be available if Card is not defined in the schema - helpcomp.dispatch(w=self.w) + helpcomp.render(w=self.w) self.w(u'

') self.w(u'

\n') - self.template('logform', rset=self.rset, id='popupLoginBox', klass='hidden', - title=False, message=False) - + self.wview('logform', rset=self.rset, id='popupLoginBox', klass='hidden', + title=False, message=False) + def state_header(self): state = self.req.search_state if state[0] == 'normal': @@ -403,18 +358,18 @@ msg = ' '.join((_("searching for"), display_name(self.req, state[1][3]), _("to associate with"), value, - _("by relation"), '"', + _("by relation"), '"', display_name(self.req, state[1][2], state[1][0]), '"')) return self.w(u'

' % msg) -class HTMLPageFooter(Template): +class HTMLPageFooter(View): """default html page footer: include logo if any, and close the HTML body """ id = 'footer' - + def call(self, **kwargs): req = self.req self.w(u'') -class HTMLContentHeader(Template): +class HTMLContentHeader(View): """default html page content header: * include message component if selectable for this request * include selectable content navigation components """ id = 'contentheader' - + def call(self, view, **kwargs): """by default, display informal messages in content header""" components = self.vreg.possible_vobjects('contentnavigation', @@ -444,16 +399,16 @@ if components: self.w(u'

') for comp in components: - comp.dispatch(w=self.w, view=view) + comp.render(w=self.w, view=view) self.w(u'

') -class HTMLContentFooter(Template): +class HTMLContentFooter(View): """default html page content footer: include selectable content navigation components """ id = 'contentfooter' - + def call(self, view, **kwargs): components = self.vreg.possible_vobjects('contentnavigation', self.req, self.rset, @@ -461,12 +416,14 @@ if components: self.w(u'

') for comp in components: - comp.dispatch(w=self.w, view=view) + comp.render(w=self.w, view=view) self.w(u'

') -class LogFormTemplate(Template): +class LogFormTemplate(View): id = 'logform' + __select__ = match_kwargs('id', 'klass') + title = 'log in' def call(self, id, klass, title=True, message=True): @@ -475,7 +432,7 @@ if title: self.w(u'

' % self.req.property_value('ui.site-title')) - self.w(u'

\n') + self.w(u'

\n') if message: self.display_message() @@ -491,14 +448,15 @@ message = self.req.message if message: self.w(u'

\n' % message) - + def login_form(self, id): _ = self.req._ self.w(u'

\n' % html_escape(login_form_url(self.config, self.req))) self.w(u'\n') self.w(u'\n') - self.w(u'' % _('login')) + msg = (self.config['allow-email-login'] and _('login or email')) or _('login') + self.w(u'' % msg) self.w(u'') self.w(u'\n') self.w(u'' % _('password')) @@ -510,7 +468,7 @@ self.w(u'\n') self.req.html_headers.add_onload('jQuery("#__login:visible").focus()') - + def login_form_url(config, req): if req.https: return req.url() @@ -518,3 +476,7 @@ return req.url().replace(req.base_url(), config['https-url']) return req.url() + +## vregistry registration callback ############################################ +def registration_callback(vreg): + vreg.register_all(globals().values(), modname=__name__) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/baseviews.py --- a/web/views/baseviews.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/baseviews.py Thu May 14 12:48:11 2009 +0200 @@ -4,7 +4,6 @@ * primary, sidebox * secondary, oneline, incontext, outofcontext, text * list -* xml, rss :organization: Logilab @@ -15,39 +14,31 @@ __docformat__ = "restructuredtext en" -from warnings import warn -from time import timezone - from rql import nodes -from logilab.common.decorators import cached from logilab.mtconverter import TransformError, html_escape, xml_escape -from cubicweb import Unauthorized, NoSelectableObject, typed_eid -from cubicweb.common.selectors import (yes, nonempty_rset, accept, - one_line_rset, match_search_state, - match_form_params, accept_rset) -from cubicweb.common.uilib import (cut, printable_value, UnicodeCSVWriter, - ajax_replace_url, rql_for_eid, simple_sgml_tag) -from cubicweb.common.view import EntityView, AnyRsetView, EmptyRsetView -from cubicweb.web.httpcache import MaxAgeHTTPCacheManager -from cubicweb.web.views import vid_from_rset, linksearch_select_url, linksearch_match +from cubicweb import NoSelectableObject +from cubicweb.selectors import yes, empty_rset +from cubicweb.view import EntityView, AnyRsetView, View +from cubicweb.common.uilib import cut, printable_value _ = unicode class NullView(AnyRsetView): """default view when no result has been found""" id = 'null' - __select__ = classmethod(yes) + __select__ = yes() def call(self, **kwargs): pass cell_call = call -class NoResultView(EmptyRsetView): +class NoResultView(View): """default view when no result has been found""" + __select__ = empty_rset() id = 'noresult' - + def call(self, **kwargs): self.w(u'

\n' % self.req._('No result matching query')) @@ -55,7 +46,7 @@ class FinalView(AnyRsetView): """display values without any transformation (i.e. get a number for - entities) + entities) """ id = 'final' # record generated i18n catalog messages @@ -73,10 +64,11 @@ _('%d hours') _('%d minutes') _('%d seconds') - + def cell_call(self, row, col, props=None, displaytime=False, format='text/html'): etype = self.rset.description[row][col] value = self.rset.rows[row][col] + if etype == 'String': entity, rtype = self.rset.related_entity(row, col) if entity is not None: @@ -84,7 +76,7 @@ self.w(entity.printable_value(rtype, value, format=format)) return if etype in ('Time', 'Interval'): - # value is DateTimeDelta but we have no idea about what is the + # value is DateTimeDelta but we have no idea about what is the # reference date here, so we can only approximate years and months if format == 'text/html': space = ' ' @@ -98,276 +90,20 @@ self.w(self.req.__('%%d%sweeks' % space) % (value.days // 7)) elif value.days > 2: self.w(self.req.__('%%d%sdays' % space) % int(value.days)) - elif value.hours > 2: - self.w(self.req.__('%%d%shours' % space) % int(value.hours)) - elif value.minutes >= 2: - self.w(self.req.__('%%d%sminutes' % space) % int(value.minutes)) + elif value.seconds > 3600: + self.w(self.req.__('%%d%shours' % space) % int(value.seconds // 3600)) + elif value.seconds >= 120: + self.w(self.req.__('%%d%sminutes' % space) % int(value.seconds // 60)) else: self.w(self.req.__('%%d%sseconds' % space) % int(value.seconds)) return self.wdata(printable_value(self.req, etype, value, props, displaytime=displaytime)) -class EditableFinalView(FinalView): - """same as FinalView but enables inplace-edition when possible""" - id = 'editable-final' - - def cell_call(self, row, col, props=None, displaytime=False): - etype = self.rset.description[row][col] - value = self.rset.rows[row][col] - entity, rtype = self.rset.related_entity(row, col) - if entity is not None: - self.w(entity.view('reledit', rtype=rtype)) - else: - super(EditableFinalView, self).cell_call(row, col, props, displaytime) - -PRIMARY_SKIP_RELS = set(['is', 'is_instance_of', 'identity', - 'owned_by', 'created_by', - 'in_state', 'wf_info_for', 'require_permission', - 'from_entity', 'to_entity', - 'see_also']) - -class PrimaryView(EntityView): - """the full view of an non final entity""" - id = 'primary' - title = _('primary') - show_attr_label = True - show_rel_label = True - skip_none = True - skip_attrs = ('eid', 'creation_date', 'modification_date') - skip_rels = () - main_related_section = True - - def html_headers(self): - """return a list of html headers (eg something to be inserted between - and of the returned page - - by default primary views are indexed - """ - return [] - - def cell_call(self, row, col): - self.row = row - # XXX move render_entity implementation here - self.render_entity(self.complete_entity(row, col)) - - def render_entity(self, entity): - """return html to display the given entity""" - siderelations = [] - self.render_entity_title(entity) - self.render_entity_metadata(entity) - # entity's attributes and relations, excluding meta data - # if the entity isn't meta itself - boxes = self._preinit_side_related(entity, siderelations) - if boxes: - self.w(u'

%s	%s
%s

') - self.w(u'

') - self.render_entity_attributes(entity, siderelations) - self.w(u'

') - self.content_navigation_components('navcontenttop') - if self.main_related_section: - self.render_entity_relations(entity, siderelations) - self.w(u'

') - if boxes: - self.w(u'

') - # side boxes - self.w(u'

') - self.render_side_related(entity, siderelations) - self.w(u'

') - self.w(u'

') - self.content_navigation_components('navcontentbottom') - - - def content_navigation_components(self, context): - self.w(u'

' % context) - for comp in self.vreg.possible_vobjects('contentnavigation', - self.req, self.rset, row=self.row, - view=self, context=context): - try: - comp.dispatch(w=self.w, row=self.row, view=self) - except NotImplementedError: - warn('component %s doesnt implement cell_call, please update' - % comp.__class__, DeprecationWarning) - comp.dispatch(w=self.w, view=self) - self.w(u'

') - - def iter_attributes(self, entity): - for rschema, targetschema in entity.e_schema.attribute_definitions(): - attr = rschema.type - if attr in self.skip_attrs: - continue - yield rschema, targetschema - - def iter_relations(self, entity): - skip = set(self.skip_rels) - skip.update(PRIMARY_SKIP_RELS) - for rschema, targetschemas, x in entity.e_schema.relation_definitions(): - if rschema.type in skip: - continue - yield rschema, targetschemas, x - - def render_entity_title(self, entity): - title = self.content_title(entity) # deprecate content_title? - if title: - self.w(u'

%s %s

' - % (entity.dc_type().capitalize(), title)) - - def content_title(self, entity): - """default implementation return an empty string""" - return u'' - - def render_entity_metadata(self, entity): - entity.view('metadata', w=self.w) - summary = self.summary(entity) # deprecate summary? - if summary: - self.w(u'

' % summary) - - def summary(self, entity): - """default implementation return an empty string""" - return u'' - - def render_entity_attributes(self, entity, siderelations): - for rschema, targetschema in self.iter_attributes(entity): - attr = rschema.type - if targetschema.type in ('Password', 'Bytes'): - continue - try: - wdg = entity.get_widget(attr) - except Exception, ex: - value = entity.printable_value(attr, entity[attr], targetschema.type) - else: - value = wdg.render(entity) - if self.skip_none and (value is None or value == ''): - continue - if rschema.meta: - continue - self._render_related_entities(entity, rschema, value) - - def _preinit_side_related(self, entity, siderelations): - self._sideboxes = None - self._related_entities = [] - if hasattr(self, 'get_side_boxes_defs'): - self._sideboxes = [(label, rset) for label, rset in self.get_side_boxes_defs(entity) - if rset] - else: - eschema = entity.e_schema - maxrelated = self.req.property_value('navigation.related-limit') - for rschema, targetschemas, x in self.iter_relations(entity): - try: - related = entity.related(rschema.type, x, limit=maxrelated+1) - except Unauthorized: - continue - if not related: - continue - if self.is_side_related(rschema, eschema): - siderelations.append((rschema, related, x)) - continue - self._related_entities.append((rschema, related, x)) - self._boxes_in_context = list(self.vreg.possible_vobjects('boxes', self.req, self.rset, - row=self.row, view=self, - context='incontext')) - return self._sideboxes or self._boxes_in_context or self._related_entities or siderelations - - def render_entity_relations(self, entity, siderelations): - if self._related_entities: - for rschema, related, x in self._related_entities: - self._render_related_entities(entity, rschema, related, x) - - - def render_side_related(self, entity, siderelations): - """display side related relations: - non-meta in a first step, meta in a second step - """ - if self._sideboxes: - for label, rset in self._sideboxes: - self.w(u'

') - self.wview('sidebox', rset, title=label) - self.w(u'

') - elif siderelations: - self.w(u'

') - for relatedinfos in siderelations: - # if not relatedinfos[0].meta: - # continue - self._render_related_entities(entity, *relatedinfos) - self.w(u'

') - - if self._boxes_in_context: - for box in self._boxes_in_context: - try: - box.dispatch(w=self.w, row=self.row) - except NotImplementedError: - # much probably a context insensitive box, which only implements - # .call() and not cell_call() - box.dispatch(w=self.w) - - def is_side_related(self, rschema, eschema): - return rschema.meta and \ - not rschema.schema_relation() == eschema.schema_entity() - - def _render_related_entities(self, entity, rschema, related, - role='subject'): - if rschema.is_final(): - value = related - show_label = self.show_attr_label - else: - if not related: - return - show_label = self.show_rel_label - # if not too many entities, show them all in a list - maxrelated = self.req.property_value('navigation.related-limit') - if related.rowcount <= maxrelated: - if related.rowcount == 1: - value = self.view('incontext', related, row=0) - elif 1 < related.rowcount <= 5: - value = self.view('csv', related) - else: - value = '

' + self.view('simplelist', related) + '

' - # else show links to display related entities - else: - rql = related.printable_rql() - related.limit(maxrelated) - value = '

' + self.view('simplelist', related) - value += '[%s]' % (self.build_url(rql=rql), - self.req._('see them all')) - value += '

' - label = display_name(self.req, rschema.type, role) - self.field(label, value, show_label=show_label, w=self.w, tr=False) - -class SideBoxView(EntityView): - """side box usually displaying some related entities in a primary view""" - id = 'sidebox' - - def call(self, boxclass='sideBox', title=u''): - """display a list of entities by calling their view - """ - if title: - self.w(u'

' % title) - self.w(u'

' % boxclass) - # if not too much entities, show them all in a list - maxrelated = self.req.property_value('navigation.related-limit') - if self.rset.rowcount <= maxrelated: - if len(self.rset) == 1: - self.wview('incontext', self.rset, row=0) - elif 1 < len(self.rset) < 5: - self.wview('csv', self.rset) - else: - self.wview('simplelist', self.rset) - # else show links to display related entities - else: - self.rset.limit(maxrelated) - rql = self.rset.printable_rql(encoded=False) - self.wview('simplelist', self.rset) - self.w(u'[%s]' % (self.build_url(rql=rql), - self.req._('see them all'))) - self.w(u'

\n') - - - class SecondaryView(EntityView): id = 'secondary' title = _('secondary') - + def cell_call(self, row, col): """the secondary view for an entity secondary = icon + view(oneline) @@ -376,9 +112,10 @@ self.w(u' ') self.wview('oneline', self.rset, row=row, col=col) + class OneLineView(EntityView): id = 'oneline' - title = _('oneline') + title = _('oneline') def cell_call(self, row, col): """the one line view for an entity: linked text view @@ -388,12 +125,13 @@ self.w(html_escape(self.view('text', self.rset, row=row, col=col))) self.w(u'') + class TextView(EntityView): """the simplest text view for an entity""" id = 'text' title = _('text') content_type = 'text/plain' - accepts = 'Any', + def call(self, **kwargs): """the view is called for an entire result set, by default loop other rows of the result set and call the same view on the @@ -408,7 +146,7 @@ self.wview(self.id, rset, row=i, **kwargs) if len(rset) > 1: self.w(u"\n") - + def cell_call(self, row, col=0, **kwargs): entity = self.entity(row, col) self.w(cut(entity.dc_title(), @@ -418,9 +156,8 @@ class MetaDataView(EntityView): """paragraph view of some metadata""" id = 'metadata' - accepts = 'Any', show_eid = True - + def cell_call(self, row, col): _ = self.req._ entity = self.entity(row, col) @@ -429,10 +166,10 @@ self.w(u'#%s - ' % entity.eid) if entity.modification_date != entity.creation_date: self.w(u'%s ' % _('latest update on')) - self.w(u'%s, ;' + self.w(u'%s, ' % self.format_date(entity.modification_date)) # entities from external source may not have a creation date (eg ldap) - if entity.creation_date: + if entity.creation_date: self.w(u'%s ' % _('created on')) self.w(u'%s' % self.format_date(entity.creation_date)) @@ -451,7 +188,8 @@ def cell_call(self, row, col): entity = self.entity(row, col) self.w(entity.dc_title()) - + + class OutOfContextTextView(InContextTextView): id = 'textoutofcontext' @@ -471,7 +209,7 @@ self.w(html_escape(self.view('textincontext', self.rset, row=row, col=col))) self.w(u'') - + class OutOfContextView(EntityView): id = 'outofcontext' @@ -480,29 +218,17 @@ self.w(html_escape(self.view('textoutofcontext', self.rset, row=row, col=col))) self.w(u'') -class NotClickableInContextView(EntityView): - id = 'incontext' - accepts = ('State',) - def cell_call(self, row, col): - self.w(html_escape(self.view('textincontext', self.rset, row=row, col=col))) -## class NotClickableOutOfContextView(EntityView): -## id = 'outofcontext' -## accepts = ('State',) -## def cell_call(self, row, col): -## self.w(html_escape(self.view('textoutofcontext', self.rset, row=row))) +# list views ################################################################## - -# list and table related views ################################################ - class ListView(EntityView): id = 'list' title = _('list') item_vid = 'listitem' - + def call(self, klass=None, title=None, subvid=None, listid=None, **kwargs): """display a list of entities by calling their view - + :param listid: the DOM id to use for the root element """ if subvid is None and 'subvid' in self.req.form: @@ -549,16 +275,16 @@ return self.build_url(entity.rest_path(), vid=self.id) return self.build_url(rql=self.rset.printable_rql(), vid=self.id) - + class ListItemView(EntityView): id = 'listitem' - + @property def redirect_vid(self): if self.req.search_state[0] == 'normal': return 'outofcontext' return 'outofcontext-search' - + def cell_call(self, row, col, vid=None, **kwargs): if not vid: vid = self.redirect_vid @@ -579,7 +305,7 @@ class CSVView(SimpleListView): id = 'csv' redirect_vid = 'incontext' - + def call(self, **kwargs): rset = self.rset for i in xrange(len(rset)): @@ -589,394 +315,10 @@ class TreeItemView(ListItemView): - accepts = ('Any',) id = 'treeitem' - - def cell_call(self, row, col): - self.wview('incontext', self.rset, row=row, col=col) - - -# xml and xml/rss views ####################################################### - -class XmlView(EntityView): - id = 'xml' - title = _('xml') - templatable = False - content_type = 'text/xml' - xml_root = 'rset' - item_vid = 'xmlitem' - - def cell_call(self, row, col): - self.wview(self.item_vid, self.rset, row=row, col=col) - - def call(self): - """display a list of entities by calling their view""" - self.w(u'\n' % self.req.encoding) - self.w(u'<%s size="%s">\n' % (self.xml_root, len(self.rset))) - for i in xrange(self.rset.rowcount): - self.cell_call(i, 0) - self.w(u'\n' % self.xml_root) - - -class XmlItemView(EntityView): - id = 'xmlitem' - - def cell_call(self, row, col): - """ element as an item for an xml feed """ - entity = self.complete_entity(row, col) - self.w(u'<%s>\n' % (entity.e_schema)) - for rschema, attrschema in entity.e_schema.attribute_definitions(): - attr = rschema.type - try: - value = entity[attr] - except KeyError: - # Bytes - continue - if value is not None: - if attrschema == 'Bytes': - from base64 import b64encode - value = '' % b64encode(value.getvalue()) - elif isinstance(value, basestring): - value = xml_escape(value) - self.w(u' <%s>%s\n' % (attr, value, attr)) - self.w(u'\n' % (entity.e_schema)) - - - -class XMLRsetView(AnyRsetView): - """dumps xml in CSV""" - id = 'rsetxml' - title = _('xml export') - templatable = False - content_type = 'text/xml' - xml_root = 'rset' - - def call(self): - w = self.w - rset, descr = self.rset, self.rset.description - eschema = self.schema.eschema - labels = self.columns_labels(False) - w(u'\n' % self.req.encoding) - w(u'<%s query="%s">\n' % (self.xml_root, html_escape(rset.printable_rql()))) - for rowindex, row in enumerate(self.rset): - w(u' \n') - for colindex, val in enumerate(row): - etype = descr[rowindex][colindex] - tag = labels[colindex] - attrs = {} - if '(' in tag: - attrs['expr'] = tag - tag = 'funccall' - if val is not None and not eschema(etype).is_final(): - attrs['eid'] = val - # csvrow.append(val) # val is eid in that case - val = self.view('textincontext', rset, - row=rowindex, col=colindex) - else: - val = self.view('final', rset, displaytime=True, - row=rowindex, col=colindex, format='text/plain') - w(simple_sgml_tag(tag, val, **attrs)) - w(u' \n') - w(u'\n' % self.xml_root) - - -class RssView(XmlView): - id = 'rss' - title = _('rss') - templatable = False - content_type = 'text/xml' - http_cache_manager = MaxAgeHTTPCacheManager - cache_max_age = 60*60*2 # stay in http cache for 2 hours by default - - def _open(self): - req = self.req - self.w(u'\n' % req.encoding) - self.w(u'''\n''') - self.w(u' \n') - self.w(u' %s RSS Feed\n' % html_escape(self.page_title())) - self.w(u' %s\n' % html_escape(req.form.get('vtitle', ''))) - params = req.form.copy() - params.pop('vid', None) - self.w(u' %s\n' % html_escape(self.build_url(**params))) - - def _close(self): - self.w(u' \n') - self.w(u'') - - def call(self): - """display a list of entities by calling their view""" - self._open() - for i in xrange(self.rset.rowcount): - self.cell_call(i, 0) - self._close() - - def cell_call(self, row, col): - self.wview('rssitem', self.rset, row=row, col=col) - -class RssItemView(EntityView): - id = 'rssitem' - date_format = '%%Y-%%m-%%dT%%H:%%M%+03i:00' % (timezone / 3600) - add_div_section = False def cell_call(self, row, col): - entity = self.complete_entity(row, col) - self.w(u'\n') - self.w(u'%s\n' % html_escape(entity.absolute_url())) - self.render_title_link(entity) - self._marker('description', html_escape(entity.dc_description())) - self._marker('dc:date', entity.dc_date(self.date_format)) - self.render_entity_creator(entity) - self.w(u'\n') - - def render_title_link(self, entity): - self._marker('title', entity.dc_long_title()) - self._marker('link', entity.absolute_url()) - - def render_entity_creator(self, entity): - if entity.creator: - self._marker('dc:creator', entity.dc_creator()) - - - def _marker(self, marker, value): - if value: - self.w(u' <%s>%s\n' % (marker, html_escape(value), marker)) - -class CSVMixIn(object): - """mixin class for CSV views""" - templatable = False - content_type = "text/comma-separated-values" - binary = True # avoid unicode assertion - csv_params = {'dialect': 'excel', - 'quotechar': '"', - 'delimiter': ';', - 'lineterminator': '\n'} - - def set_request_content_type(self): - """overriden to set a .csv filename""" - self.req.set_content_type(self.content_type, filename='cubicwebexport.csv') - - def csvwriter(self, **kwargs): - params = self.csv_params.copy() - params.update(kwargs) - return UnicodeCSVWriter(self.w, self.req.encoding, **params) - - -class CSVRsetView(CSVMixIn, AnyRsetView): - """dumps rset in CSV""" - id = 'csvexport' - title = _('csv export') - - def call(self): - writer = self.csvwriter() - writer.writerow(self.columns_labels()) - rset, descr = self.rset, self.rset.description - eschema = self.schema.eschema - for rowindex, row in enumerate(rset): - csvrow = [] - for colindex, val in enumerate(row): - etype = descr[rowindex][colindex] - if val is not None and not eschema(etype).is_final(): - # csvrow.append(val) # val is eid in that case - content = self.view('textincontext', rset, - row=rowindex, col=colindex) - else: - content = self.view('final', rset, - displaytime=True, format='text/plain', - row=rowindex, col=colindex) - csvrow.append(content) - writer.writerow(csvrow) - - -class CSVEntityView(CSVMixIn, EntityView): - """dumps rset's entities (with full set of attributes) in CSV""" - id = 'ecsvexport' - title = _('csv entities export') - - def call(self): - """ - the generated CSV file will have a table per entity type - found in the resultset. ('table' here only means empty - lines separation between table contents) - """ - req = self.req - rows_by_type = {} - writer = self.csvwriter() - rowdef_by_type = {} - for index in xrange(len(self.rset)): - entity = self.complete_entity(index) - if entity.e_schema not in rows_by_type: - rowdef_by_type[entity.e_schema] = [rs for rs, at in entity.e_schema.attribute_definitions() - if at != 'Bytes'] - rows_by_type[entity.e_schema] = [[display_name(req, rschema.type) - for rschema in rowdef_by_type[entity.e_schema]]] - rows = rows_by_type[entity.e_schema] - rows.append([entity.printable_value(rs.type, format='text/plain') - for rs in rowdef_by_type[entity.e_schema]]) - for etype, rows in rows_by_type.items(): - writer.writerows(rows) - # use two empty lines as separator - writer.writerows([[], []]) - - -## Work in progress ########################################################### - -class SearchForAssociationView(EntityView): - """view called by the edition view when the user asks - to search for something to link to the edited eid - """ - id = 'search-associate' - title = _('search for association') - __selectors__ = (one_line_rset, match_search_state, accept) - accepts = ('Any',) - search_states = ('linksearch',) - - def cell_call(self, row, col): - rset, vid, divid, paginate = self.filter_box_context_info() - self.w(u'

' % divid) - self.pagination(self.req, rset, w=self.w) - self.wview(vid, rset, 'noresult') - self.w(u'

') - - @cached - def filter_box_context_info(self): - entity = self.entity(0, 0) - role, eid, rtype, etype = self.req.search_state[1] - assert entity.eid == typed_eid(eid) - # the default behaviour is to fetch all unrelated entities and display - # them. Use fetch_order and not fetch_unrelated_order as sort method - # since the latter is mainly there to select relevant items in the combo - # box, it doesn't give interesting result in this context - rql = entity.unrelated_rql(rtype, etype, role, - ordermethod='fetch_order', - vocabconstraints=False) - rset = self.req.execute(rql, {'x' : entity.eid}, 'x') - #vid = vid_from_rset(self.req, rset, self.schema) - return rset, 'list', "search-associate-content", True - - -class OutOfContextSearch(EntityView): - id = 'outofcontext-search' - def cell_call(self, row, col): - entity = self.entity(row, col) - erset = entity.as_rset() - if linksearch_match(self.req, erset): - self.w(u'%s [...]' % ( - html_escape(linksearch_select_url(self.req, erset)), - self.req._('select this entity'), - html_escape(entity.view('textoutofcontext')), - html_escape(entity.absolute_url(vid='primary')), - self.req._('view detail for this entity'))) - else: - entity.view('outofcontext', w=self.w) - - -class EditRelationView(EntityView): - """Note: This is work in progress - - This view is part of the edition view refactoring. - It is still too big and cluttered with strange logic, but it's a start - - The main idea is to be able to call an edition view for a specific - relation. For example : - self.wview('editrelation', person_rset, rtype='firstname') - self.wview('editrelation', person_rset, rtype='works_for') - """ - id = 'editrelation' - - __selectors__ = (match_form_params,) - form_params = ('rtype',) - - # TODO: inlineview, multiple edit, (widget view ?) - def cell_call(self, row, col, rtype=None, role='subject', targettype=None, - showlabel=True): - self.req.add_js( ('cubicweb.ajax.js', 'cubicweb.edition.js') ) - entity = self.entity(row, col) - rtype = self.req.form.get('rtype', rtype) - showlabel = self.req.form.get('showlabel', showlabel) - assert rtype is not None, "rtype is mandatory for 'edirelation' view" - targettype = self.req.form.get('targettype', targettype) - role = self.req.form.get('role', role) - category = entity.rtags.get_category(rtype, targettype, role) - if category in ('primary', 'secondary') or self.schema.rschema(rtype).is_final(): - if hasattr(entity, '%s_format' % rtype): - formatwdg = entity.get_widget('%s_format' % rtype, role) - self.w(formatwdg.edit_render(entity)) - self.w(u'
') - wdg = entity.get_widget(rtype, role) - if showlabel: - self.w(u'%s' % wdg.render_label(entity)) - self.w(u'%s %s %s' % - (wdg.render_error(entity), wdg.edit_render(entity), - wdg.render_help(entity),)) - else: - self._render_generic_relation(entity, rtype, role) - - def _render_generic_relation(self, entity, relname, role): - text = self.req.__('add %s %s %s' % (entity.e_schema, relname, role)) - # pending operations - operations = self.req.get_pending_operations(entity, relname, role) - if operations['insert'] or operations['delete'] or 'unfold' in self.req.form: - self.w(u'

%s

' % text) - self._render_generic_relation_form(operations, entity, relname, role) - else: - divid = "%s%sreledit" % (relname, role) - url = ajax_replace_url(divid, rql_for_eid(entity.eid), 'editrelation', - {'unfold' : 1, 'relname' : relname, 'role' : role}) - self.w(u'%s' % (url, text)) - self.w(u'

' % divid) - - - def _build_opvalue(self, entity, relname, target, role): - if role == 'subject': - return '%s:%s:%s' % (entity.eid, relname, target) - else: - return '%s:%s:%s' % (target, relname, entity.eid) - - - def _render_generic_relation_form(self, operations, entity, relname, role): - rqlexec = self.req.execute - for optype, targets in operations.items(): - for target in targets: - self._render_pending(optype, entity, relname, target, role) - opvalue = self._build_opvalue(entity, relname, target, role) - self.w(u'- ' - % (opvalue, entity.eid)) - rset = rqlexec('Any X WHERE X eid %(x)s', {'x': target}, 'x') - self.wview('oneline', rset) - # now, unrelated ones - self._render_unrelated_selection(entity, relname, role) - - def _render_pending(self, optype, entity, relname, target, role): - opvalue = self._build_opvalue(entity, relname, target, role) - self.w(u'' - % (optype, opvalue)) - if optype == 'insert': - checktext = '-' - else: - checktext = '+' - rset = self.req.execute('Any X WHERE X eid %(x)s', {'x': target}, 'x') - self.w(u"""[%s""" - % (optype.capitalize(), relname, target, role, - self.view('oneline', rset))) - - def _render_unrelated_selection(self, entity, relname, role): - rschema = self.schema.rschema(relname) - if role == 'subject': - targettypes = rschema.objects(entity.e_schema) - else: - targettypes = rschema.subjects(entity.e_schema) - self.w(u' @@ -144,7 +183,6 @@ """ - def call(self, view=None, **kwargs): req = self.req if req.form.pop('__fromsearchbox', None): @@ -156,7 +194,7 @@ title = u"""%s""" % req._(self.title) box = BoxWidget(title, self.id, _class="searchBoxFrame", islist=False, escape=False) box.append(BoxHtml(form)) - box.render(self.w) + box.render(self.w) # boxes disabled by default ################################################### @@ -164,11 +202,11 @@ class PossibleViewsBox(BoxTemplate): """display a box containing links to all possible views""" id = 'possible_views_box' - + __select__ = BoxTemplate.__select__ & match_user_groups('users', 'managers') + + visible = False title = _('possible views') order = 10 - require_groups = ('users', 'managers') - visible = False def call(self, **kwargs): box = BoxWidget(self.req._(self.title), self.id) @@ -182,27 +220,11 @@ if not box.is_empty(): box.render(self.w) - -class RSSIconBox(ExtResourcesBoxTemplate): - """just display the RSS icon on uniform result set""" - __selectors__ = ExtResourcesBoxTemplate.__selectors__ + (appobject_selectable('components', 'rss_feed_url'),) - - id = 'rss' - order = 999 - need_resources = 'RSS_LOGO', - visible = False - - def call(self, **kwargs): - urlgetter = self.vreg.select_component('rss_feed_url', self.req, self.rset) - url = urlgetter.feed_url() - rss = self.req.external_resource('RSS_LOGO') - self.w(u'

\n' % (html_escape(url), rss)) - class StartupViewsBox(BoxTemplate): """display a box containing links to all startup views""" id = 'startup_views_box' - visible = False# disabled by default + visible = False # disabled by default title = _('startup views') order = 70 @@ -211,7 +233,36 @@ for view in self.vreg.possible_views(self.req, None): if view.category == 'startupview': box.append(self.box_action(view)) - + if not box.is_empty(): box.render(self.w) + +# helper classes ############################################################## + +class SideBoxView(EntityView): + """helper view class to display some entities in a sidebox""" + id = 'sidebox' + + def call(self, boxclass='sideBox', title=u''): + """display a list of entities by calling their view""" + if title: + self.w(u'

' % title) + self.w(u'

' % boxclass) + # if not too much entities, show them all in a list + maxrelated = self.req.property_value('navigation.related-limit') + if self.rset.rowcount <= maxrelated: + if len(self.rset) == 1: + self.wview('incontext', self.rset, row=0) + elif 1 < len(self.rset) < 5: + self.wview('csv', self.rset) + else: + self.wview('simplelist', self.rset) + # else show links to display related entities + else: + self.rset.limit(maxrelated) + rql = self.rset.printable_rql(encoded=False) + self.wview('simplelist', self.rset) + self.w(u'[%s]' % (self.build_url(rql=rql), + self.req._('see them all'))) + self.w(u'

\n') diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/calendar.py --- a/web/views/calendar.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/calendar.py Thu May 14 12:48:11 2009 +0200 @@ -1,63 +1,93 @@ """html calendar views :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ -from mx.DateTime import DateTime, RelativeDateTime, today, ISO -from datetime import datetime - -from vobject import iCalendar, icalendar +from datetime import datetime, date, timedelta from logilab.mtconverter import html_escape from cubicweb.interfaces import ICalendarable -from cubicweb.common.utils import date_range -from cubicweb.common.uilib import ajax_replace_url -from cubicweb.common.selectors import implement_interface -from cubicweb.common.registerers import priority_registerer -from cubicweb.common.view import EntityView - - -# For backward compatibility -from cubicweb.interfaces import ICalendarViews, ITimetableViews -try: - from cubicweb.web.views.old_calendar import _CalendarView, AMPMWeekCalendarView -except ImportError: - import logging - logger = logging.getLogger('cubicweb.registry') - logger.info("old calendar views could not be found and won't be registered") +from cubicweb.selectors import implements +from cubicweb.utils import strptime, date_range, todate, todatetime +from cubicweb.view import EntityView _ = unicode -# useful constants & functions -def mkdt(mxdate): - """ - Build a stdlib datetime date from a mx.datetime - """ - d = mxdate - return datetime(d.year, d.month, d.day, d.hour, d.minute, - tzinfo=icalendar.utc) -def iso(mxdate): - """ - Format a ms datetime in ISO 8601 string - """ - # XXX What about timezone? - return ISO.str(mxdate) +# useful constants & functions ################################################ -# mx.DateTime and ustrftime could be used to build WEEKDAYS +ONEDAY = timedelta(1) + WEEKDAYS = (_("monday"), _("tuesday"), _("wednesday"), _("thursday"), _("friday"), _("saturday"), _("sunday")) - -# used by i18n tools MONTHNAMES = ( _('january'), _('february'), _('march'), _('april'), _('may'), _('june'), _('july'), _('august'), _('september'), _('october'), _('november'), _('december') ) -################# -# In calendar views (views used as calendar cell item) +# Calendar views ############################################################## + +try: + from vobject import iCalendar + + class iCalView(EntityView): + """A calendar view that generates a iCalendar file (RFC 2445) + + Does apply to ICalendarable compatible entities + """ + __select__ = implements(ICalendarable) + need_navigation = False + content_type = 'text/calendar' + title = _('iCalendar') + templatable = False + id = 'ical' + + def call(self): + ical = iCalendar() + for i in range(len(self.rset.rows)): + task = self.complete_entity(i) + event = ical.add('vevent') + event.add('summary').value = task.dc_title() + event.add('description').value = task.dc_description() + if task.start: + event.add('dtstart').value = task.start + if task.stop: + event.add('dtend').value = task.stop + + buff = ical.serialize() + if not isinstance(buff, unicode): + buff = unicode(buff, self.req.encoding) + self.w(buff) + +except ImportError: + pass + +class hCalView(EntityView): + """A calendar view that generates a hCalendar file + + Does apply to ICalendarable compatible entities + """ + id = 'hcal' + __select__ = implements(ICalendarable) + need_navigation = False + title = _('hCalendar') + #templatable = False + + def call(self): + self.w(u'

') + for i in range(len(self.rset.rows)): + task = self.complete_entity(i) + self.w(u'

') + self.w(u'

%s

' % html_escape(task.dc_title())) + self.w(u'

' % html_escape(task.dc_description())) + if task.start: + self.w(u'%s' % (task.start.isoformat(), self.format_date(task.start))) + if task.stop: + self.w(u'%s' % (task.stop.isoformat(), self.format_date(task.stop))) + self.w(u'

') + self.w(u'

') class CalendarItemView(EntityView): @@ -68,74 +98,14 @@ task.view('oneline', w=self.w) if dates: if task.start and task.stop: - self.w('
from %s'%self.format_date(task.start)) + self.w('
' % self.req._('from %(date)s' % {'date': self.format_date(task.start)})) + self.w('
' % self.req._('to %(date)s' % {'date': self.format_date(task.stop)})) self.w('
to %s'%self.format_date(task.stop)) - + class CalendarLargeItemView(CalendarItemView): id = 'calendarlargeitem' - -################# -# Calendar views - -class iCalView(EntityView): - """A calendar view that generates a iCalendar file (RFC 2445) - - Does apply to ICalendarable compatible entities - """ - __registerer__ = priority_registerer - __selectors__ = (implement_interface,) - accepts_interfaces = (ICalendarable,) - need_navigation = False - content_type = 'text/calendar' - title = _('iCalendar') - templatable = False - id = 'ical' - - def call(self): - ical = iCalendar() - for i in range(len(self.rset.rows)): - task = self.complete_entity(i) - event = ical.add('vevent') - event.add('summary').value = task.dc_title() - event.add('description').value = task.dc_description() - if task.start: - event.add('dtstart').value = mkdt(task.start) - if task.stop: - event.add('dtend').value = mkdt(task.stop) - buff = ical.serialize() - if not isinstance(buff, unicode): - buff = unicode(buff, self.req.encoding) - self.w(buff) -class hCalView(EntityView): - """A calendar view that generates a hCalendar file - - Does apply to ICalendarable compatible entities - """ - __registerer__ = priority_registerer - __selectors__ = (implement_interface,) - accepts_interfaces = (ICalendarable,) - need_navigation = False - title = _('hCalendar') - #templatable = False - id = 'hcal' - - def call(self): - self.w(u'

') - for i in range(len(self.rset.rows)): - task = self.complete_entity(i) - self.w(u'

') - self.w(u'

%s

' % html_escape(task.dc_title())) - self.w(u'

' % html_escape(task.dc_description())) - if task.start: - self.w(u'%s' % (iso(task.start), self.format_date(task.start))) - if task.stop: - self.w(u'%s' % (iso(task.stop), self.format_date(task.stop))) - self.w(u'

') - self.w(u'

') - - class _TaskEntry(object): def __init__(self, task, color, index=0): self.task = task @@ -143,20 +113,29 @@ self.index = index self.length = 1 + def in_working_hours(self): + """predicate returning True is the task is in working hours""" + if todatetime(self.task.start).hour > 7 and todatetime(self.task.stop).hour < 20: + return True + return False + + def is_one_day_task(self): + task = self.task + return task.start and task.stop and task.start.isocalendar() == task.stop.isocalendar() + + class OneMonthCal(EntityView): """At some point, this view will probably replace ampm calendars""" - __registerer__ = priority_registerer - __selectors__ = (implement_interface, ) - accepts_interfaces = (ICalendarable,) + id = 'onemonthcal' + __select__ = implements(ICalendarable) need_navigation = False - id = 'onemonthcal' title = _('one month') def call(self): self.req.add_js('cubicweb.ajax.js') self.req.add_css('cubicweb.calendar.css') # XXX: restrict courses directy with RQL - _today = today() + _today = datetime.today() if 'year' in self.req.form: year = int(self.req.form['year']) @@ -167,56 +146,62 @@ else: month = _today.month - first_day_of_month = DateTime(year, month, 1) - lastday = first_day_of_month + RelativeDateTime(months=1,weekday=(6,1)) - firstday= first_day_of_month + RelativeDateTime(months=-1,weekday=(0,-1)) + first_day_of_month = date(year, month, 1) + firstday = first_day_of_month - timedelta(first_day_of_month.weekday()) + if month >= 12: + last_day_of_month = date(year + 1, 1, 1) - timedelta(1) + else: + last_day_of_month = date(year, month + 1, 1) - timedelta(1) + lastday = last_day_of_month + timedelta(6 - last_day_of_month.weekday()) month_dates = list(date_range(firstday, lastday)) dates = {} - users = [] task_max = 0 for row in xrange(self.rset.rowcount): - task = self.rset.get_entity(row,0) - if len(self.rset[row]) > 1 and self.rset.description[row][1] == 'EUser': - user = self.rset.get_entity(row,1) + task = self.rset.get_entity(row, 0) + if len(self.rset[row]) > 1 and self.rset.description[row][1] == 'CWUser': + user = self.rset.get_entity(row, 1) else: user = None the_dates = [] - if task.start: - if task.start > lastday: - continue - the_dates = [task.start] - if task.stop: - if task.stop < firstday: + tstart = task.start + if tstart: + tstart = todate(task.start) + if tstart > lastday: continue - the_dates = [task.stop] - if task.start and task.stop: - if task.start.absdate == task.stop.absdate: - date = task.start - if firstday<= date <= lastday: - the_dates = [date] + the_dates = [tstart] + tstop = task.stop + if tstop: + tstop = todate(tstop) + if tstop < firstday: + continue + the_dates = [tstop] + if tstart and tstop: + if tstart.isocalendar() == tstop.isocalendar(): + if firstday <= tstart <= lastday: + the_dates = [tstart] else: - the_dates = date_range(max(task.start,firstday), - min(task.stop,lastday)) + the_dates = date_range(max(tstart, firstday), + min(tstop, lastday)) if not the_dates: continue - + for d in the_dates: d_tasks = dates.setdefault((d.year, d.month, d.day), {}) - t_users = d_tasks.setdefault(task,set()) + t_users = d_tasks.setdefault(task, set()) t_users.add( user ) - if len(d_tasks)>task_max: + if len(d_tasks) > task_max: task_max = len(d_tasks) days = [] - nrows = max(3,task_max) + nrows = max(3, task_max) # colors here are class names defined in cubicweb.css - colors = [ "col%x"%i for i in range(12) ] + colors = [ "col%x" % i for i in range(12) ] next_color_index = 0 visited_tasks = {} # holds a description of a task task_colors = {} # remember a color assigned to a task - for date in month_dates: - d_tasks = dates.get((date.year, date.month, date.day), {}) + for mdate in month_dates: + d_tasks = dates.get((mdate.year, mdate.month, mdate.day), {}) rows = [None] * nrows # every task that is "visited" for the first time # require a special treatment, so we put them in @@ -232,7 +217,7 @@ # to every 'new' task we must affect a color # (which must be the same for every user concerned # by the task) - for i,t in enumerate(rows): + for i, t in enumerate(rows): if t is None: if task in task_colors: color = task_colors[task] @@ -262,43 +247,45 @@ # output header self.w(u'%s%s%s%s%s%s%s' % tuple(self.req._(day) for day in WEEKDAYS)) - + # build calendar - for date, task_rows in zip(month_dates, days): - if date.day_of_week == 0: + for mdate, task_rows in zip(month_dates, days): + if mdate.weekday() == 0: self.w(u'') - self._build_calendar_cell(date, task_rows, curdate) - if date.day_of_week == 6: + self._build_calendar_cell(mdate, task_rows, curdate) + if mdate.weekday() == 6: self.w(u'') self.w(u'

') def _prevnext_links(self, curdate): - prevdate = curdate - RelativeDateTime(months=1) - nextdate = curdate + RelativeDateTime(months=1) - rql = self.rset.rql - prevlink = ajax_replace_url('onemonthcalid', rql, 'onemonthcal', - year=prevdate.year, month=prevdate.month) - nextlink = ajax_replace_url('onemonthcalid', rql, 'onemonthcal', - year=nextdate.year, month=nextdate.month) + prevdate = curdate - timedelta(31) + nextdate = curdate + timedelta(31) + rql = self.rset.printable_rql() + prevlink = self.req.build_ajax_replace_url('onemonthcalid', rql, 'onemonthcal', + year=prevdate.year, + month=prevdate.month) + nextlink = self.req.build_ajax_replace_url('onemonthcalid', rql, 'onemonthcal', + year=nextdate.year, + month=nextdate.month) return prevlink, nextlink - def _build_calendar_cell(self, date, rows, curdate): + def _build_calendar_cell(self, celldate, rows, curdate): curmonth = curdate.month classes = "" - if date.month != curmonth: + if celldate.month != curmonth: classes += " outOfRange" - if date == today(): + if celldate == date.today(): classes += " today" self.w(u'' % classes) self.w(u'

' % classes) - self.w(u'

' % date.day) - + self.w(u'

' % celldate.day) + if len(self.rset.column_types(0)) == 1: etype = list(self.rset.column_types(0))[0] url = self.build_url(vid='creation', etype=etype, schedule=True, - start=self.format_date(date), stop=self.format_date(date), - __redirectrql=self.rset.rql, + start=self.format_date(celldate), stop=self.format_date(celldate), + __redirectrql=self.rset.printable_rql(), __redirectparams=self.req.build_url_params(year=curdate.year, month=curmonth), __redirectvid=self.id ) @@ -312,7 +299,7 @@ self.w(u'

' % task_descr.color) task.view('calendaritem', w=self.w ) url = task.absolute_url(vid='edition', - __redirectrql=self.rset.rql, + __redirectrql=self.rset.printable_rql(), __redirectparams=self.req.build_url_params(year=curdate.year, month=curmonth), __redirectvid=self.id ) @@ -330,19 +317,16 @@ class OneWeekCal(EntityView): """At some point, this view will probably replace ampm calendars""" - __registerer__ = priority_registerer - __selectors__ = (implement_interface, ) - accepts_interfaces = (ICalendarable,) + id = 'oneweekcal' + __select__ = implements(ICalendarable) need_navigation = False - id = 'oneweekcal' title = _('one week') - + def call(self): self.req.add_js( ('cubicweb.ajax.js', 'cubicweb.calendar.js') ) self.req.add_css('cubicweb.calendar.css') - # XXX: restrict courses directy with RQL - _today = today() - + # XXX: restrict directly with RQL + _today = datetime.today() if 'year' in self.req.form: year = int(self.req.form['year']) else: @@ -350,47 +334,50 @@ if 'week' in self.req.form: week = int(self.req.form['week']) else: - week = _today.iso_week[1] - - first_day_of_week = ISO.ParseWeek("%s-W%s-1"%(year, week)) - lastday = first_day_of_week + RelativeDateTime(days=6) - firstday= first_day_of_week + week = _today.isocalendar()[1] + # week - 1 since we get week number > 0 while we want it to start from 0 + first_day_of_week = todate(strptime('%s-%s-1' % (year, week - 1), '%Y-%U-%w')) + lastday = first_day_of_week + timedelta(6) + firstday = first_day_of_week dates = [[] for i in range(7)] - task_max = 0 task_colors = {} # remember a color assigned to a task # colors here are class names defined in cubicweb.css - colors = [ "col%x"%i for i in range(12) ] + colors = [ "col%x" % i for i in range(12) ] next_color_index = 0 done_tasks = [] for row in xrange(self.rset.rowcount): - task = self.rset.get_entity(row,0) + task = self.rset.get_entity(row, 0) if task in done_tasks: continue done_tasks.append(task) the_dates = [] - if task.start: - if task.start > lastday: + tstart = task.start + tstop = task.stop + if tstart: + tstart = todate(tstart) + if tstart > lastday: continue - the_dates = [task.start] - if task.stop: - if task.stop < firstday: + the_dates = [tstart] + if tstop: + tstop = todate(tstop) + if tstop < firstday: continue - the_dates = [task.stop] - if task.start and task.stop: - the_dates = date_range(max(task.start,firstday), - min(task.stop,lastday)) + the_dates = [tstop] + if tstart and tstop: + the_dates = date_range(max(tstart, firstday), + min(tstop, lastday)) if not the_dates: continue - + if task not in task_colors: task_colors[task] = colors[next_color_index] - next_color_index = (next_color_index+1)%len(colors) - + next_color_index = (next_color_index+1) % len(colors) + for d in the_dates: - day = d.day_of_week - task_descr = _TaskEntry(task, task_colors[task]) + day = d.weekday() + task_descr = _TaskEntry(task, task_colors[task]) dates[day].append(task_descr) - + self.w(u'

') # build schedule self.w(u'') @@ -399,22 +386,21 @@ self.w(u'' u'' % (html_escape(prevlink), first_day_of_week.year, - self.req._(u'week'), first_day_of_week.iso_week[1], + self.req._(u'week'), first_day_of_week.isocalendar()[1], html_escape(nextlink))) # output header self.w(u'') self.w(u'') # column for hours - _today = today() + _today = date.today() for i, day in enumerate(WEEKDAYS): - date = first_day_of_week + i - if date.absdate == _today.absdate: - self.w(u'' % (self.req._(day), self.format_date(date))) + wdate = first_day_of_week + timedelta(i) + if wdate.isocalendar() == _today.isocalendar(): + self.w(u'' % (self.req._(day), self.format_date(wdate))) else: - self.w(u'' % (self.req._(day), self.format_date(date))) + self.w(u'' % (self.req._(day), self.format_date(wdate))) self.w(u'') - # build week calendar self.w(u'') self.w(u'') - + for i, day in enumerate(WEEKDAYS): - date = first_day_of_week + i + wdate = first_day_of_week + timedelta(i) classes = "" - if date.absdate == _today.absdate: + if wdate.isocalendar() == _today.isocalendar(): classes = " today" - self.w(u'') self.w(u'') self.w(u'

<<	%s %s %s					>>
	%s %s	%s %s	%s %s	%s %s
') # column for hours @@ -422,52 +408,43 @@ for h in range(8, 20): self.w(u' '%extra) self.w(u'%02d:00'%h) - self.w(u' ') + self.w(u'') self.w(u'	'%(classes, day)) + self.w(u'	' % (classes, day)) if len(self.rset.column_types(0)) == 1: etype = list(self.rset.column_types(0))[0] url = self.build_url(vid='creation', etype=etype, schedule=True, - __redirectrql=self.rset.rql, + __redirectrql=self.rset.printable_rql(), __redirectparams=self.req.build_url_params(year=year, week=week), __redirectvid=self.id ) - extra = ' ondblclick="addCalendarItem(event, hmin=%s, hmax=%s, year=%s, month=%s, day=%s, duration=%s, baseurl=\'%s\')"' % (8,20,date.year, date.month, date.day, 2, html_escape(url)) + extra = ' ondblclick="addCalendarItem(event, hmin=8, hmax=20, year=%s, month=%s, day=%s, duration=2, baseurl=\'%s\')"' % ( + wdate.year, wdate.month, wdate.day, html_escape(url)) else: extra = "" self.w(u' '% extra) for h in range(8, 20): self.w(u' '%((h-7)*8)) - self.w(u' ') + self.w(u' ') if dates[i]: - self._build_calendar_cell(date, dates[i]) + self._build_calendar_cell(wdate, dates[i]) self.w(u'') self.w(u'

') self.w(u'

') - - def _one_day_task(self, task): - """ - Return true if the task is a "one day" task; ie it have a start and a stop the same day - """ - if task.start and task.stop: - if task.start.absdate == task.stop.absdate: - return True - return False - + def _build_calendar_cell(self, date, task_descrs): - inday_tasks = [t for t in task_descrs if self._one_day_task(t.task) and t.task.start.hour<20 and t.task.stop.hour>7] - wholeday_tasks = [t for t in task_descrs if not self._one_day_task(t.task)] - + inday_tasks = [t for t in task_descrs if t.is_one_day_task() and t.in_working_hours()] + wholeday_tasks = [t for t in task_descrs if not t.is_one_day_task()] inday_tasks.sort(key=lambda t:t.task.start) sorted_tasks = [] for i, t in enumerate(wholeday_tasks): @@ -498,15 +475,15 @@ stop_hour = 20 stop_min = 0 if task.start: - if date < task.start < date + 1: + if date < todate(task.start) < date + ONEDAY: start_hour = max(8, task.start.hour) start_min = task.start.minute if task.stop: - if date < task.stop < date + 1: + if date < todate(task.stop) < date + ONEDAY: stop_hour = min(20, task.stop.hour) if stop_hour < 20: stop_min = task.stop.minute - + height = 100.0*(stop_hour+stop_min/60.0-start_hour-start_min/60.0)/(20-8) top = 100.0*(start_hour+start_min/60.0-8)/(20-8) left = width*task_desc.index @@ -516,8 +493,8 @@ (task_desc.color, style)) task.view('calendaritem', dates=False, w=self.w) url = task.absolute_url(vid='edition', - __redirectrql=self.rset.rql, - __redirectparams=self.req.build_url_params(year=date.year, week=date.iso_week[1]), + __redirectrql=self.rset.printable_rql(), + __redirectparams=self.req.build_url_params(year=date.year, week=date.isocalendar()[1]), __redirectvid=self.id ) @@ -536,14 +513,16 @@ self.w(u'

') self.w(u'

') - + def _prevnext_links(self, curdate): - prevdate = curdate - RelativeDateTime(days=7) - nextdate = curdate + RelativeDateTime(days=7) - rql = self.rset.rql - prevlink = ajax_replace_url('oneweekcalid', rql, 'oneweekcal', - year=prevdate.year, week=prevdate.iso_week[1]) - nextlink = ajax_replace_url('oneweekcalid', rql, 'oneweekcal', - year=nextdate.year, week=nextdate.iso_week[1]) + prevdate = curdate - timedelta(7) + nextdate = curdate + timedelta(7) + rql = self.rset.printable_rql() + prevlink = self.req.build_ajax_replace_url('oneweekcalid', rql, 'oneweekcal', + year=prevdate.year, + week=prevdate.isocalendar()[1]) + nextlink = self.req.build_ajax_replace_url('oneweekcalid', rql, 'oneweekcal', + year=nextdate.year, + week=nextdate.isocalendar()[1]) return prevlink, nextlink diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/csvexport.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/csvexport.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,87 @@ +"""csv export views + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from cubicweb.common.uilib import UnicodeCSVWriter +from cubicweb.view import EntityView, AnyRsetView + +class CSVMixIn(object): + """mixin class for CSV views""" + templatable = False + content_type = "text/comma-separated-values" + binary = True # avoid unicode assertion + csv_params = {'dialect': 'excel', + 'quotechar': '"', + 'delimiter': ';', + 'lineterminator': '\n'} + + def set_request_content_type(self): + """overriden to set a .csv filename""" + self.req.set_content_type(self.content_type, filename='cubicwebexport.csv') + + def csvwriter(self, **kwargs): + params = self.csv_params.copy() + params.update(kwargs) + return UnicodeCSVWriter(self.w, self.req.encoding, **params) + + +class CSVRsetView(CSVMixIn, AnyRsetView): + """dumps raw result set in CSV""" + id = 'csvexport' + title = _('csv export') + + def call(self): + writer = self.csvwriter() + writer.writerow(self.columns_labels()) + rset, descr = self.rset, self.rset.description + eschema = self.schema.eschema + for rowindex, row in enumerate(rset): + csvrow = [] + for colindex, val in enumerate(row): + etype = descr[rowindex][colindex] + if val is not None and not eschema(etype).is_final(): + # csvrow.append(val) # val is eid in that case + content = self.view('textincontext', rset, + row=rowindex, col=colindex) + else: + content = self.view('final', rset, + displaytime=True, format='text/plain', + row=rowindex, col=colindex) + csvrow.append(content) + writer.writerow(csvrow) + + +class CSVEntityView(CSVMixIn, EntityView): + """dumps rset's entities (with full set of attributes) in CSV + + the generated CSV file will have a table per entity type found in the + resultset. ('table' here only means empty lines separation between table + contents) + """ + id = 'ecsvexport' + title = _('csv entities export') + + def call(self): + req = self.req + rows_by_type = {} + writer = self.csvwriter() + rowdef_by_type = {} + for index in xrange(len(self.rset)): + entity = self.complete_entity(index) + if entity.e_schema not in rows_by_type: + rowdef_by_type[entity.e_schema] = [rs for rs, at in entity.e_schema.attribute_definitions() + if at != 'Bytes'] + rows_by_type[entity.e_schema] = [[display_name(req, rschema.type) + for rschema in rowdef_by_type[entity.e_schema]]] + rows = rows_by_type[entity.e_schema] + rows.append([entity.printable_value(rs.type, format='text/plain') + for rs in rowdef_by_type[entity.e_schema]]) + for rows in rows_by_type.itervalues(): + writer.writerows(rows) + # use two empty lines as separator + writer.writerows([[], []]) + diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/cwproperties.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/cwproperties.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,343 @@ +"""Specific views for CWProperty + +:organization: Logilab +:copyright: 2007-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" +_ = unicode + +from logilab.mtconverter import html_escape + +from logilab.common.decorators import cached + +from cubicweb import UnknownProperty +from cubicweb.selectors import (one_line_rset, none_rset, implements, + match_user_groups) +from cubicweb.view import StartupView +from cubicweb.web import uicfg, stdmsgs +from cubicweb.web.form import CompositeForm, EntityFieldsForm, FormViewMixIn +from cubicweb.web.formfields import FIELDS, StringField +from cubicweb.web.formwidgets import Select, Button, SubmitButton +from cubicweb.web.views import primary + + +# some string we want to be internationalizable for nicer display of eproperty +# groups +_('navigation') +_('ui') +_('actions') +_('boxes') +_('components') +_('contentnavigation') +_('navigation.combobox-limit') +_('navigation.page-size') +_('navigation.related-limit') +_('navigation.short-line-size') +_('ui.date-format') +_('ui.datetime-format') +_('ui.default-text-format') +_('ui.fckeditor') +_('ui.float-format') +_('ui.language') +_('ui.time-format') +_('open all') +_('ui.main-template') +_('ui.site-title') +_('ui.encoding') +_('category') + + +def make_togglable_link(nodeid, label, cookiename): + """builds a HTML link that switches the visibility & remembers it""" + action = u"javascript: toggleVisibility('%s', '%s')" % \ + (nodeid, cookiename) + return u'%s' % (action, label) + +def css_class(someclass): + return someclass and 'class="%s"' % someclass or '' + + +class CWPropertyPrimaryView(primary.PrimaryView): + __select__ = implements('CWProperty') + skip_none = False + + +class SystemEPropertiesForm(FormViewMixIn, StartupView): + id = 'systemepropertiesform' + __select__ = none_rset() & match_user_groups('managers') + + title = _('site configuration') + category = 'startupview' + + def linkable(self): + return True + + def url(self): + """return the url associated with this view. We can omit rql here""" + return self.build_url('view', vid=self.id) + + def _cookie_name(self, somestr): + return str('%s_property_%s' % (self.config.appid, somestr)) + + def _group_status(self, group, default=u'hidden'): + """return css class name 'hidden' (collapsed), or '' (open)""" + cookies = self.req.get_cookie() + cookiename = self._cookie_name(group) + cookie = cookies.get(cookiename) + if cookie is None: + cookies[cookiename] = default + self.req.set_cookie(cookies, cookiename, maxage=None) + status = default + else: + status = cookie.value + return status + + def call(self, **kwargs): + """The default view representing the application's index""" + self.req.add_js('cubicweb.preferences.js') + self.req.add_css('cubicweb.preferences.css') + vreg = self.vreg + values = self.defined_keys + groupedopts = {} + mainopts = {} + # "self.id=='systemepropertiesform'" to skip site wide properties on + # user's preference but not site's configuration + for key in vreg.user_property_keys(self.id=='systemepropertiesform'): + parts = key.split('.') + if parts[0] in vreg: + # appobject configuration + reg, oid, propid = parts + groupedopts.setdefault(reg, {}).setdefault(oid, []).append(key) + else: + mainopts.setdefault(parts[0], []).append(key) + # precompute form to consume error message + for group, keys in mainopts.items(): + mainopts[group] = self.form(keys, True) + for group, objects in groupedopts.items(): + for oid, keys in objects.items(): + groupedopts[group][oid] = self.form(keys, True) + w = self.w + req = self.req + _ = req._ + w(u'

%s

\n' % _(self.title)) + # we don't want this in each sub-forms + w(u'

' % self.req._('validating...')) + for label, group, form in sorted((_(g), g, f) + for g, f in mainopts.iteritems()): + status = css_class(self._group_status(group)) + w(u'

%s

\n' % + (make_togglable_link('fieldset_' + group, label, + self._cookie_name(group)))) + w(u'

' % (group, status)) + w(form) + w(u'

') + for label, group, objects in sorted((_(g), g, o) + for g, o in groupedopts.iteritems()): + status = css_class(self._group_status(group)) + w(u'

%s

\n' % + (make_togglable_link('fieldset_' + group, label, + self._cookie_name(group)))) + w(u'

' % (group, status)) + for label, oid, form in sorted((self.req.__('%s_%s' % (group, o)), o, f) + for o, f in objects.iteritems()): + w(u'

') + w(u'%s\n' % label) + docmsgid = '%s_%s_description' % (group, oid) + doc = _(docmsgid) + if doc != docmsgid: + w(u'

' % html_escape(doc)) + w(form) + w(u'

') + w(u'

') + + @property + @cached + def eprops_rset(self): + return self.req.execute('Any P,K,V WHERE P is CWProperty, P pkey K, ' + 'P value V, NOT P for_user U') + + @property + def defined_keys(self): + values = {} + for i, entity in enumerate(self.eprops_rset.entities()): + values[entity.pkey] = i + return values + + def entity_for_key(self, key): + values = self.defined_keys + if key in values: + entity = self.eprops_rset.get_entity(values[key], 0) + else: + entity = self.vreg.etype_class('CWProperty')(self.req, None, None) + entity.eid = self.req.varmaker.next() + entity['pkey'] = key + entity['value'] = self.vreg.property_value(key) + return entity + + def form(self, keys, splitlabel=False): + buttons = [SubmitButton(), + Button(stdmsgs.BUTTON_CANCEL, cwaction='cancel')] + form = CompositeForm(self.req, domid=None, action=self.build_url(), + form_buttons=buttons, + submitmsg=self.req._('changes applied')) + path = self.req.relative_path() + if '?' in path: + path, params = path.split('?', 1) + form.form_add_hidden('__redirectparams', params) + form.form_add_hidden('__redirectpath', path) + for key in keys: + self.form_row(form, key, splitlabel) + return form.form_render(display_progress_div=False) + + def form_row(self, form, key, splitlabel): + entity = self.entity_for_key(key) + if splitlabel: + label = key.split('.')[-1] + else: + label = key + subform = EntityFieldsForm(self.req, entity=entity, set_error_url=False) + subform.append_field(PropertyValueField(name='value', label=label, + eidparam=True)) + subform.vreg = self.vreg + subform.form_add_hidden('pkey', key, eidparam=True) + form.form_add_subform(subform) + return subform + + +def is_user_prefs(cls, req, rset, row=None, col=0, **kwargs): + return req.user.eid == rset[row or 0][col] + + +class EPropertiesForm(SystemEPropertiesForm): + id = 'epropertiesform' + __select__ = ( + # we don't want guests to be able to come here + match_user_groups('users', 'managers') & + (none_rset() | ((one_line_rset() & is_user_prefs) & + (one_line_rset() & match_user_groups('managers')))) + ) + + title = _('preferences') + + @property + def user(self): + if self.rset is None: + return self.req.user + return self.rset.get_entity(self.row or 0, self.col or 0) + + @property + @cached + def eprops_rset(self): + return self.req.execute('Any P,K,V WHERE P is CWProperty, P pkey K, P value V,' + 'P for_user U, U eid %(x)s', {'x': self.user.eid}) + + def form_row(self, form, key, splitlabel): + subform = super(EPropertiesForm, self).form_row(form, key, splitlabel) + # if user is in the managers group and the property is being created, + # we have to set for_user explicitly + if not subform.edited_entity.has_eid() and self.user.matching_groups('managers'): + subform.form_add_hidden('for_user', self.user.eid, eidparam=True) + + +# eproperty form objects ###################################################### + +class PlaceHolderWidget(object): + + def render(self, form, field): + domid = form.context[field]['id'] + # empty span as well else html validation fail (label is refering to + # this id) + return '

' % ( + domid, domid, form.req._('select a key first')) + + +class NotEditableWidget(object): + def __init__(self, value, msg=None): + self.value = value + self.msg = msg + + def render(self, form, field): + domid = form.context[field]['id'] + value = '%s' % (domid, self.value) + if self.msg: + value + '

' % self.msg + return value + + +class PropertyKeyField(StringField): + """specific field for CWProperty.pkey to set the value widget according to + the selected key + """ + widget = Select + + def render(self, form, renderer): + wdg = self.get_widget(form) + wdg.attrs['tabindex'] = form.req.next_tabindex() + wdg.attrs['onchange'] = "javascript:setPropValueWidget('%s', %s)" % ( + form.edited_entity.eid, form.req.next_tabindex()) + return wdg.render(form, self) + + def vocabulary(self, form): + entity = form.edited_entity + _ = form.req._ + if entity.has_eid(): + return [(_(entity.pkey), entity.pkey)] + # key beginning with 'system.' should usually not be edited by hand + choices = entity.vreg.user_property_keys() + return [(u'', u'')] + sorted(zip((_(v) for v in choices), choices)) + + +class PropertyValueField(StringField): + """specific field for CWProperty.value which will be different according to + the selected key type and vocabulary information + """ + widget = PlaceHolderWidget + + def render(self, form, renderer=None, tabindex=None): + wdg = self.get_widget(form) + if tabindex is not None: + wdg.attrs['tabindex'] = tabindex + return wdg.render(form, self) + + def form_init(self, form): + entity = form.edited_entity + if not (entity.has_eid() or 'pkey' in entity): + # no key set yet, just include an empty div which will be filled + # on key selection + return + try: + pdef = form.vreg.property_info(entity.pkey) + except UnknownProperty, ex: + self.warning('%s (you should probably delete that property ' + 'from the database)', ex) + msg = form.req._('you should probably delete that property') + self.widget = NotEditableWidget(entity.printable_value('value'), + '%s (%s)' % (msg, ex)) + if entity.pkey.startswith('system.'): + msg = form.req._('value associated to this key is not editable ' + 'manually') + self.widget = NotEditableWidget(entity.printable_value('value'), msg) + # XXX race condition when used from CWPropertyForm, should not rely on + # instance attributes + self.initial = pdef['default'] + self.help = pdef['help'] + vocab = pdef['vocabulary'] + if vocab is not None: + if callable(vocab): + # list() just in case its a generator function + self.choices = list(vocab(form.req)) + else: + self.choices = vocab + wdg = Select() + else: + wdg = FIELDS[pdef['type']].widget() + if pdef['type'] == 'Boolean': + self.choices = [(form.req._('yes'), '1'), (form.req._('no'), '')] + elif pdef['type'] in ('Float', 'Int'): + wdg.attrs.setdefault('size', 3) + self.widget = wdg + + +uicfg.autoform_field.tag_attribute(('CWProperty', 'pkey'), PropertyKeyField) +uicfg.autoform_field.tag_attribute(('CWProperty', 'value'), PropertyValueField) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/cwuser.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/cwuser.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,64 @@ +"""Specific views for users + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from logilab.mtconverter import html_escape + +from cubicweb.selectors import one_line_rset, implements, match_user_groups +from cubicweb.view import EntityView +from cubicweb.web import action +from cubicweb.web.views import primary + + +class UserPreferencesEntityAction(action.Action): + id = 'prefs' + __select__ = (one_line_rset() & implements('CWUser') & + match_user_groups('owners', 'managers')) + + title = _('preferences') + category = 'mainactions' + + def url(self): + login = self.rset.get_entity(self.row or 0, self.col or 0).login + return self.build_url('cwuser/%s'%login, vid='epropertiesform') + + +class FoafView(EntityView): + id = 'foaf' + __select__ = implements('CWUser') + + title = _('foaf') + templatable = False + content_type = 'text/xml' + + def call(self): + self.w(u''' + '''% self.req.encoding) + for i in xrange(self.rset.rowcount): + self.cell_call(i, 0) + self.w(u'\n') + + def cell_call(self, row, col): + entity = self.complete_entity(row, col) + self.w(u''' + + + ''' % (entity.absolute_url(), entity.absolute_url())) + self.w(u'\n' % entity.eid) + self.w(u'%s\n' % html_escape(entity.dc_long_title())) + if entity.surname: + self.w(u'%s\n' + % html_escape(entity.surname)) + if entity.firstname: + self.w(u'%s\n' + % html_escape(entity.firstname)) + emailaddr = entity.get_email() + if emailaddr: + self.w(u'%s\n' % html_escape(emailaddr)) + self.w(u'\n') diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/debug.py --- a/web/views/debug.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/debug.py Thu May 14 12:48:11 2009 +0200 @@ -2,7 +2,7 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -11,7 +11,8 @@ from logilab.mtconverter import html_escape -from cubicweb.common.view import StartupView +from cubicweb.selectors import none_rset, match_user_groups +from cubicweb.view import StartupView def dict_to_html(w, dict): # XHTML doesn't allow emtpy

%s: %s

') - + + class DebugView(StartupView): id = 'debug' + __select__ = none_rset() & match_user_groups('managers') title = _('server debug information') - require_groups = ('managers',) def call(self, **kwargs): """display server information""" diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/dynimages.py --- a/web/views/dynimages.py Tue May 05 17:18:49 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,198 +0,0 @@ -"""dynamically generated image views - -:organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. -:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr -""" -__docformat__ = "restructuredtext en" - -import os -from tempfile import mktemp -from itertools import cycle - -from logilab.common.graph import escape, GraphGenerator, DotBackend -from yams import schema2dot as s2d - -from cubicweb.common.view import EntityView, StartupView - - -class RestrictedSchemaDotPropsHandler(s2d.SchemaDotPropsHandler): - def __init__(self, req): - # FIXME: colors are arbitrary - self.nextcolor = cycle( ('#aa0000', '#00aa00', '#0000aa', - '#000000', '#888888') ).next - self.req = req - - def display_attr(self, rschema): - return not rschema.meta and (rschema.has_local_role('read') - or rschema.has_perm(self.req, 'read')) - - # XXX remove this method once yams > 0.20 is out - def node_properties(self, eschema): - """return default DOT drawing options for an entity schema""" - label = ['{',eschema.type,'|'] - label.append(r'\l'.join(rel.type for rel in eschema.subject_relations() - if rel.final and self.display_attr(rel))) - label.append(r'\l}') # trailing \l ensure alignement of the last one - return {'label' : ''.join(label), 'shape' : "record", - 'fontname' : "Courier", 'style' : "filled"} - - def edge_properties(self, rschema, subjnode, objnode): - kwargs = super(RestrictedSchemaDotPropsHandler, self).edge_properties(rschema, subjnode, objnode) - # symetric rels are handled differently, let yams decide what's best - if not rschema.symetric: - kwargs['color'] = self.nextcolor() - kwargs['fontcolor'] = kwargs['color'] - # dot label decoration is just awful (1 line underlining the label - # + 1 line going to the closest edge spline point) - kwargs['decorate'] = 'false' - return kwargs - - -class RestrictedSchemaVisitorMiIn: - def __init__(self, req, *args, **kwargs): - # hack hack hack - assert len(self.__class__.__bases__) == 2 - self.__parent = self.__class__.__bases__[1] - self.__parent.__init__(self, *args, **kwargs) - self.req = req - - def nodes(self): - for etype, eschema in self.__parent.nodes(self): - if eschema.has_local_role('read') or eschema.has_perm(self.req, 'read'): - yield eschema.type, eschema - - def edges(self): - for setype, oetype, rschema in self.__parent.edges(self): - if rschema.has_local_role('read') or rschema.has_perm(self.req, 'read'): - yield setype, oetype, rschema - -class FullSchemaVisitor(RestrictedSchemaVisitorMiIn, s2d.FullSchemaVisitor): - pass - -class OneHopESchemaVisitor(RestrictedSchemaVisitorMiIn, s2d.OneHopESchemaVisitor): - pass - -class OneHopRSchemaVisitor(RestrictedSchemaVisitorMiIn, s2d.OneHopRSchemaVisitor): - pass - - -class TmpFileViewMixin(object): - binary = True - content_type = 'application/octet-stream' - cache_max_age = 60*60*2 # stay in http cache for 2 hours by default - - def call(self): - self.cell_call() - - def cell_call(self, row=0, col=0): - self.row, self.col = row, col # in case one need it - tmpfile = mktemp('.png') - try: - self._generate(tmpfile) - self.w(open(tmpfile).read()) - finally: - os.unlink(tmpfile) - -class SchemaImageView(TmpFileViewMixin, StartupView): - id = 'schemagraph' - content_type = 'image/png' - skip_rels = ('owned_by', 'created_by', 'identity', 'is', 'is_instance_of') - def _generate(self, tmpfile): - """display global schema information""" - skipmeta = not int(self.req.form.get('withmeta', 0)) - visitor = FullSchemaVisitor(self.req, self.schema, skiprels=self.skip_rels, skipmeta=skipmeta) - s2d.schema2dot(outputfile=tmpfile, visitor=visitor, - prophdlr=RestrictedSchemaDotPropsHandler(self.req)) - -class EETypeSchemaImageView(TmpFileViewMixin, EntityView): - id = 'eschemagraph' - content_type = 'image/png' - accepts = ('EEType',) - skip_rels = ('owned_by', 'created_by', 'identity', 'is', 'is_instance_of') - - def _generate(self, tmpfile): - """display schema information for an entity""" - entity = self.entity(self.row, self.col) - eschema = self.vreg.schema.eschema(entity.name) - visitor = OneHopESchemaVisitor(self.req, eschema, skiprels=self.skip_rels) - s2d.schema2dot(outputfile=tmpfile, visitor=visitor, - prophdlr=RestrictedSchemaDotPropsHandler(self.req)) - -class ERTypeSchemaImageView(EETypeSchemaImageView): - accepts = ('ERType',) - - def _generate(self, tmpfile): - """display schema information for an entity""" - entity = self.entity(self.row, self.col) - rschema = self.vreg.schema.rschema(entity.name) - visitor = OneHopRSchemaVisitor(self.req, rschema) - s2d.schema2dot(outputfile=tmpfile, visitor=visitor, - prophdlr=RestrictedSchemaDotPropsHandler(self.req)) - - - -class WorkflowDotPropsHandler(object): - def __init__(self, req): - self._ = req._ - - def node_properties(self, stateortransition): - """return default DOT drawing options for a state or transition""" - props = {'label': stateortransition.name, - 'fontname': 'Courier'} - if hasattr(stateortransition, 'state_of'): - props['shape'] = 'box' - props['style'] = 'filled' - if stateortransition.reverse_initial_state: - props['color'] = '#88CC88' - else: - props['shape'] = 'ellipse' - descr = [] - tr = stateortransition - if tr.require_group: - descr.append('%s %s'% ( - self._('groups:'), - ','.join(g.name for g in tr.require_group))) - if tr.condition: - descr.append('%s %s'% (self._('condition:'), tr.condition)) - if descr: - props['label'] += escape('\n'.join(descr)) - return props - - def edge_properties(self, transition, fromstate, tostate): - return {'label': '', 'dir': 'forward', - 'color': 'black', 'style': 'filled'} - -class WorkflowVisitor: - def __init__(self, entity): - self.entity = entity - - def nodes(self): - for state in self.entity.reverse_state_of: - state.complete() - yield state.eid, state - - for transition in self.entity.reverse_transition_of: - transition.complete() - yield transition.eid, transition - - def edges(self): - for transition in self.entity.reverse_transition_of: - for incomingstate in transition.reverse_allowed_transition: - yield incomingstate.eid, transition.eid, transition - yield transition.eid, transition.destination().eid, transition - - -class EETypeWorkflowImageView(TmpFileViewMixin, EntityView): - id = 'ewfgraph' - content_type = 'image/png' - accepts = ('EEType',) - - def _generate(self, tmpfile): - """display schema information for an entity""" - entity = self.entity(self.row, self.col) - visitor = WorkflowVisitor(entity) - prophdlr = WorkflowDotPropsHandler(self.req) - generator = GraphGenerator(DotBackend('workflow', 'LR', - ratio='compress', size='30,12')) - return generator.generate(visitor, prophdlr, tmpfile) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/edit_multiple.pt --- a/web/views/edit_multiple.pt Tue May 05 17:18:49 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,38 +0,0 @@ - -

validating changes...

- - - - - - - - - - -

	- -

- - - - -

- - -

- diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/edit_relations.pt --- a/web/views/edit_relations.pt Tue May 05 17:18:49 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -

-relations - - - - - - - - - - - - - - - - - -

relation name	- - - [del it if you can] - related entity view - - - -
relation name	- [x] - entity\'s text_view -

- - -	-

diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/editcontroller.py --- a/web/views/editcontroller.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/editcontroller.py Thu May 14 12:48:11 2009 +0200 @@ -1,7 +1,7 @@ """The edit controller, handling form submitting. :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -26,17 +26,14 @@ def publish(self, rset=None, fromjson=False): """edit / create / copy / delete entity / relations""" self.fromjson = fromjson - req = self.req - form = req.form - for key in form: + for key in self.req.form: # There should be 0 or 1 action if key.startswith('__action_'): cbname = key[1:] try: callback = getattr(self, cbname) except AttributeError: - raise ValidationError(None, - {None: req._('invalid action %r' % key)}) + raise RequestError(self.req._('invalid action %r' % key)) else: return callback() self._default_publish() @@ -68,7 +65,7 @@ if self._pending_relations: for rschema, formparams, x, entity in self._pending_relations: self.handle_relation(rschema, formparams, x, entity, True) - + # XXX this processes *all* pending operations of *all* entities if form.has_key('__delete'): todelete += req.list_form_param('__delete', form, pop=True) @@ -79,7 +76,7 @@ if toinsert: self.insert_relations(parse_relations_descr(toinsert)) self.req.remove_pending_operations() - + def edit_entity(self, formparams, multiple=False): """edit / create / copy an entity and return its eid""" etype = formparams['__type'] @@ -87,7 +84,7 @@ entity.eid = eid = self._get_eid(formparams['eid']) edited = self.req.form.get('__maineid') == formparams['eid'] # let a chance to do some entity specific stuff. - entity.pre_web_edit() + entity.pre_web_edit() # create a rql query from parameters self.relations = [] self.restrictions = [] @@ -102,14 +99,14 @@ self.handle_inlined_relation(rschema, formparams, entity) execute = self.req.execute if eid is None: # creation or copy - if self.relations: + if self.relations: rql = 'INSERT %s X: %s' % (etype, ','.join(self.relations)) else: rql = 'INSERT %s X' % etype if self.restrictions: rql += ' WHERE %s' % ','.join(self.restrictions) try: - # get the new entity (in some cases, the type might have + # get the new entity (in some cases, the type might have # changed as for the File --> Image mutation) entity = execute(rql, formparams).get_entity(0, 0) eid = entity.eid @@ -155,7 +152,7 @@ def _action_apply(self): self._default_publish() self.reset() - + def _action_cancel(self): errorurl = self.req.form.get('__errorurl') if errorurl: @@ -175,7 +172,7 @@ if entity.has_eid() and (formparams.get(editkey) or None) == value: return False, None # not modified if value == INTERNAL_FIELD_VALUE: - value = None + value = None return True, value def handle_attribute(self, entity, rschema, formparams): @@ -199,27 +196,33 @@ value = Decimal(value) elif attrtype == 'Bytes': # if it is a file, transport it using a Binary (StringIO) - if formparams.has_key('__%s_detach' % attr): + # XXX later __detach is for the new widget system, the former is to + # be removed once web/widgets.py has been dropped + if formparams.has_key('__%s_detach' % attr) or formparams.has_key('%s__detach' % attr): # drop current file value value = None - # no need to check value when nor explicit detach nor new file submitted, - # since it will think the attribut is not modified + # no need to check value when nor explicit detach nor new file + # submitted, since it will think the attribute is not modified elif isinstance(value, unicode): # file modified using a text widget - value = Binary(value.encode(entity.text_encoding(attr))) - else: - # (filename, mimetype, stream) + encoding = entity.attr_metadata(attr, 'encoding') + value = Binary(value.encode(encoding)) + elif value: + # value is a 3-uple (filename, mimetype, stream) val = Binary(value[2].read()) if not val.getvalue(): # usually an unexistant file value = None else: + val.filename = value[0] + # ignore browser submitted MIME type since it may be buggy + # XXX add a config option to tell if we should consider it + # or not? + #if entity.e_schema.has_metadata(attr, 'format'): + # key = '%s_format' % attr + # formparams[key] = value[1] + # self.relations.append('X %s_format %%(%s)s' + # % (attr, key)) # XXX suppose a File compatible schema - val.filename = value[0] - if entity.has_format(attr): - key = '%s_format' % attr - formparams[key] = value[1] - self.relations.append('X %s_format %%(%s)s' - % (attr, key)) if entity.e_schema.has_subject_relation('name') \ and not formparams.get('name'): formparams['name'] = value[0] @@ -281,7 +284,7 @@ self.restrictions.append('%s eid %%(%s)s' % (attr.upper(), attr)) elif entity.has_eid(): self.handle_relation(rschema, formparams, 'subject', entity, late) - + def handle_relation(self, rschema, formparams, x, entity, late=False): """handle edition for the (rschema, x) relation of the given entity """ @@ -305,15 +308,17 @@ if x == 'object' or not rschema.inlined or not values: # this is not an inlined relation or no values specified, # explicty remove relations + rql = 'DELETE %s %s %s WHERE X eid %%(x)s, Y eid %%(y)s' % ( + subjvar, rschema, objvar) for reid in origvalues.difference(values): - rql = 'DELETE %s %s %s WHERE X eid %%(x)s, Y eid %%(y)s' % ( - subjvar, rschema, objvar) self.req.execute(rql, {'x': eid, 'y': reid}, ('x', 'y')) - rql = 'SET %s %s %s WHERE X eid %%(x)s, Y eid %%(y)s' % ( - subjvar, rschema, objvar) - for reid in values.difference(origvalues): - self.req.execute(rql, {'x': eid, 'y': reid}, ('x', 'y')) - + seteids = values.difference(origvalues) + if seteids: + rql = 'SET %s %s %s WHERE X eid %%(x)s, Y eid %%(y)s' % ( + subjvar, rschema, objvar) + for reid in seteids: + self.req.execute(rql, {'x': eid, 'y': reid}, ('x', 'y')) + def _get_eid(self, eid): # should be either an int (existant entity) or a variable (to be # created entity) @@ -343,5 +348,5 @@ raise Exception('duh') result.add(eid) return result - + diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/editforms.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/editforms.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,404 @@ +"""Set of HTML automatic forms to create, delete, copy or edit a single entity +or a list of entities of the same type + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from copy import copy + +from simplejson import dumps + +from logilab.mtconverter import html_escape + +from cubicweb.selectors import (match_kwargs, one_line_rset, non_final_entity, + specified_etype_implements, yes) +from cubicweb.utils import make_uid +from cubicweb.view import EntityView +from cubicweb.common import tags +from cubicweb.web import INTERNAL_FIELD_VALUE, stdmsgs, eid_param +from cubicweb.web.form import CompositeForm, EntityFieldsForm, FormViewMixIn +from cubicweb.web.formfields import RelationField +from cubicweb.web.formwidgets import Button, SubmitButton, ResetButton, Select +from cubicweb.web.formrenderers import (FormRenderer, EntityFormRenderer, + EntityCompositeFormRenderer, + EntityInlinedFormRenderer) + +_ = unicode + +def relation_id(eid, rtype, role, reid): + """return an identifier for a relation between two entities""" + if role == 'subject': + return u'%s:%s:%s' % (eid, rtype, reid) + return u'%s:%s:%s' % (reid, rtype, eid) + +def toggleable_relation_link(eid, nodeid, label='x'): + """return javascript snippet to delete/undelete a relation between two + entities + """ + js = u"javascript: togglePendingDelete('%s', %s);" % ( + nodeid, html_escape(dumps(eid))) + return u'[%s]' % ( + js, nodeid, label) + + +class DeleteConfForm(FormViewMixIn, EntityView): + """form used to confirm deletion of some entities""" + id = 'deleteconf' + title = _('delete') + # don't use navigation, all entities asked to be deleted should be displayed + # else we will only delete the displayed page + need_navigation = False + + def call(self): + """ask for confirmation before real deletion""" + req, w = self.req, self.w + _ = req._ + w(u'\n' + % _('this action is not reversible!')) + # XXX above message should have style of a warning + w(u'

%s

\n' % _('Do you want to delete the following element(s) ?')) + form = CompositeForm(req, domid='deleteconf', copy_nav_params=True, + action=self.build_url('edit'), onsubmit=None, + form_buttons=[Button(stdmsgs.YES, cwaction='delete'), + Button(stdmsgs.NO, cwaction='cancel')]) + done = set() + w(u'

\n') + w(form.form_render()) + + +class ClickAndEditFormView(FormViewMixIn, EntityView): + """form used to permit ajax edition of an attribute of an entity in a view + + (double-click on the field to see an appropriate edition widget) + """ + id = 'reledit' + __select__ = non_final_entity() & match_kwargs('rtype') + + # FIXME editableField class could be toggleable from userprefs + + onsubmit = ("return inlineValidateAttributeForm('%(divid)s-form', '%(rtype)s', " + "'%(eid)s', '%(divid)s', %(reload)s, '%(default)s');") + ondblclick = "showInlineEditionForm(%(eid)s, '%(rtype)s', '%(divid)s')" + + def cell_call(self, row, col, rtype=None, role='subject', reload=False, + vid='textoutofcontext', default=None): + """display field to edit entity's `rtype` relation on double-click""" + rschema = self.schema.rschema(rtype) + entity = self.entity(row, col) + if not default: + default = self.req._('not specified') + if rschema.is_final(): + if getattr(entity, rtype) is None: + value = default + else: + value = entity.printable_value(rtype) + else: + rset = entity.related(rtype, role) + # XXX html_escape but that depends of the actual vid + value = html_escape(self.view(vid, rset, 'null') or default) + if not entity.has_perm('update'): + self.w(value) + return + if rschema.is_final(): + form = self._build_attribute_form(entity, value, rtype, role, reload, row, col, default) + else: + form = self._build_relation_form(entity, value, rtype, role, row, col, vid, default) + form.form_add_hidden(u'__maineid', entity.eid) + renderer = FormRenderer(display_label=False, display_help=False, + display_fields=[(rtype, role)], + table_class='', button_bar_class='buttonbar', + display_progress_div=False) + self.w(form.form_render(renderer=renderer)) + + def _build_relation_form(self, entity, value, rtype, role, row, col, vid, default): + entity = self.entity(row, col) + divid = 'd%s' % make_uid('%s-%s' % (rtype, entity.eid)) + event_data = {'divid' : divid, 'eid' : entity.eid, 'rtype' : rtype, 'vid' : vid, + 'default' : default, 'role' : role} + form = EntityFieldsForm(self.req, None, entity=entity, action='#', + domid='%s-form' % divid, + cssstyle='display: none', + onsubmit=("return inlineValidateRelationForm('%(divid)s-form', '%(rtype)s', " + "'%(role)s', '%(eid)s', '%(divid)s', '%(vid)s', '%(default)s');" % + event_data), + form_buttons=[SubmitButton(), + Button(stdmsgs.BUTTON_CANCEL, + onclick="cancelInlineEdit(%s,\'%s\',\'%s\')" %\ + (entity.eid, rtype, divid))]) + form.append_field(RelationField(name=rtype, role=role, sort=True, + widget=Select(), + label=u' ')) + self.w(tags.div(value, klass='editableField', id=divid, + ondblclick=self.ondblclick % event_data)) + return form + + def _build_attribute_form(self, entity, value, rtype, role, reload, row, col, default): + eid = entity.eid + divid = 'd%s' % make_uid('%s-%s' % (rtype, eid)) + event_data = {'divid' : divid, 'eid' : eid, 'rtype' : rtype, + 'reload' : dumps(reload), 'default' : default} + buttons = [SubmitButton(stdmsgs.BUTTON_OK), + Button(stdmsgs.BUTTON_CANCEL, + onclick="cancelInlineEdit(%s,\'%s\',\'%s\')" % ( + eid, rtype, divid))] + form = self.vreg.select_object('forms', 'edition', self.req, self.rset, + row=row, col=col, form_buttons=buttons, + domid='%s-form' % divid, action='#', + cssstyle='display: none', + onsubmit=self.onsubmit % event_data) + self.w(tags.div(value, klass='editableField', id=divid, + ondblclick=self.ondblclick % event_data)) + return form + + +class EditionFormView(FormViewMixIn, EntityView): + """display primary entity edition form""" + id = 'edition' + # add yes() so it takes precedence over deprecated views in baseforms, + # though not baseforms based customized view + __select__ = one_line_rset() & non_final_entity() & yes() + + title = _('edition') + renderer = EntityFormRenderer() + + def cell_call(self, row, col, **kwargs): + entity = self.complete_entity(row, col) + self.render_form(entity) + + def render_form(self, entity): + """fetch and render the form""" + self.form_title(entity) + form = self.vreg.select_object('forms', 'edition', self.req, entity.rset, + row=entity.row, col=entity.col, entity=entity, + submitmsg=self.submited_message()) + self.init_form(form, entity) + self.w(form.form_render(renderer=self.renderer, formvid=u'edition')) + + def init_form(self, form, entity): + """customize your form before rendering here""" + form.form_add_hidden(u'__maineid', entity.eid) + + def form_title(self, entity): + """the form view title""" + ptitle = self.req._(self.title) + self.w(u'

%s %s

' % ( + entity.dc_type(), ptitle and '(%s)' % ptitle)) + + def submited_message(self): + """return the message that will be displayed on successful edition""" + return self.req._('entity edited') + + +class CreationFormView(EditionFormView): + """display primary entity creation form""" + id = 'creation' + __select__ = specified_etype_implements('Any') & yes() + + title = _('creation') + + def call(self, **kwargs): + """creation view for an entity""" + etype = kwargs.pop('etype', self.req.form.get('etype')) + try: + entity = self.vreg.etype_class(etype)(self.req) + except: + self.w(self.req._('no such entity type %s') % etype) + else: + self.initialize_varmaker() + entity.eid = self.varmaker.next() + self.render_form(entity) + + def form_title(self, entity): + """the form view title""" + if '__linkto' in self.req.form: + if isinstance(self.req.form['__linkto'], list): + # XXX which one should be considered (case: add a ticket to a + # version in jpl) + rtype, linkto_eid, role = self.req.form['__linkto'][0].split(':') + else: + rtype, linkto_eid, role = self.req.form['__linkto'].split(':') + linkto_rset = self.req.eid_rset(linkto_eid) + linkto_type = linkto_rset.description[0][0] + if role == 'subject': + title = self.req.__('creating %s (%s %s %s %%(linkto)s)' % ( + entity.e_schema, entity.e_schema, rtype, linkto_type)) + else: + title = self.req.__('creating %s (%s %%(linkto)s %s %s)' % ( + entity.e_schema, linkto_type, rtype, entity.e_schema)) + msg = title % {'linkto' : self.view('incontext', linkto_rset)} + self.w(u'

' % msg) + else: + super(CreationFormView, self).form_title(entity) + + def url(self): + """return the url associated with this view""" + return self.create_url(self.req.form.get('etype')) + + def submited_message(self): + """return the message that will be displayed on successful edition""" + return self.req._('entity created') + + +class CopyFormView(EditionFormView): + """display primary entity creation form initialized with values from another + entity + """ + id = 'copy' + def render_form(self, entity): + """fetch and render the form""" + # make a copy of entity to avoid altering the entity in the + # request's cache. + entity.complete() + self.newentity = copy(entity) + self.copying = entity + self.initialize_varmaker() + self.newentity.eid = self.varmaker.next() + self.w(u'\n' + % self.req._('Please note that this is only a shallow copy')) + super(CopyFormView, self).render_form(self.newentity) + del self.newentity + + def init_form(self, form, entity): + """customize your form before rendering here""" + super(CopyFormView, self).init_form(form, entity) + if entity.eid == self.newentity.eid: + form.form_add_hidden(eid_param('__cloned_eid', entity.eid), + self.copying.eid) + for rschema, _, role in form.relations_by_category(form.attrcategories, + 'add'): + if not rschema.is_final(): + # ensure relation cache is filed + rset = self.copying.related(rschema, role) + self.newentity.set_related_cache(rschema, role, rset) + + def submited_message(self): + """return the message that will be displayed on successful edition""" + return self.req._('entity copied') + + +class TableEditForm(CompositeForm): + id = 'muledit' + domid = 'entityForm' + onsubmit = "return validateForm('%s', null);" % domid + form_buttons = [SubmitButton(_('validate modifications on selected items')), + ResetButton(_('revert changes'))] + + def __init__(self, req, rset, **kwargs): + kwargs.setdefault('__redirectrql', rset.printable_rql()) + super(TableEditForm, self).__init__(req, rset, **kwargs) + for row in xrange(len(self.rset)): + form = self.vreg.select_object('forms', 'edition', self.req, self.rset, + row=row, attrcategories=('primary',), + set_error_url=False) + # XXX rely on the EntityCompositeFormRenderer to put the eid input + form.remove_field(form.field_by_name('eid')) + self.form_add_subform(form) + + +class TableEditFormView(FormViewMixIn, EntityView): + id = 'muledit' + __select__ = EntityView.__select__ & yes() + title = _('multiple edit') + + def call(self, **kwargs): + """a view to edit multiple entities of the same type the first column + should be the eid + """ + #self.form_title(entity) + form = self.vreg.select_object('forms', self.id, self.req, self.rset) + self.w(form.form_render(renderer=EntityCompositeFormRenderer())) + + +class InlineEntityEditionFormView(FormViewMixIn, EntityView): + id = 'inline-edition' + __select__ = non_final_entity() & match_kwargs('peid', 'rtype') + removejs = "removeInlinedEntity('%s', '%s', '%s')" + + def call(self, **kwargs): + """redefine default call() method to avoid automatic + insertions of

between each row of + the resultset + """ + rset = self.rset + for i in xrange(len(rset)): + self.wview(self.id, rset, row=i, **kwargs) + + def cell_call(self, row, col, peid, rtype, role='subject', **kwargs): + """ + :param peid: the parent entity's eid hosting the inline form + :param rtype: the relation bridging `etype` and `peid` + :param role: the role played by the `peid` in the relation + """ + entity = self.entity(row, col) + divonclick = "restoreInlinedEntity('%s', '%s', '%s')" % (peid, rtype, + entity.eid) + self.render_form(entity, peid, rtype, role, divonclick=divonclick) + + def render_form(self, entity, peid, rtype, role, **kwargs): + """fetch and render the form""" + form = self.vreg.select_object('forms', 'edition', self.req, None, + entity=entity, set_error_url=False) + self.add_hiddens(form, entity, peid, rtype, role) + divid = '%s-%s-%s' % (peid, rtype, entity.eid) + title = self.schema.rschema(rtype).display_name(self.req, role) + removejs = self.removejs % (peid, rtype,entity.eid) + self.w(form.form_render(renderer=EntityInlinedFormRenderer(), divid=divid, + title=title, removejs=removejs,**kwargs)) + + def add_hiddens(self, form, entity, peid, rtype, role): + # to ease overriding (see cubes.vcsfile.views.forms for instance) + if self.keep_entity(form, entity, peid, rtype): + if entity.has_eid(): + rval = entity.eid + else: + rval = INTERNAL_FIELD_VALUE + form.form_add_hidden('edit%s-%s:%s' % (role[0], rtype, peid), rval) + form.form_add_hidden(name='%s:%s' % (rtype, peid), value=entity.eid, + id='rel-%s-%s-%s' % (peid, rtype, entity.eid)) + + def keep_entity(self, form, entity, peid, rtype): + if not entity.has_eid(): + return True + # are we regenerating form because of a validation error ? + if form.form_previous_values: + cdvalues = self.req.list_form_param(eid_param(rtype, peid), + form.form_previous_values) + if unicode(entity.eid) not in cdvalues: + return False + return True + + +class InlineEntityCreationFormView(InlineEntityEditionFormView): + id = 'inline-creation' + __select__ = (match_kwargs('peid', 'rtype') + & specified_etype_implements('Any')) + removejs = "removeInlineForm('%s', '%s', '%s')" + + def call(self, etype, peid, rtype, role='subject', **kwargs): + """ + :param etype: the entity type being created in the inline form + :param peid: the parent entity's eid hosting the inline form + :param rtype: the relation bridging `etype` and `peid` + :param role: the role played by the `peid` in the relation + """ + try: + entity = self.vreg.etype_class(etype)(self.req, None, None) + except: + self.w(self.req._('no such entity type %s') % etype) + return + self.initialize_varmaker() + entity.eid = self.varmaker.next() + self.render_form(entity, peid, rtype, role) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/editviews.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/editviews.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,206 @@ +"""Some views used to help to the edition process + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from simplejson import dumps + +from logilab.common.decorators import cached +from logilab.mtconverter import html_escape + +from cubicweb import typed_eid +from cubicweb.view import EntityView +from cubicweb.selectors import (one_line_rset, non_final_entity, + match_search_state, match_form_params) +from cubicweb.common.uilib import cut +from cubicweb.web.views import linksearch_select_url +from cubicweb.web.views.editforms import relation_id +from cubicweb.web.views.baseviews import FinalView + +_ = unicode + +class SearchForAssociationView(EntityView): + """view called by the edition view when the user asks to search for + something to link to the edited eid + """ + id = 'search-associate' + __select__ = (one_line_rset() & match_search_state('linksearch') + & non_final_entity()) + + title = _('search for association') + + def cell_call(self, row, col): + rset, vid, divid, paginate = self.filter_box_context_info() + self.rset = rset + self.w(u'

' % divid) + self.paginate() + self.wview(vid, rset, 'noresult') + self.w(u'

') + + @cached + def filter_box_context_info(self): + entity = self.entity(0, 0) + role, eid, rtype, etype = self.req.search_state[1] + assert entity.eid == typed_eid(eid) + # the default behaviour is to fetch all unrelated entities and display + # them. Use fetch_order and not fetch_unrelated_order as sort method + # since the latter is mainly there to select relevant items in the combo + # box, it doesn't give interesting result in this context + rql = entity.unrelated_rql(rtype, etype, role, + ordermethod='fetch_order', + vocabconstraints=False) + rset = self.req.execute(rql, {'x' : entity.eid}, 'x') + return rset, 'list', "search-associate-content", True + + +class OutOfContextSearch(EntityView): + id = 'outofcontext-search' + def cell_call(self, row, col): + entity = self.entity(row, col) + erset = entity.as_rset() + if self.req.match_search_state(erset): + self.w(u'%s [...]' % ( + html_escape(linksearch_select_url(self.req, erset)), + self.req._('select this entity'), + html_escape(entity.view('textoutofcontext')), + html_escape(entity.absolute_url(vid='primary')), + self.req._('view detail for this entity'))) + else: + entity.view('outofcontext', w=self.w) + + +class UnrelatedDivs(EntityView): + id = 'unrelateddivs' + __select__ = match_form_params('relation') + + def cell_call(self, row, col): + entity = self.entity(row, col) + relname, target = self.req.form.get('relation').rsplit('_', 1) + rschema = self.schema.rschema(relname) + hidden = 'hidden' in self.req.form + is_cell = 'is_cell' in self.req.form + self.w(self.build_unrelated_select_div(entity, rschema, target, + is_cell=is_cell, hidden=hidden)) + + def build_unrelated_select_div(self, entity, rschema, target, + is_cell=False, hidden=True): + options = [] + divid = 'div%s_%s_%s' % (rschema.type, target, entity.eid) + selectid = 'select%s_%s_%s' % (rschema.type, target, entity.eid) + if rschema.symetric or target == 'subject': + targettypes = rschema.objects(entity.e_schema) + etypes = '/'.join(sorted(etype.display_name(self.req) for etype in targettypes)) + else: + targettypes = rschema.subjects(entity.e_schema) + etypes = '/'.join(sorted(etype.display_name(self.req) for etype in targettypes)) + etypes = cut(etypes, self.req.property_value('navigation.short-line-size')) + options.append('' % (self.req._('select a'), etypes)) + options += self._get_select_options(entity, rschema, target) + options += self._get_search_options(entity, rschema, target, targettypes) + if 'Basket' in self.schema: # XXX + options += self._get_basket_options(entity, rschema, target, targettypes) + relname, target = self.req.form.get('relation').rsplit('_', 1) + return u"""\ +

+ +

+""" % (hidden and 'hidden' or '', divid, selectid, + html_escape(dumps(entity.eid)), is_cell and 'true' or 'null', relname, + '\n'.join(options)) + + def _get_select_options(self, entity, rschema, target): + """add options to search among all entities of each possible type""" + options = [] + eid = entity.eid + pending_inserts = self.req.get_pending_inserts(eid) + rtype = rschema.type + form = self.vreg.select_object('forms', 'edition', self.req, + self.rset, entity=entity) + field = form.field_by_name(rschema, target, entity.e_schema) + limit = self.req.property_value('navigation.combobox-limit') + for eview, reid in form.form_field_vocabulary(field, limit): + if reid is None: + options.append('' + % html_escape(eview)) + else: + optionid = relation_id(eid, rtype, target, reid) + if optionid not in pending_inserts: + # prefix option's id with letters to make valid XHTML wise + options.append('' % + (optionid, reid, html_escape(eview))) + return options + + def _get_search_options(self, entity, rschema, target, targettypes): + """add options to search among all entities of each possible type""" + options = [] + _ = self.req._ + for eschema in targettypes: + mode = '%s:%s:%s:%s' % (target, entity.eid, rschema.type, eschema) + url = self.build_url(entity.rest_path(), vid='search-associate', + __mode=mode) + options.append((eschema.display_name(self.req), + '' % ( + html_escape(url), _('Search for'), eschema.display_name(self.req)))) + return [o for l, o in sorted(options)] + + def _get_basket_options(self, entity, rschema, target, targettypes): + options = [] + rtype = rschema.type + _ = self.req._ + for basketeid, basketname in self._get_basket_links(self.req.user.eid, + target, targettypes): + optionid = relation_id(entity.eid, rtype, target, basketeid) + options.append('' % ( + optionid, basketeid, _('link to each item in'), html_escape(basketname))) + return options + + def _get_basket_links(self, ueid, target, targettypes): + targettypes = set(targettypes) + for basketeid, basketname, elements in self._get_basket_info(ueid): + baskettypes = elements.column_types(0) + # if every elements in the basket can be attached to the + # edited entity + if baskettypes & targettypes: + yield basketeid, basketname + + def _get_basket_info(self, ueid): + basketref = [] + basketrql = 'Any B,N WHERE B is Basket, B owned_by U, U eid %(x)s, B name N' + basketresultset = self.req.execute(basketrql, {'x': ueid}, 'x') + for result in basketresultset: + basketitemsrql = 'Any X WHERE X in_basket B, B eid %(x)s' + rset = self.req.execute(basketitemsrql, {'x': result[0]}, 'x') + basketref.append((result[0], result[1], rset)) + return basketref + + +class ComboboxView(EntityView): + """the view used in combobox (unrelated entities) + + THIS IS A TEXT VIEW. DO NOT HTML_ESCAPE + """ + id = 'combobox' + title = None + + def cell_call(self, row, col): + """the combo-box view for an entity: same as text out of context view + by default + """ + self.wview('textoutofcontext', self.rset, row=row, col=col) + + +class EditableFinalView(FinalView): + """same as FinalView but enables inplace-edition when possible""" + id = 'editable-final' + + def cell_call(self, row, col, props=None, displaytime=False): + entity, rtype = self.rset.related_entity(row, col) + if entity is not None: + self.w(entity.view('reledit', rtype=rtype)) + else: + super(EditableFinalView, self).cell_call(row, col, props, displaytime) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/emailaddress.py --- a/web/views/emailaddress.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/emailaddress.py Thu May 14 12:48:11 2009 +0200 @@ -1,24 +1,25 @@ """Specific views for email addresses entities :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" from logilab.mtconverter import html_escape +from cubicweb.selectors import implements from cubicweb.common import Unauthorized -from cubicweb.web.views import baseviews +from cubicweb.web.views import baseviews, primary -class EmailAddressPrimaryView(baseviews.PrimaryView): - accepts = ('EmailAddress',) - +class EmailAddressPrimaryView(primary.PrimaryView): + __select__ = implements('EmailAddress') + def cell_call(self, row, col, skipeids=None): self.skipeids = skipeids super(EmailAddressPrimaryView, self).cell_call(row, col) - - def render_entity_attributes(self, entity, siderelations): + + def render_entity_attributes(self, entity): self.w(u'

') entity.view('oneline', w=self.w) if not entity.canonical: @@ -51,7 +52,7 @@ emailofstr = ', '.join(e.view('oneline') for e in emailof) self.field(display_name(self.req, 'use_email', 'object'), emailofstr) - def render_entity_relations(self, entity, siderelations): + def render_entity_relations(self, entity): for i, email in enumerate(entity.related_emails(self.skipeids)): self.w(u'
' % (i%2 and 'even' or 'odd')) email.view('oneline', w=self.w, contexteid=entity.eid) @@ -59,18 +60,19 @@ class EmailAddressShortPrimaryView(EmailAddressPrimaryView): - accepts = ('EmailAddress',) + select = implements('EmailAddress') id = 'shortprimary' title = None # hidden view - def render_entity_attributes(self, entity, siderelations): + + def render_entity_attributes(self, entity): self.w(u'
') entity.view('oneline', w=self.w) self.w(u'
') - + class EmailAddressOneLineView(baseviews.OneLineView): - accepts = ('EmailAddress',) - + select = implements('EmailAddress') + def cell_call(self, row, col, kwargs): entity = self.entity(row, col) if entity.reverse_primary_email: @@ -89,8 +91,8 @@ 'mailto:'""" id = 'mailto' - accepts = ('EmailAddress',) - + select = implements('EmailAddress') + def cell_call(self, row, col, kwargs): entity = self.entity(row, col) if entity.reverse_primary_email: @@ -105,15 +107,15 @@ mailto = "mailto:%s" % entity.display_address() self.w(u'%s' % (html_escape(mailto), html_escape(entity.display_address()))) - + if entity.alias: self.w(u'>\n') if entity.reverse_primary_email: self.w(u'') - + class EmailAddressTextView(baseviews.TextView): - accepts = ('EmailAddress',) - + select = implements('EmailAddress') + def cell_call(self, row, col, **kwargs): self.w(self.entity(row, col).display_address()) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/embedding.py --- a/web/views/embedding.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/embedding.py Thu May 14 12:48:11 2009 +0200 @@ -3,7 +3,7 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ docformat = "restructuredtext en" @@ -15,11 +15,11 @@ from logilab.mtconverter import guess_encoding from cubicweb import urlquote # XXX should use view.url_quote method +from cubicweb.selectors import (one_line_rset, score_entity, + match_search_state, implements) from cubicweb.interfaces import IEmbedable +from cubicweb.view import NOINDEX, NOFOLLOW from cubicweb.common.uilib import soup2xhtml -from cubicweb.common.selectors import (one_line_rset, score_entity_selector, - match_search_state, implement_interface) -from cubicweb.common.view import NOINDEX, NOFOLLOW from cubicweb.web.controller import Controller from cubicweb.web.action import Action from cubicweb.web.views import basetemplates @@ -29,11 +29,10 @@ """template embeding an external web pages into CubicWeb web interface """ id = 'external' - + def call(self, body): # XXX fallback to HTML 4 mode when embeding ? self.set_request_content_type() - self.process_rql(self.req.form.get('rql')) self.req.search_state = ('normal',) self.template_header(self.content_type, None, self.req._('external page'), [NOINDEX, NOFOLLOW]) @@ -72,7 +71,19 @@ except HTTPError, err: body = '
%s
%s
' % ( _('error while embedding page'), err) - return self.vreg.main_template(req, self.template, body=body) + self.process_rql(req.form.get('rql')) + return self.vreg.main_template(req, self.template, rset=self.rset, body=body) + + +def entity_has_embedable_url(entity): + """return 1 if the entity provides an allowed embedable url""" + url = entity.embeded_url() + if not url or not url.strip(): + return 0 + allowed = entity.config['embed-allowed'] + if allowed is None or not allowed.match(url): + return 0 + return 1 class EmbedAction(Action): @@ -80,26 +91,13 @@ if the returned url match embeding configuration """ id = 'embed' - controller = 'embed' - selectors = (one_line_rset, match_search_state, - implement_interface, score_entity_selector) - accepts_interfaces = (IEmbedable,) - + select = (one_line_rset() & match_search_state('normal') + & implements(IEmbedable) + & score_entity(entity_has_embedable_url)) + title = _('embed') - - @classmethod - def score_entity(cls, entity): - """return a score telling how well I can display the given - entity instance (required by the value_selector) - """ - url = entity.embeded_url() - if not url or not url.strip(): - return 0 - allowed = cls.config['embed-allowed'] - if allowed is None or not allowed.match(url): - return 0 - return 1 - + controller = 'embed' + def url(self, row=0): entity = self.rset.get_entity(row, 0) url = urljoin(self.req.base_url(), entity.embeded_url()) @@ -121,7 +119,7 @@ def init(self, prefix, custom_css=None): self.prefix = prefix self.custom_css = custom_css - + def call(self, match): original_url = match.group(1) url = self.prefix + urlquote(original_url, safe='') @@ -132,12 +130,13 @@ url = '%s?custom_css=%s' % (url, self.custom_css) return '%s

" % _('an error occured, the request cannot be fulfilled')) - - diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/euser.py --- a/web/views/euser.py Tue May 05 17:18:49 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,132 +0,0 @@ -"""Specific views for users - -:organization: Logilab -:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. -:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr -""" -__docformat__ = "restructuredtext en" - -from logilab.common.decorators import cached -from logilab.mtconverter import html_escape - -from cubicweb.schema import display_name -from cubicweb.web import INTERNAL_FIELD_VALUE -from cubicweb.web.form import EntityForm -from cubicweb.web.views.baseviews import PrimaryView, EntityView - -class EUserPrimaryView(PrimaryView): - accepts = ('EUser',) - skip_attrs = ('firstname', 'surname') - - def iter_relations(self, entity): - # don't want to display user's entities - for rschema, targetschemas, x in super(EUserPrimaryView, self).iter_relations(entity): - if x == 'object' and rschema.type in ('owned_by', 'for_user'): - continue - yield rschema, targetschemas, x - - def content_title(self, entity): - return entity.name() - - def is_side_related(self, rschema, eschema): - return rschema.type in ['interested_in', 'tags', - 'todo_by', 'bookmarked_by', - ] -class FoafView(EntityView): - id = 'foaf' - accepts = ('EUser',) - title = _('foaf') - templatable = False - content_type = 'text/xml' - - def call(self): - self.w(u''' - '''% self.req.encoding) - for i in xrange(self.rset.rowcount): - self.cell_call(i, 0) - self.w(u'\n') - - def cell_call(self, row, col): - entity = self.complete_entity(row, col) - self.w(u''' - - - ''' % (entity.absolute_url(), entity.absolute_url())) - - self.w(u'\n' % entity.eid) - self.w(u'%s\n' % html_escape(entity.dc_long_title())) - if entity.surname: - self.w(u'%s\n' - % html_escape(entity.surname)) - if entity.firstname: - self.w(u'%s\n' - % html_escape(entity.firstname)) - emailaddr = entity.get_email() - if emailaddr: - self.w(u'%s\n' % html_escape(emailaddr)) - self.w(u'\n') - -class EditGroups(EntityForm): - """displays a simple euser / egroups editable table""" - - id = 'editgroups' - accepts = ('EUser',) - - def call(self): - self.req.add_css('cubicweb.acl.css') - _ = self.req._ - self.w(u'

') - self.w(u'\n') - self.w(u'') - self.w(u'' % display_name(self.req, 'EUser')) - self.w(u''.join(u'' % _(gname) for geid, gname in self.egroups)) - self.w(u'') - for row in xrange(len(self.rset)): - self.build_table_line(row) - self.w(u'

%s	%s

') - self.w(u'

') - self.w(self.button_cancel()) - self.w(self.button_ok()) - self.w(u'

') - self.w(u'

') - - - def build_table_line(self, row): - euser = self.entity(row) - euser_groups = [group.name for group in euser.in_group] - if euser_groups: - self.w(u'') - else: - self.w(u'') - self.w(u'

') - self.w(u'' % euser.eid) - self.w(u'' % euser.eid) - # this should not occur (for now) since in_group relation is mandatory - if not euser_groups: - self.w(u'' % - (euser.eid, INTERNAL_FIELD_VALUE)) - self.w(euser.dc_title()) - self.w(u'

') - for geid, gname in self.egroups: - self.w(u'

') - if gname in euser_groups: - self.w(u'' % - (euser.eid, geid)) - self.w(u'' % - (euser.eid, geid)) - else: - self.w(u'' % - (euser.eid, geid)) - self.w(u'

') - self.w(u'\n') - - - @property - @cached - def egroups(self): - groups = self.req.execute('Any G, N ORDERBY N WHERE G is EGroup, G name N') - return [(geid, gname) for geid, gname in groups.rows if gname != 'owners'] - - diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/facets.py --- a/web/views/facets.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/facets.py Thu May 14 12:48:11 2009 +0200 @@ -10,26 +10,27 @@ from logilab.mtconverter import html_escape -from cubicweb.common.selectors import (chainfirst, chainall, non_final_entity, - two_lines_rset, match_context_prop, - yes, one_has_relation) +from cubicweb.vregistry import objectify_selector +from cubicweb.selectors import (non_final_entity, two_lines_rset, + match_context_prop, yes, relation_possible) from cubicweb.web.box import BoxTemplate -from cubicweb.web.facet import (AbstractFacet, VocabularyFacet, FacetStringWidget, - RelationFacet, prepare_facets_rqlst, filter_hiddens) +from cubicweb.web.facet import (AbstractFacet, FacetStringWidget, RelationFacet, + prepare_facets_rqlst, filter_hiddens) +@objectify_selector def contextview_selector(cls, req, rset, row=None, col=None, view=None, **kwargs): if view and getattr(view, 'filter_box_context_info', lambda: None)(): return 1 - return 0 + return 0 class FilterBox(BoxTemplate): """filter results of a query""" id = 'filter_box' - __selectors__ = (chainfirst(contextview_selector, - chainall(non_final_entity, two_lines_rset)), - match_context_prop) + __select__ = (((non_final_entity() & two_lines_rset()) + | contextview_selector() + ) & match_context_prop()) context = 'left' title = _('boxes_filter_box') visible = True # functionality provided by the search box by default @@ -41,7 +42,7 @@ be used by the facet """ return {} - + def _get_context(self, view): context = getattr(view, 'filter_box_context_info', lambda: None)() if context: @@ -51,14 +52,14 @@ vid, divid = None, 'pageContent' paginate = view and view.need_navigation return rset, vid, divid, paginate - + def call(self, view=None): req = self.req req.add_js( ('cubicweb.ajax.js', 'cubicweb.formfilter.js') ) req.add_css('cubicweb.facets.css') if self.roundcorners: req.html_headers.add_onload('jQuery(".facet").corner("tl br 10px");') - rset, vid, divid, paginate=self._get_context(view) + rset, vid, divid, paginate = self._get_context(view) if rset.rowcount < 2: # XXX done by selectors, though maybe necessary when rset has been hijacked return if vid is None: @@ -108,7 +109,7 @@ return self.vreg.possible_vobjects('facets', self.req, rset, context='facetbox', filtered_variable=mainvar) - + # facets ###################################################################### class CreatedByFacet(RelationFacet): @@ -129,7 +130,7 @@ # inherit from RelationFacet to benefit from its possible_values implementation class ETypeFacet(RelationFacet): id = 'etype-facet' - __selectors__ = (yes,) + __select__ = yes() order = 1 rtype = 'is' target_attr = 'name' @@ -143,7 +144,7 @@ """ etypes = self.rset.column_types(0) return sorted((self.req._(etype), etype) for etype in etypes) - + def add_rql_restrictions(self): """add restriction for this facet into the rql syntax tree""" value = self.req.form.get(self.id) @@ -153,7 +154,7 @@ class HasTextFacet(AbstractFacet): - __selectors__ = (one_has_relation, match_context_prop) + __select__ = relation_possible('has_text', 'subject') & match_context_prop() id = 'has_text-facet' rtype = 'has_text' role = 'subject' @@ -161,7 +162,7 @@ @property def title(self): return self.req._('has_text') - + def get_widget(self): """return the widget instance to use to display this facet diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/ibreadcrumbs.py --- a/web/views/ibreadcrumbs.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/ibreadcrumbs.py Thu May 14 12:48:11 2009 +0200 @@ -1,20 +1,19 @@ """navigation components definition for CubicWeb web client :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" from logilab.mtconverter import html_escape +# don't use AnyEntity since this may cause bug with isinstance() due to reloading from cubicweb.interfaces import IBreadCrumbs -from cubicweb.common.selectors import (match_context_prop, one_line_rset, - implement_interface) -from cubicweb.common.view import EntityView +from cubicweb.selectors import match_context_prop, one_line_rset, implements +from cubicweb.entity import Entity +from cubicweb.view import EntityView from cubicweb.common.uilib import cut -# don't use AnyEntity since this may cause bug with isinstance() due to reloading -from cubicweb.common.entity import Entity from cubicweb.web.component import EntityVComponent _ = unicode @@ -22,15 +21,14 @@ def bc_title(entity): textsize = entity.req.property_value('navigation.short-line-size') return html_escape(cut(entity.dc_title(), textsize)) - + class BreadCrumbEntityVComponent(EntityVComponent): id = 'breadcrumbs' # register msg not generated since no entity implements IPrevNext in cubicweb itself title = _('contentnavigation_breadcrumbs') help = _('contentnavigation_breadcrumbs_description') - __selectors__ = (one_line_rset, match_context_prop, implement_interface) - accepts_interfaces = (IBreadCrumbs,) + __select__ = (one_line_rset() & match_context_prop() & implements(IBreadCrumbs)) context = 'navtop' order = 5 visible = False @@ -54,7 +52,7 @@ self.w(u"\n") self.wpath_part(parent, entity, i == len(path) - 1) self.w(u'') - + def wpath_part(self, part, contextentity, last=False): if isinstance(part, Entity): if last and part.eid == contextentity.eid: @@ -69,11 +67,11 @@ else: textsize = self.req.property_value('navigation.short-line-size') self.w(cut(unicode(part), textsize)) - + class BreadCrumbComponent(BreadCrumbEntityVComponent): __registry__ = 'components' - __selectors__ = (one_line_rset, implement_interface) + __select__ = (one_line_rset() & implements(IBreadCrumbs)) visible = True diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/idownloadable.py --- a/web/views/idownloadable.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/idownloadable.py Thu May 14 12:48:11 2009 +0200 @@ -1,21 +1,28 @@ """Specific views for entities implementing IDownloadable :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" +_ = unicode from logilab.mtconverter import BINARY_ENCODINGS, TransformError, html_escape +from cubicweb.view import EntityView +from cubicweb.selectors import (one_line_rset, score_entity, + implements, match_context_prop) from cubicweb.interfaces import IDownloadable from cubicweb.common.mttransforms import ENGINE -from cubicweb.common.selectors import (one_line_rset, score_entity_selector, - implement_interface, match_context_prop) from cubicweb.web.box import EntityBoxTemplate -from cubicweb.web.views import baseviews +from cubicweb.web.views import primary, baseviews + -_ = unicode +def is_image(entity): + mt = entity.download_content_type() + if not (mt and mt.startswith('image/')): + return 0 + return 1 def download_box(w, entity, title=None, label=None): req = entity.req @@ -32,34 +39,26 @@ w(u'

') w(u'

\n') - + class DownloadBox(EntityBoxTemplate): id = 'download_box' + # no download box for images # XXX primary_view selector ? - __selectors__ = (one_line_rset, implement_interface, match_context_prop, score_entity_selector) - accepts_interfaces = (IDownloadable,) + __select__ = (one_line_rset() & implements(IDownloadable) & + match_context_prop() & ~score_entity(is_image)) order = 10 - @classmethod - def score_entity(cls, entity): - mt = entity.download_content_type() - # no download box for images - if mt and mt.startswith('image/'): - return 0 - return 1 - def cell_call(self, row, col, title=None, label=None, **kwargs): entity = self.entity(row, col) download_box(self.w, entity, title, label) -class DownloadView(baseviews.EntityView): - """this view is replacing the deprecated 'download' controller and allow downloading - of entities providing the necessary interface +class DownloadView(EntityView): + """this view is replacing the deprecated 'download' controller and allow + downloading of entities providing the necessary interface """ id = 'download' - __selectors__ = (one_line_rset, implement_interface) - accepts_interfaces = (IDownloadable,) + __select__ = one_line_rset() & implements(IDownloadable) templatable = False content_type = 'application/octet-stream' @@ -83,34 +82,24 @@ self.w(self.complete_entity(0).download_data()) -class DownloadLinkView(baseviews.EntityView): +class DownloadLinkView(EntityView): """view displaying a link to download the file""" id = 'downloadlink' + __select__ = implements(IDownloadable) title = None # should not be listed in possible views - __selectors__ = (implement_interface,) - accepts_interfaces = (IDownloadable,) - + def cell_call(self, row, col, title=None, **kwargs): entity = self.entity(row, col) url = html_escape(entity.download_url()) self.w(u'%s' % (url, html_escape(title or entity.dc_title()))) - -class IDownloadablePrimaryView(baseviews.PrimaryView): - __selectors__ = (implement_interface,) - accepts_interfaces = (IDownloadable,) - # XXX File/Image attributes but this is not specified in the IDownloadable interface - skip_attrs = baseviews.PrimaryView.skip_attrs + ('data', 'name') +class IDownloadablePrimaryView(primary.PrimaryView): + __select__ = implements(IDownloadable) - def render_entity_title(self, entity): - self.w(u'

%s %s

' - % (entity.dc_type().capitalize(), - html_escape(entity.dc_title()))) - - def render_entity_attributes(self, entity, siderelations): - super(IDownloadablePrimaryView, self).render_entity_attributes(entity, siderelations) + def render_entity_attributes(self, entity): + super(IDownloadablePrimaryView, self).render_entity_attributes(entity) self.w(u'

') contenttype = entity.download_content_type() if contenttype.startswith('image/'): @@ -126,17 +115,10 @@ msg = self.req._("can't display data, unexpected error: %s") % ex self.w('

' % msg) self.w(u'

') - - def is_side_related(self, rschema, eschema): - """display all relations as side related""" - return True class IDownloadableLineView(baseviews.OneLineView): - __selectors__ = (implement_interface,) - # don't kick default oneline view - accepts_interfaces = (IDownloadable,) - + __select__ = implements(IDownloadable) def cell_call(self, row, col, title=None, **kwargs): """the secondary view is a link to download the file""" @@ -148,12 +130,12 @@ (url, name, durl, self.req._('download'))) -class ImageView(baseviews.EntityView): - __selectors__ = (implement_interface, score_entity_selector) +class ImageView(EntityView): id = 'image' + __select__ = implements(IDownloadable) & score_entity(is_image) + title = _('image') - accepts_interfaces = (IDownloadable,) - + def call(self): rset = self.rset for i in xrange(len(rset)): @@ -161,13 +143,6 @@ self.wview(self.id, rset, row=i, col=0) self.w(u'

') - @classmethod - def score_entity(cls, entity): - mt = entity.download_content_type() - if not (mt and mt.startswith('image/')): - return 0 - return 1 - def cell_call(self, row, col): entity = self.entity(row, col) #if entity.data_format.startswith('image/'): diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/igeocodable.py --- a/web/views/igeocodable.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/igeocodable.py Thu May 14 12:48:11 2009 +0200 @@ -1,10 +1,16 @@ -# -*- coding: utf-8 -*- +"""Specific views for entities implementing IGeocodable + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" import simplejson from cubicweb.interfaces import IGeocodable -from cubicweb.common.view import EntityView -from cubicweb.common.selectors import implement_interface +from cubicweb.view import EntityView +from cubicweb.selectors import implements class GeocodingJsonView(EntityView): id = 'geocoding-json' @@ -12,8 +18,7 @@ templatable = False content_type = 'application/json' - __selectors__ = (implement_interface,) - accepts_interfaces = (IGeocodable,) + __select__ = implements(IGeocodable) def call(self): zoomlevel = self.req.form.pop('zoomlevel', 8) @@ -46,8 +51,7 @@ class GoogleMapBubbleView(EntityView): id = 'gmap-bubble' - __selectors__ = (implement_interface,) - accepts_interfaces = (IGeocodable,) + __select__ = implements(IGeocodable) def cell_call(self, row, col): entity = self.entity(row, col) @@ -58,13 +62,12 @@ class GoogleMapsView(EntityView): id = 'gmap-view' - __selectors__ = (implement_interface,) - accepts_interfaces = (IGeocodable,) + __select__ = implements(IGeocodable) need_navigation = False def call(self, gmap_key, width=400, height=400, uselabel=True, urlparams=None): self.req.add_js('http://maps.google.com/maps?file=api&v=2&key=%s' % gmap_key, - localfile=False); + localfile=False) self.req.add_js( ('cubicweb.widgets.js', 'cubicweb.gmap.js', 'gmap.utility.labeledmarker.js') ) rql = self.rset.printable_rql() if urlparams is None: diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/iprogress.py --- a/web/views/iprogress.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/iprogress.py Thu May 14 12:48:11 2009 +0200 @@ -9,10 +9,10 @@ from logilab.mtconverter import html_escape +from cubicweb.selectors import implements from cubicweb.interfaces import IProgress, IMileStone from cubicweb.schema import display_name -from cubicweb.common.view import EntityView -from cubicweb.common.selectors import implement_interface, accept +from cubicweb.view import EntityView from cubicweb.web.htmlwidgets import ProgressBarWidget @@ -32,12 +32,10 @@ header_for_COLNAME methods allow to customize header's label """ - + id = 'progress_table_view' title = _('task progression') - __selectors__ = (accept, implement_interface) - - accepts_interfaces = (IMileStone,) + __select__ = implements(IMileStone) # default columns of the table columns = (_('project'), _('milestone'), _('state'), _('eta_date'), @@ -89,7 +87,7 @@ def header_for_milestone(self, ecls): """use entity's type as label""" return display_name(self.req, ecls.id) - + def table_header(self, ecls): """builds the table's header""" self.w(u'') @@ -103,7 +101,7 @@ self.w(u'%s' % html_escape(colname)) self.w(u'\n') - + ## cell management ######################################################## def build_project_cell(self, entity): """``project`` column cell renderer""" @@ -119,7 +117,7 @@ def build_state_cell(self, entity): """``state`` column cell renderer""" return html_escape(self.req._(entity.state)) - + def build_eta_date_cell(self, entity): """``eta_date`` column cell renderer""" if entity.finished(): @@ -154,7 +152,7 @@ if costdescr: return u'%s (%s)' % (totalcost, ', '.join(costdescr)) return unicode(totalcost) - + def build_progress_cell(self, entity): """``progress`` column cell renderer""" progress = u'

%s (%.2f%%)

' % ( @@ -167,7 +165,7 @@ the ``project`` column """ id = 'ic_progress_table_view' - + def call(self): view = self.vreg.select_view('progress_table_view', self.req, self.rset) columns = list(view.columns) @@ -175,16 +173,14 @@ columns.remove('project') except ValueError: self.info('[ic_progress_table_view] could not remove project from columns') - view.dispatch(w=self.w, columns=columns) + view.render(w=self.w, columns=columns) class ProgressBarView(EntityView): """displays a progress bar""" id = 'progressbar' title = _('progress bar') - __selectors__ = (accept, implement_interface) - - accepts_interfaces = (IProgress,) + __select__ = implements(IProgress) def cell_call(self, row, col): self.req.add_css('cubicweb.iprogress.css') diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/isioc.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/isioc.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,93 @@ +"""Specific views for SIOC interfaces + +:organization: Logilab +:copyright: 2003-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from logilab.mtconverter import html_escape + +from cubicweb.view import EntityView +from cubicweb.selectors import implements +from cubicweb.interfaces import ISiocItem, ISiocContainer + +class SIOCView(EntityView): + id = 'sioc' + __select__ = EntityView.__select__ & implements(ISiocItem, ISiocContainer) + title = _('sioc') + templatable = False + content_type = 'text/xml' + + def call(self): + self.w(u'\n' % self.req.encoding) + self.w(u'''\n''') + for i in xrange(self.rset.rowcount): + self.cell_call(i, 0) + self.w(u'\n') + + def cell_call(self, row, col): + self.wview('sioc_element', self.rset, row=row, col=col) + +class SIOCContainerView(EntityView): + id = 'sioc_element' + __select__ = EntityView.__select__ & implements(ISiocContainer) + templatable = False + content_type = 'text/xml' + + def cell_call(self, row, col): + entity = self.complete_entity(row, col) + sioct = html_escape(entity.isioc_type()) + self.w(u'\n' + % (sioct, html_escape(entity.absolute_url()))) + self.w(u'%s' + % html_escape(entity.dc_title())) + self.w(u'%s' + % entity.creation_date) + self.w(u'%s' + % entity.modification_date) + self.w(u'')#entity.isioc_items() + self.w(u'\n' % sioct) + + +class SIOCItemView(EntityView): + id = 'sioc_element' + __select__ = EntityView.__select__ & implements(ISiocItem) + templatable = False + content_type = 'text/xml' + + def cell_call(self, row, col): + entity = self.complete_entity(row, col) + sioct = html_escape(entity.isioc_type()) + self.w(u'\n' + % (sioct, html_escape(entity.absolute_url()))) + self.w(u'%s' + % html_escape(entity.dc_title())) + self.w(u'%s' + % entity.creation_date) + self.w(u'%s' + % entity.modification_date) + if entity.content: + self.w(u'%s''' + % html_escape(entity.isioc_content())) + if entity.related('entry_of'): + self.w(u'\n' + % html_escape(entity.isioc_container().absolute_url())) + if entity.creator: + self.w(u'\n') + self.w(u'\n' + % html_escape(entity.creator.absolute_url())) + self.w(entity.creator.view('foaf')) + self.w(u'\n') + self.w(u'\n') + self.w(u'')#entity.isioc_topics() + self.w(u'')#entity.isioc_replies() + self.w(u' \n' % sioct) + diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/magicsearch.py --- a/web/views/magicsearch.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/magicsearch.py Thu May 14 12:48:11 2009 +0200 @@ -2,7 +2,7 @@ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ @@ -15,7 +15,7 @@ from rql.nodes import Relation from cubicweb import Unauthorized -from cubicweb.common.appobject import Component, SingletonComponent +from cubicweb.view import Component LOGGER = getLogger('cubicweb.magicsearch') @@ -41,7 +41,7 @@ :param translations: the reverted l10n dict :type schema: `cubicweb.schema.Schema` - :param schema: the application's schema + :param schema: the application's schema """ # var_types is used as a map : var_name / var_type vartypes = {} @@ -107,7 +107,7 @@ if rtype is None: continue relation.r_type = rtype - + QUOTED_SRE = re.compile(r'(.*?)(["\'])(.+?)\2') @@ -145,7 +145,7 @@ return req.execute(*args) finally: # rollback necessary to avoid leaving the connection in a bad state - req.cnx.rollback() + req.cnx.rollback() def preprocess_query(self, uquery, req): raise NotImplementedError() @@ -161,10 +161,10 @@ priority = 0 def preprocess_query(self, uquery, req): return uquery, - + class QueryTranslator(BaseQueryProcessor): - """ parses through rql and translates into schema language entity names + """ parses through rql and translates into schema language entity names and attributes """ priority = 2 @@ -185,15 +185,15 @@ preprocessing query in shortcut form to their RQL form """ priority = 4 - + def preprocess_query(self, uquery, req): - """""" + """try to get rql from an unicode query string""" args = None self.req = req try: # Process as if there was a quoted part args = self._quoted_words_query(uquery) - ## No quoted part + ## No quoted part except BadRQLQuery: words = uquery.split() if len(words) == 1: @@ -205,7 +205,7 @@ else: args = self._multiple_words_query(words) return args - + def _get_entity_type(self, word): """check if the given word is matching an entity type, return it if it's the case or raise BadRQLQuery if not @@ -214,7 +214,7 @@ try: return trmap(self.config, self.vreg.schema, self.req.lang)[etype] except KeyError: - raise BadRQLQuery('%s is not a valid entity name' % etype) + raise BadRQLQuery('%s is not a valid entity name' % etype) def _get_attribute_name(self, word, eschema): """check if the given word is matching an attribute of the given entity type, @@ -261,7 +261,7 @@ if var is None: var = etype[0] return '%s %s %s%%(text)s' % (var, searchattr, searchop) - + def _two_words_query(self, word1, word2): """Specific process for two words query (case (2) of preprocess_rql) """ @@ -272,7 +272,7 @@ # else, suppose it's a shortcut like : Person Smith rql = '%s %s WHERE %s' % (etype, etype[0], self._complete_rql(word2, etype)) return rql, {'text': word2} - + def _three_words_query(self, word1, word2, word3): """Specific process for three words query (case (3) of preprocess_rql) """ @@ -336,20 +336,20 @@ return self._three_words_query(word1, word2, quoted_part) # return ori_rql raise BadRQLQuery("unable to handle request %r" % ori_rql) - + - + class FullTextTranslator(BaseQueryProcessor): priority = 10 name = 'text' - + def preprocess_query(self, uquery, req): """suppose it's a plain text query""" return 'Any X WHERE X has_text %(text)s', {'text': uquery} -class MagicSearchComponent(SingletonComponent): +class MagicSearchComponent(Component): id = 'magicsearch' def __init__(self, req, rset=None): super(MagicSearchComponent, self).__init__(req, rset) @@ -392,33 +392,3 @@ # let exception propagate return proc.process_query(uquery, req) raise BadRQLQuery(req._('sorry, the server is unable to handle this query')) - - -# Do not make a strong dependency on NlpTools -try: - from NlpTools.rqltools.client import RQLClient -except ImportError: - LOGGER.info('could not import RQLClient (NlpTools)') -else: - try: - from Pyro.errors import NamingError - except ImportError: - LOGGER.warning("pyro is not installed, can't try to connect to nlp server") - else: - try: - class NLPProcessor(BaseQueryProcessor): - priority = 8 - nlp_agent = RQLClient('ivan') - def preprocess_query(self, uquery, req): - try: - answer = self.nlp_agent.get_translation(uquery) - if not answer: - raise BadRQLQuery(uquery) - return answer or uquery, - except Exception, ex: - LOGGER.exception(str(ex)) - return uquery, - - except NamingError: # NlpTools available but no server registered - LOGGER.warning('could not find any RQLServer object named "ivan"') - diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/management.py --- a/web/views/management.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/management.py Thu May 14 12:48:11 2009 +0200 @@ -1,46 +1,74 @@ -"""management and error screens +"""security management and error screens :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" +_ = unicode from logilab.mtconverter import html_escape -from logilab.common.decorators import cached - -from cubicweb.common.utils import UStringIO -from cubicweb.common.view import AnyRsetView, StartupView, EntityView +from cubicweb.selectors import yes, none_rset, match_user_groups +from cubicweb.view import AnyRsetView, StartupView, EntityView from cubicweb.common.uilib import html_traceback, rest_traceback -from cubicweb.common.selectors import (yes, one_line_rset, - accept_rset, none_rset, - chainfirst, chainall) -from cubicweb.web import INTERNAL_FIELD_VALUE, eid_param, stdmsgs -from cubicweb.web.widgets import StaticComboBoxWidget -from cubicweb.web.form import FormMixIn +from cubicweb.web import formwidgets +from cubicweb.web.form import FieldsForm, EntityFieldsForm +from cubicweb.web.formfields import guess_field +from cubicweb.web.formrenderers import HTableFormRenderer + +SUBMIT_MSGID = _('Submit bug report') +MAIL_SUBMIT_MSGID = _('Submit bug report by mail') -_ = unicode +class SecurityViewMixIn(object): + """display security information for a given schema """ + def schema_definition(self, eschema, link=True, access_types=None): + w = self.w + _ = self.req._ + if not access_types: + access_types = eschema.ACTIONS + w(u'') + w(u'' % ( + _("permission"), _('granted to groups'), _('rql expressions'))) + for access_type in access_types: + w(u'') + w(u'' % self.req.__('%s_perm' % access_type)) + groups = eschema.get_groups(access_type) + l = [] + groups = [(_(group), group) for group in groups] + for trad, group in sorted(groups): + if link: + l.append(u'%s
' % ( + self.build_url('egroup/%s' % group), group, trad)) + else: + l.append(u'

' % (group, trad)) + w(u'' % u''.join(l)) + rqlexprs = eschema.get_rqlexprs(access_type) + w(u'' % u'

'.join(expr.expression for expr in rqlexprs)) + w(u'\n') + w(u'

%s	%s	%s
%s	%s	%s

') -def begin_form(w, entity, redirectvid, redirectpath=None, msg=None): - w(u'

\n' % entity.req.build_url('edit')) - w(u'

\n') - w(u'\n' % redirectvid) - w(u'\n' % ( - html_escape(redirectpath or entity.rest_path()))) - w(u'\n' % entity.eid) - w(u'\n' % ( - eid_param('__type', entity.eid), entity.e_schema)) - if msg: - w(u'\n' - % html_escape(msg)) + def has_schema_modified_permissions(self, eschema, access_types): + """ return True if eschema's actual permissions are diffrents + from the default ones + """ + for access_type in access_types: + if eschema.get_rqlexprs(access_type): + return True + if eschema.get_groups(access_type) != \ + frozenset(eschema.get_default_groups()[access_type]): + return True + return False -class SecurityManagementView(EntityView): +class SecurityManagementView(EntityView, SecurityViewMixIn): """display security information for a given entity""" id = 'security' title = _('security') + def call(self): + self.w(u'

' % self.req._('validating...')) + super(SecurityManagementView, self).call() def cell_call(self, row, col): self.req.add_js('cubicweb.edition.js') @@ -54,7 +82,7 @@ html_escape(entity.dc_title()))) # first show permissions defined by the schema self.w('

%s

' % _('schema\'s permissions definitions')) - self.schema_definition(entity) + self.schema_definition(entity.e_schema) self.w('

%s

' % _('manage security')) # ownership information if self.schema.rschema('owned_by').has_perm(self.req, 'add', @@ -62,7 +90,7 @@ self.owned_by_edit_form(entity) else: self.owned_by_information(entity) - # epermissions + # cwpermissions if 'require_permission' in entity.e_schema.subject_relations(): w('

%s

' % _('permissions for this entity')) reqpermschema = self.schema.rschema('require_permission') @@ -70,37 +98,17 @@ if reqpermschema.has_perm(self.req, 'add', fromeid=entity.eid): self.require_permission_edit_form(entity) - def schema_definition(self, entity): - w = self.w - _ = self.req._ - w(u'') - w(u'' % ( - _("access type"), _('granted to groups'), _('rql expressions'))) - for access_type in ('read', 'add', 'update', 'delete'): - w(u'') - w(u'' % self.req.__('%s_permission' % access_type)) - groups = entity.e_schema.get_groups(access_type) - l = [] - for group in groups: - l.append(u'%s' % ( - self.build_url('egroup/%s' % group), _(group))) - w(u'' % u', '.join(l)) - rqlexprs = entity.e_schema.get_rqlexprs(access_type) - w(u'' % u'
'.join(expr.expression for expr in rqlexprs)) - w(u'\n') - w(u'

%s	%s	%s
%s	%s	%s

') - def owned_by_edit_form(self, entity): self.w('

%s

' % self.req._('ownership')) - begin_form(self.w, entity, 'security', msg= _('ownerships have been changed')) - self.w(u'\n') - self.w(u'\n

\n') - wdg = entity.get_widget('owned_by') - self.w(wdg.edit_render(entity)) - self.w(u'

\n') - self.w(self.button_ok()) - self.w(u'

\n') - self.w(u'

\n') + msg = self.req._('ownerships have been changed') + form = EntityFieldsForm(self.req, None, entity=entity, submitmsg=msg, + form_buttons=[formwidgets.SubmitButton()], + domid='ownership%s' % entity.eid, + __redirectvid='security', + __redirectpath=entity.rest_path()) + field = guess_field(entity.e_schema, self.schema.rschema('owned_by')) + form.append_field(field) + self.w(form.form_render(display_progress_div=False)) def owned_by_information(self, entity): ownersrset = entity.related('owned_by') @@ -131,58 +139,52 @@ w(u'') w(u'' % (_("permission"), _('granted to groups'))) - for eperm in entity.require_permission: + for cwperm in entity.require_permission: w(u'') if dellinktempl: - w(u'' % (dellinktempl % eperm.eid, - eperm.view('oneline'))) + w(u'' % (dellinktempl % cwperm.eid, + cwperm.view('oneline'))) else: - w(u'' % eperm.view('oneline')) - w(u'' % self.view('csv', eperm.related('require_group'), 'null')) + w(u'' % cwperm.view('oneline')) + w(u'' % self.view('csv', cwperm.related('require_group'), 'null')) w(u'\n') w(u'

%s	%s
%s%s	%s%s	%s	%s	%s	%s

') else: - self.w(self.req._('no associated epermissions')) + self.w(self.req._('no associated permissions')) def require_permission_edit_form(self, entity): w = self.w _ = self.req._ - newperm = self.vreg.etype_class('EPermission')(self.req, None) + newperm = self.vreg.etype_class('CWPermission')(self.req, None) newperm.eid = self.req.varmaker.next() w(u'

' % _('add a new permission')) - begin_form(w, newperm, 'security', entity.rest_path()) - w(u'' - % eid_param('edito-require_permission', newperm.eid)) - w(u'' - % (eid_param('require_permission', newperm.eid), entity.eid)) - w(u'\n') - w(u'\n' - % (_("name"), _("label"), _('granted to groups'))) - if getattr(entity, '__permissions__', None): - # vocabfunc must be compliant with StaticVocabularyConstraint.vocabulary - # which takes only keyword parameters - wdg = StaticComboBoxWidget(self.vreg, self.schema['EPermission'], - self.schema['name'], self.schema['String'], - vocabfunc=lambda entity, x=entity: x.__permissions__) + form = EntityFieldsForm(self.req, None, entity=newperm, + form_buttons=[formwidgets.SubmitButton()], + domid='reqperm%s' % entity.eid, + __redirectvid='security', + __redirectpath=entity.rest_path()) + form.form_add_hidden('require_permission', entity.eid, role='object', + eidparam=True) + permnames = getattr(entity, '__permissions__', None) + cwpermschema = newperm.e_schema + if permnames is not None: + field = guess_field(cwpermschema, self.schema.rschema('name'), + widget=formwidgets.Select({'size': 1}), + choices=permnames) else: - wdg = newperm.get_widget('name') - w(u'\n' % wdg.edit_render(newperm)) - wdg = newperm.get_widget('label') - w(u'\n' % wdg.edit_render(newperm)) - wdg = newperm.get_widget('require_group') - w(u'\n' % wdg.edit_render(newperm)) - w(u'\n' % self.button_ok()) - w(u'

%s	%s	%s
%s	%s	%s	%s

') - w(u'\n') + field = guess_field(cwpermschema, self.schema.rschema('name')) + form.append_field(field) + field = guess_field(cwpermschema, self.schema.rschema('label')) + form.append_field(field) + field = guess_field(cwpermschema, self.schema.rschema('require_group')) + form.append_field(field) + self.w(form.form_render(renderer=HTableFormRenderer(display_progress_div=False))) - def button_ok(self): - return (u'' - % self.req._(stdmsgs.BUTTON_OK)) class ErrorView(AnyRsetView): """default view when no result has been found""" - __selectors__ = (yes,) + __select__ = yes() id = 'error' def page_title(self): @@ -193,10 +195,10 @@ def call(self): req = self.req.reset_headers() - _ = req._; w = self.w + w = self.w ex = req.data.get('ex')#_("unable to find exception information")) excinfo = req.data.get('excinfo') - title = _('an error occured') + title = self.req._('an error occured') w(u'

%s

' % title) if 'errmsg' in req.data: ex = req.data['errmsg'] @@ -220,39 +222,32 @@ return vcconf = self.config.vc_config() w(u"

") - eversion = vcconf.get('cubicweb', _('no version information')) + eversion = vcconf.get('cubicweb', self.req._('no version information')) # NOTE: tuple wrapping needed since eversion is itself a tuple w(u"CubicWeb version: %s
\n" % (eversion,)) - for pkg in self.config.cubes(): - pkgversion = vcconf.get(pkg, _('no version information')) - w(u"Package %s version: %s
\n" % (pkg, pkgversion)) + cversions = [] + for cube in self.config.cubes(): + cubeversion = vcconf.get(cube, self.req._('no version information')) + w(u"Package %s version: %s
\n" % (cube, cubeversion)) + cversions.append((cube, cubeversion)) w(u"

") # creates a bug submission link if SUBMIT_URL is set submiturl = self.config['submit-url'] - if submiturl: - binfo = text_error_description(ex, excinfo, req, eversion, - [(pkg, vcconf.get(pkg, _('no version information'))) - for pkg in self.config.cubes()]) - w(u'\n') submitmail = self.config['submit-mail'] - if submitmail: - binfo = text_error_description(ex, excinfo, req, eversion, - [(pkg, vcconf.get(pkg, _('no version information'))) - for pkg in self.config.cubes()]) - w(u'\n') + if submiturl or submitmail: + form = FieldsForm(self.req, set_error_url=False) + binfo = text_error_description(ex, excinfo, req, eversion, cversions) + form.form_add_hidden('description', binfo) + form.form_add_hidden('__bugreporting', '1') + if submitmail: + form.form_buttons = [formwidgets.SubmitButton(MAIL_SUBMIT_MSGID)] + form.action = req.build_url('reportbug') + w(form.form_render()) + if submiturl: + form.form_add_hidden('description_format', 'text/rest') + form.form_buttons = [formwidgets.SubmitButton(SUBMIT_MSGID)] + form.action = submiturl + w(form.form_render()) def exc_message(ex, encoding): @@ -276,242 +271,11 @@ binfo += '\n' return binfo -# some string we want to be internationalizable for nicer display of eproperty -# groups -_('navigation') -_('ui') -_('actions') -_('boxes') -_('components') -_('contentnavigation') - - -def make_togglable_link(nodeid, label, cookiename): - """builds a HTML link that switches the visibility & remembers it""" - action = u"javascript: toggle_and_remember_visibility('%s', '%s')" % \ - (nodeid, cookiename) - return u'%s' % (action, label) - -def css_class(someclass): - return someclass and 'class="%s"' % someclass or '' - -class SystemEpropertiesForm(FormMixIn, StartupView): - controller = 'edit' - id = 'systemepropertiesform' - title = _('site configuration') - require_groups = ('managers',) - category = 'startupview' - - def linkable(self): - return True - - def url(self): - """return the url associated with this view. We can omit rql here""" - return self.build_url('view', vid=self.id) - - def _cookie_name(self, somestr): - return str('%s_property_%s' % (self.config.appid, somestr)) - - def _group_status(self, group, default=u'hidden'): - cookies = self.req.get_cookie() - cookiename = self._cookie_name(group) - cookie = cookies.get(cookiename) - if cookie is None: - cookies[cookiename] = default - self.req.set_cookie(cookies, cookiename, maxage=None) - status = default - else: - status = cookie.value - return status - - def call(self, **kwargs): - """The default view representing the application's index""" - self.req.add_js(('cubicweb.edition.js', 'cubicweb.preferences.js')) - self.req.add_css('cubicweb.preferences.css') - vreg = self.vreg - values = self.defined_keys - groupedopts = {} - mainopts = {} - # "self.id=='systemepropertiesform'" to skip site wide properties on - # user's preference but not site's configuration - for key in vreg.user_property_keys(self.id=='systemepropertiesform'): - parts = key.split('.') - if parts[0] in vreg: - # appobject configuration - reg, oid, propid = parts - groupedopts.setdefault(reg, {}).setdefault(oid, []).append(key) - else: - mainopts.setdefault(parts[0], []).append(key) - # precompute form to consume error message - for group, keys in mainopts.items(): - mainopts[group] = self.form(keys, False) - for group, objects in groupedopts.items(): - for oid, keys in objects.items(): - groupedopts[group][oid] = self.form(keys, True) - - w = self.w - req = self.req - _ = req._ - w(u'

%s

\n' % _(self.title)) - w(self.error_message()) - for label, group, form in sorted((_(g), g, f) - for g, f in mainopts.iteritems()): - status = css_class(self._group_status(group)) #'hidden' (collapsed), or '' (open) ? - w(u'

%s

\n' % - (make_togglable_link('fieldset_' + group, label, - self._cookie_name(group)))) - w(u'

' % (group, status)) - w(u'

') - w(form) - w(u'

') - for label, group, objects in sorted((_(g), g, o) - for g, o in groupedopts.iteritems()): - status = css_class(self._group_status(group)) - w(u'

%s

\n' % - (make_togglable_link('fieldset_' + group, label, - self._cookie_name(group)))) - w(u'

' % (group, status)) - for label, oid, form in sorted((self.req.__('%s_%s' % (group, o)), o, f) - for o, f in objects.iteritems()): - w(u'

') - w(u'%s\n' % label) - docmsgid = '%s_%s_description' % (group, oid) - doc = _(docmsgid) - if doc != docmsgid: - w(u'

' % html_escape(doc)) - w(form) - w(u'

') - w(u'

') - - @property - @cached - def eprops_rset(self): - return self.req.execute('Any P,K,V WHERE P is EProperty, P pkey K, P value V, NOT P for_user U') - - @property - def defined_keys(self): - values = {} - for i, entity in enumerate(self.eprops_rset.entities()): - values[entity.pkey] = i - return values - - def entity_for_key(self, key): - values = self.defined_keys - if key in values: - entity = self.eprops_rset.get_entity(values[key], 0) - else: - entity = self.vreg.etype_class('EProperty')(self.req, None, None) - entity.eid = self.req.varmaker.next() - entity['value'] = self.vreg.property_value(key) - return entity - - def form(self, keys, splitlabel=False): - stream = UStringIO() - w = stream.write - w(u'\n') - return stream.getvalue() - - def form_row(self, w, key, splitlabel): - entity = self.entity_for_key(key) - eid = entity.eid - if splitlabel: - w(u'%s' % self.req._(key.split('.')[-1])) - else: - w(u'%s' % self.req._(key)) - wdg = self.vreg.property_value_widget(key, req=self.req) - error = wdg.render_error(entity) - w(u'' % (error and 'error' or '')) - w(error) - self.form_row_hiddens(w, entity, key) - w(wdg.edit_render(entity)) - w(u'\n') - w(u'%s' % wdg.render_help(entity)) - return entity - - def form_row_hiddens(self, w, entity, key): - eid = entity.eid - w(u'' % eid) - w(u'' % eid_param('__type', eid)) - w(u'' % (eid_param('pkey', eid), key)) - w(u'' % (eid_param('edits-pkey', eid), '')) - - -class EpropertiesForm(SystemEpropertiesForm): - id = 'epropertiesform' - title = _('preferences') - require_groups = ('users', 'managers') # we don't want guests to be able to come here - __selectors__ = chainfirst(none_rset, - chainall(one_line_rset, accept_rset)), - accepts = ('EUser',) - - @classmethod - def accept_rset(cls, req, rset, row, col): - if row is None: - row = 0 - score = super(EpropertiesForm, cls).accept_rset(req, rset, row, col) - # check current user is the rset user or he is in the managers group - if score and (req.user.eid == rset[row][col or 0] - or req.user.matching_groups('managers')): - return score - return 0 - - @property - def user(self): - if self.rset is None: - return self.req.user - return self.rset.get_entity(self.row or 0, self.col or 0) - - @property - @cached - def eprops_rset(self): - return self.req.execute('Any P,K,V WHERE P is EProperty, P pkey K, P value V,' - 'P for_user U, U eid %(x)s', {'x': self.user.eid}) - - def form_row_hiddens(self, w, entity, key): - super(EpropertiesForm, self).form_row_hiddens(w, entity, key) - # if user is in the managers group and the property is being created, - # we have to set for_user explicitly - if not entity.has_eid() and self.user.matching_groups('managers'): - eid = entity.eid - w(u'' - % (eid_param('edits-for_user', eid), INTERNAL_FIELD_VALUE)) - w(u'' - % (eid_param('for_user', eid), self.user.eid)) - - - - class ProcessInformationView(StartupView): id = 'info' + __select__ = none_rset() & match_user_groups('managers') + title = _('server information') - require_groups = ('managers',) def call(self, **kwargs): """display server information""" diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/massmailing.py --- a/web/views/massmailing.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/massmailing.py Thu May 14 12:48:11 2009 +0200 @@ -1,29 +1,32 @@ """Mass mailing form views :organization: Logilab -:copyright: 2007-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2007-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ +__docformat__ = "restructuredtext en" import operator -from logilab.mtconverter import html_escape - from cubicweb.interfaces import IEmailable -from cubicweb.common.view import EntityView -from cubicweb.common.selectors import implement_interface, match_user_group -from cubicweb.web.action import EntityAction +from cubicweb.selectors import implements, match_user_groups +from cubicweb.view import EntityView from cubicweb.web import stdmsgs - +from cubicweb.web.action import Action +from cubicweb.web.form import FieldsForm, FormViewMixIn +from cubicweb.web.formrenderers import FormRenderer +from cubicweb.web.formfields import StringField +from cubicweb.web.formwidgets import CheckBox, TextInput, AjaxWidget, ImgButton -class SendEmailAction(EntityAction): +_ = unicode + +class SendEmailAction(Action): + id = 'sendemail' + # XXX should check email is set as well + __select__ = implements(IEmailable) & match_user_groups('managers', 'users') + + title = _('send email') category = 'mainactions' - __selectors__ = (implement_interface, match_user_group) - accepts_interfaces = (IEmailable,) # XXX should check email is set as well - require_groups = ('managers', 'users') - - id = 'sendemail' - title = _('send email') def url(self): params = {'vid': 'massmailing', '__force_display': 1} @@ -33,97 +36,92 @@ **params) -class MassMailingForm(EntityView): +class MassMailingForm(FieldsForm): id = 'massmailing' - __selectors__ = (implement_interface, match_user_group) - accepts_interfaces = (IEmailable,) - require_groups = ('managers', 'users') - + + sender = StringField(widget=TextInput({'disabled': 'disabled'}), label=_('From:')) + recipient = StringField(widget=CheckBox(), label=_('Recipients:')) + subject = StringField(label=_('Subject:')) + mailbody = StringField(widget=AjaxWidget(wdgtype='TemplateTextField', + inputid='mailbody')) + form_buttons = [ImgButton('sendbutton', "javascript: $('#sendmail').submit()", + _('send email'), 'SEND_EMAIL_ICON'), + ImgButton('cancelbutton', "javascript: history.back()", + stdmsgs.BUTTON_CANCEL, 'CANCEL_EMAIL_ICON')] + + def form_field_vocabulary(self, field): + if field.name == 'recipient': + vocab = [(entity.get_email(), entity.eid) for entity in self.rset.entities()] + return [(label, value) for label, value in vocab if label] + return super(MassMailingForm, self).form_field_vocabulary(field) + + def form_field_value(self, field, values): + if field.name == 'recipient': + return [entity.eid for entity in self.rset.entities() if entity.get_email()] + elif field.name == 'mailbody': + field.widget.attrs['cubicweb:variables'] = ','.join(self.get_allowed_substitutions()) + return super(MassMailingForm, self).form_field_value(field, values) + + def get_allowed_substitutions(self): + attrs = [] + for coltype in self.rset.column_types(0): + eclass = self.vreg.etype_class(coltype) + attrs.append(eclass.allowed_massmail_keys()) + return sorted(reduce(operator.and_, attrs)) - form_template = u""" -

- -

- """ + def build_substitutions_help(self): + insertLink = u'%%(%s)s' + substs = (u'

' % (insertLink % (subst, subst)) + for subst in self.get_allowed_substitutions()) + helpmsg = self.req._('You can use any of the following substitutions in your text') + return u'

%s%s

' % ( + helpmsg, u'\n'.join(substs)) + + +class MassMailingFormRenderer(FormRenderer): + button_bar_class = u'toolbar' + + def _render_fields(self, fields, w, form): + w(u'') + for field in fields: + if field.name == 'mailbody': + w(u'

') + self._render_toolbar(w, form) + w(u'') + w(u'') + w(u'' % self.render_label(form, field)) + w(u'') + w(u'' % form.build_substitutions_help()) + w(u'') + else: + w(u'') + w(u'

') + else: + w(u'
%s	') + w(field.render(form, self)) + if field.name == 'mailbody': + w(u'	%s

') + + def _render_toolbar(self, w, form): + w(u'') + + def render_buttons(self, w, form): + pass + +class MassMailingFormView(FormViewMixIn, EntityView): + id = 'massmailing' + __select__ = implements(IEmailable) & match_user_groups('managers', 'users') def call(self): req = self.req req.add_js('cubicweb.widgets.js') req.add_css('cubicweb.mailform.css') from_addr = '%s <%s>' % (req.user.dc_title(), req.user.get_email()) - ctx = { - 'from_header' : req._('From: '), - 'from' : html_escape(from_addr), - 'substitutions' : self._build_substitutions_help(), - 'recipients_header' : req._('Recipients: '), - 'subject' : req._('Subject: '), - 'body' : req._('Email body: '), - 'variables' : ','.join(self._get_allowed_substitutions()), - 'recipients' : self._build_recipients_list(), - 'cancel' : req._(stdmsgs.BUTTON_CANCEL), - 'cancelimgpath' : req.external_resource('CANCEL_EMAIL_ICON'), - 'send' : req._('send email'), - 'sendimgpath' : req.external_resource('SEND_EMAIL_ICON'), - } - self.w(self.form_template % ctx) - - - def _get_allowed_substitutions(self): - coltypes = self.rset.column_types(0) - attrs = [] - for coltype in coltypes: - eclass = self.vreg.etype_class(coltype) - attrs.append(eclass.allowed_massmail_keys()) - return sorted(reduce(operator.and_, attrs)) - - def _build_recipients_list(self): - emails = ((entity.eid, entity.get_email()) for entity in self.rset.entities()) - checkboxes = (u'%s' - % (eid, html_escape(email)) for eid, email in emails if email) - boxes = (u'

' % cbox for cbox in checkboxes) - return u'

' % u'\n'.join(boxes) - - - def _build_substitutions_help(self): - insertLink = u'%%(%s)s' - substs = (u'

' % (insertLink % (subst, subst)) - for subst in self._get_allowed_substitutions()) - helpmsg = self.req._('You can use any of the following substitutions in your text') - return u'

%s%s

' % ( - helpmsg, u'\n'.join(substs)) - - + form = self.vreg.select_object('forms', 'massmailing', self.req, self.rset, + action='sendmail', domid='sendmail') + self.w(form.form_render(sender=from_addr, renderer=MassMailingFormRenderer())) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/navigation.py --- a/web/views/navigation.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/navigation.py Thu May 14 12:48:11 2009 +0200 @@ -1,7 +1,7 @@ """navigation components definition for CubicWeb web client :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -9,11 +9,12 @@ from rql.nodes import VariableRef, Constant from logilab.mtconverter import html_escape +from logilab.common.deprecation import obsolete from cubicweb.interfaces import IPrevNext -from cubicweb.common.selectors import (paginated_rset, sorted_rset, - primary_view, match_context_prop, - one_line_rset, implement_interface) +from cubicweb.selectors import (paginated_rset, sorted_rset, + primary_view, match_context_prop, + one_line_rset, implements) from cubicweb.common.uilib import cut from cubicweb.web.component import EntityVComponent, NavigationComponent @@ -43,7 +44,7 @@ w(u'[ %s ]' % u' | '.join(blocklist)) w(u' %s' % self.next_link(params)) w(u'

') - + def index_display(self, start, stop): return u'%s - %s' % (start+1, stop+1) @@ -51,11 +52,11 @@ """sorted navigation apply if navigation is needed (according to page size) and if the result set is sorted """ - __selectors__ = (paginated_rset, sorted_rset) - + __select__ = paginated_rset() & sorted_rset() + # number of considered chars to build page links nb_chars = 5 - + def display_func(self, rset, col, attrname): req = self.req if attrname is not None: @@ -69,7 +70,7 @@ def index_display(row): return rset.get_entity(row, col).view('text') return index_display - + def call(self): """displays links to navigate accross pages of a result set @@ -145,14 +146,14 @@ def limit_rset_using_paged_nav(self, req, rset, w, forcedisplay=False, - show_all_option=True, page_size = None): + show_all_option=True, page_size=None): showall = forcedisplay or req.form.get('__force_display') is not None nav = not showall and self.vreg.select_component('navigation', req, rset, page_size=page_size) if nav: # get boundaries before component rendering start, stop = nav.page_boundaries() - nav.dispatch(w=w) + nav.render(w=w) params = dict(req.form) nav.clean_params(params) # make a link to see them all @@ -165,13 +166,13 @@ # monkey patch base View class to add a .pagination(req, rset, w, forcedisplay) # method to be called on view's result set and printing pages index in the view -from cubicweb.common.view import View -# XXX deprecated, use paginate -View.pagination = limit_rset_using_paged_nav +from cubicweb.view import View +View.pagination = obsolete('.pagination is deprecated, use paginate')(limit_rset_using_paged_nav) -def paginate(view, show_all_option=True, w=None): +def paginate(view, show_all_option=True, w=None, page_size=None): limit_rset_using_paged_nav(view, view.req, view.rset, w or view.w, - not view.need_navigation, show_all_option) + not view.need_navigation, show_all_option, + page_size=page_size) View.paginate = paginate class NextPrevNavigationComponent(EntityVComponent): @@ -180,9 +181,8 @@ # itself title = _('contentnavigation_prevnext') help = _('contentnavigation_prevnext_description') - __selectors__ = (one_line_rset, primary_view, - match_context_prop, implement_interface) - accepts_interfaces = (IPrevNext,) + __select__ = (one_line_rset() & primary_view() + & match_context_prop() & implements(IPrevNext)) context = 'navbottom' order = 10 def call(self, view=None): @@ -212,7 +212,7 @@ html_escape(previous.absolute_url()), self.req._('i18nprevnext_previous'), html_escape(cut(previous.dc_title(), textsize))) - + def next_link(self, next, textsize): return u'%s >>' % ( html_escape(next.absolute_url()), diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/old_calendar.py --- a/web/views/old_calendar.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/old_calendar.py Thu May 14 12:48:11 2009 +0200 @@ -1,30 +1,22 @@ """html calendar views :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ -from mx.DateTime import DateTime, RelativeDateTime, Date, Time, today, Sunday +from datetime import date, time, timedelta from logilab.mtconverter import html_escape from cubicweb.interfaces import ICalendarViews -from cubicweb.common.utils import date_range -from cubicweb.common.selectors import implement_interface -from cubicweb.common.registerers import priority_registerer -from cubicweb.common.view import EntityView +from cubicweb.utils import ONEDAY, ONEWEEK, date_range, first_day, last_day, previous_month, next_month, days_in_month +from cubicweb.selectors import implements +from cubicweb.view import EntityView -# Define some useful constants -ONE_MONTH = RelativeDateTime(months=1) -TODAY = today() -THIS_MONTH = TODAY.month -THIS_YEAR = TODAY.year -# mx.DateTime and ustrftime could be used to build WEEKDAYS +# used by i18n tools WEEKDAYS = [_("monday"), _("tuesday"), _("wednesday"), _("thursday"), _("friday"), _("saturday"), _("sunday")] - -# used by i18n tools MONTHNAMES = [ _('january'), _('february'), _('march'), _('april'), _('may'), _('june'), _('july'), _('august'), _('september'), _('october'), _('november'), _('december') @@ -32,9 +24,7 @@ class _CalendarView(EntityView): """base calendar view containing helpful methods to build calendar views""" - __registerer__ = priority_registerer - __selectors__ = (implement_interface,) - accepts_interfaces = (ICalendarViews,) + __select__ = implements(ICalendarViews,) need_navigation = False # Navigation building methods / views #################################### @@ -45,40 +35,45 @@ %s%s """ % (PREV, NEXT) - + def nav_header(self, date, smallshift=3, bigshift=9): """prints shortcut links to go to previous/next steps (month|week)""" - prev1 = date - RelativeDateTime(months=smallshift) - prev2 = date - RelativeDateTime(months=bigshift) - next1 = date + RelativeDateTime(months=smallshift) - next2 = date + RelativeDateTime(months=bigshift) - rql, vid = self.rset.printable_rql(), self.id + prev1 = next1 = prev2 = nex2 = date + prev1 = previous_month(date, smallshift) + next1 = next_month(date, smallshift) + prev2 = previous_month(date, bigshift) + next2 = next_month(date, bigshift) + rql = self.rset.printable_rql() return self.NAV_HEADER % ( - html_escape(self.build_url(rql=rql, vid=vid, year=prev2.year, month=prev2.month)), - html_escape(self.build_url(rql=rql, vid=vid, year=prev1.year, month=prev1.month)), - html_escape(self.build_url(rql=rql, vid=vid, year=next1.year, month=next1.month)), - html_escape(self.build_url(rql=rql, vid=vid, year=next2.year, month=next2.month))) - - + html_escape(self.build_url(rql=rql, vid=self.id, year=prev2.year, + month=prev2.month)), + html_escape(self.build_url(rql=rql, vid=self.id, year=prev1.year, + month=prev1.month)), + html_escape(self.build_url(rql=rql, vid=self.id, year=next1.year, + month=next1.month)), + html_escape(self.build_url(rql=rql, vid=self.id, year=next2.year, + month=next2.month))) + + # Calendar building methods ############################################## - + def build_calendars(self, schedule, begin, end): """build several HTML calendars at once, one for each month between begin and end """ return [self.build_calendar(schedule, date) - for date in date_range(begin, end, incr=ONE_MONTH)] - + for date in date_range(begin, end, incmonth=1)] + def build_calendar(self, schedule, first_day): """method responsible for building *one* HTML calendar""" # FIXME iterates between [first_day-first_day.day_of_week ; # last_day+6-last_day.day_of_week] umonth = self.format_date(first_day, '%B %Y') # localized month name rows = [] - current_row = [NO_CELL] * first_day.day_of_week - for daynum in xrange(0, first_day.days_in_month): + current_row = [NO_CELL] * first_day.weekday() + for daynum in xrange(0, days_in_month(first_day)): # build cell day - day = first_day + daynum + day = first_day + timedelta(daynum) events = schedule.get(day) if events: events = [u'\n'.join(event) for event in events.values()] @@ -86,13 +81,13 @@ else: current_row.append(EMPTY_CELL % (daynum+1)) # store & reset current row on Sundays - if day.day_of_week == Sunday: - rows.append(u'%s%s' % (WEEKNUM_CELL % day.iso_week[1], ''.join(current_row))) + if day.weekday() == 6: + rows.append(u'%s%s' % (WEEKNUM_CELL % day.isocalendar()[1], ''.join(current_row))) current_row = [] - current_row.extend([NO_CELL] * (Sunday-day.day_of_week)) + current_row.extend([NO_CELL] * (6-day.weekday())) rql = self.rset.printable_rql() - if day.day_of_week != Sunday: - rows.append(u'%s%s' % (WEEKNUM_CELL % day.iso_week[1], ''.join(current_row))) + if day.weekday() != 6: + rows.append(u'%s%s' % (WEEKNUM_CELL % day.isocalendar()[1], ''.join(current_row))) url = self.build_url(rql=rql, vid='calendarmonth', year=first_day.year, month=first_day.month) monthlink = u'%s' % (html_escape(url), umonth) @@ -109,35 +104,37 @@ returns { day1 : { hour : [views] }, day2 : { hour : [views] } ... } """ - # put this here since all sub views are calling this method - self.req.add_css('cubicweb.calendar.css') + # put this here since all sub views are calling this method + self.req.add_css('cubicweb.calendar.css') schedule = {} for row in xrange(len(self.rset.rows)): entity = self.entity(row) infos = u'

' infos += self.view(itemvid, self.rset, row=row) infos += u'

' - for date in entity.matching_dates(begin, end): - day = Date(date.year, date.month, date.day) - time = Time(date.hour, date.minute, date.second) + for date_ in entity.matching_dates(begin, end): + day = date(date_.year, date_.month, date_.day) + try: + dt = time(date_.hour, date_.minute, date_.second) + except AttributeError: + # date instance + dt = time(0, 0, 0) schedule.setdefault(day, {}) - schedule[day].setdefault(time, []).append(infos) + schedule[day].setdefault(dt, []).append(infos) return schedule - + @staticmethod - def get_date_range(day=TODAY, shift=4): + def get_date_range(day, shift=4): """returns a couple (begin, end) is the first day of current_month - shift is the last day of current_month + (shift+1) """ - first_day_in_month = DateTime(day.year, day.month, 1) - begin = first_day_in_month - RelativeDateTime(months=shift) - end = (first_day_in_month + RelativeDateTime(months=shift+1)) - 1 + begin = first_day(previous_month(day, shift)) + end = last_day(next_month(day, shift)) return begin, end - def _build_ampm_cells(self, daynum, events): """create a view without any hourly details. @@ -167,11 +164,11 @@ id = 'calendaryear' title = _('calendar (year)') - def call(self, year=THIS_YEAR, month=THIS_MONTH): + def call(self, year=None, month=None): """this view renders a 3x3 calendars' table""" - year = int(self.req.form.get('year', year)) - month = int(self.req.form.get('month', month)) - center_date = DateTime(year, month) + year = year or int(self.req.form.get('year', date.today().year)) + month = month or int(self.req.form.get('month', date.today().month)) + center_date = date(year, month, 1) begin, end = self.get_date_range(day=center_date) schedule = self._mk_schedule(begin, end) self.w(self.nav_header(center_date)) @@ -186,22 +183,22 @@ id = 'calendarsemester' title = _('calendar (semester)') - def call(self, year=THIS_YEAR, month=THIS_MONTH): - year = int(self.req.form.get('year', year)) - month = int(self.req.form.get('month', month)) - begin = DateTime(year, month) - RelativeDateTime(months=2) - end = DateTime(year, month) + RelativeDateTime(months=3) + def call(self, year=None, month=None): + year = year or int(self.req.form.get('year', date.today().year)) + month = month or int(self.req.form.get('month', date.today().month)) + begin = previous_month(date(year, month, 1), 2) + end = next_month(date(year, month, 1), 3) schedule = self._mk_schedule(begin, end) - self.w(self.nav_header(DateTime(year, month), 1, 6)) + self.w(self.nav_header(date(year, month, 1), 1, 6)) self.w(u'') self.build_calendars(schedule, begin, end) self.w(u'

') - self.w(self.nav_header(DateTime(year, month), 1, 6)) + self.w(self.nav_header(date(year, month, 1), 1, 6)) def build_calendars(self, schedule, begin, end): self.w(u'') rql = self.rset.printable_rql() - for cur_month in date_range(begin, end, incr=ONE_MONTH): + for cur_month in date_range(begin, end, incmonth=1): umonth = u'%s %s' % (self.format_date(cur_month, '%B'), cur_month.year) url = self.build_url(rql=rql, vid=self.id, year=cur_month.year, month=cur_month.month) @@ -211,33 +208,33 @@ _ = self.req._ for day_num in xrange(31): self.w(u'') - for cur_month in date_range(begin, end, incr=ONE_MONTH): - if day_num >= cur_month.days_in_month: + for cur_month in date_range(begin, end, incmonth=1): + if day_num >= days_in_month(cur_month): self.w(u'%s%s' % (NO_CELL, NO_CELL)) else: - day = DateTime(cur_month.year, cur_month.month, day_num+1) + day = date(cur_month.year, cur_month.month, day_num+1) events = schedule.get(day) - self.w(u'%s %s\n' % (_(WEEKDAYS[day.day_of_week])[0].upper(), day_num+1)) + self.w(u'%s %s\n' % (_(WEEKDAYS[day.weekday()])[0].upper(), day_num+1)) self.format_day_events(day, events) self.w(u'') - + def format_day_events(self, day, events): if events: events = ['\n'.join(event) for event in events.values()] self.w(WEEK_CELL % '\n'.join(events)) else: self.w(WEEK_EMPTY_CELL) - + class MonthCalendarView(_CalendarView): """this view renders a 3x1 calendars' table""" id = 'calendarmonth' title = _('calendar (month)') - - def call(self, year=THIS_YEAR, month=THIS_MONTH): - year = int(self.req.form.get('year', year)) - month = int(self.req.form.get('month', month)) - center_date = DateTime(year, month) + + def call(self, year=None, month=None): + year = year or int(self.req.form.get('year', date.today().year)) + month = month or int(self.req.form.get('month', date.today().month)) + center_date = date(year, month, 1) begin, end = self.get_date_range(day=center_date, shift=1) schedule = self._mk_schedule(begin, end) calendars = self.build_calendars(schedule, begin, end) @@ -245,41 +242,41 @@ self.w(BIG_CALENDARS_PAGE % tuple(calendars)) self.w(self.nav_header(center_date, 1, 3)) - + class WeekCalendarView(_CalendarView): """this view renders a calendar for week events""" id = 'calendarweek' title = _('calendar (week)') - - def call(self, year=THIS_YEAR, week=TODAY.iso_week[1]): - year = int(self.req.form.get('year', year)) - week = int(self.req.form.get('week', week)) - day0 = DateTime(year) - first_day_of_week = (day0-day0.day_of_week) + 7*week - begin, end = first_day_of_week-7, first_day_of_week+14 + + def call(self, year=None, week=None): + year = year or int(self.req.form.get('year', date.today().year)) + week = week or int(self.req.form.get('week', date.today().isocalendar()[1])) + day0 = date(year, 1, 1) + first_day_of_week = day0 - day0.weekday()*ONEDAY + ONEWEEK + begin, end = first_day_of_week- ONEWEEK, first_day_of_week + 2*ONEWEEK schedule = self._mk_schedule(begin, end, itemvid='calendarlargeitem') self.w(self.nav_header(first_day_of_week)) self.w(u'') - _weeks = [(first_day_of_week-7, first_day_of_week-1), - (first_day_of_week, first_day_of_week+6), - (first_day_of_week+7, first_day_of_week+13)] + _weeks = [(first_day_of_week-ONEWEEK, first_day_of_week-ONEDAY), + (first_day_of_week, first_day_of_week+6*ONEDAY), + (first_day_of_week+ONEWEEK, first_day_of_week+13*ONEDAY)] self.build_calendar(schedule, _weeks) self.w(u'

') self.w(self.nav_header(first_day_of_week)) - + def build_calendar(self, schedule, weeks): rql = self.rset.printable_rql() _ = self.req._ - for monday, sunday in weeks: + for monday, sunday in weeks: umonth = self.format_date(monday, '%B %Y') url = self.build_url(rql=rql, vid='calendarmonth', year=monday.year, month=monday.month) monthlink = '%s' % (html_escape(url), umonth) self.w(u'%s %s (%s)' \ - % (_('week'), monday.iso_week[1], monthlink)) + % (_('week'), monday.isocalendar()[1], monthlink)) for day in date_range(monday, sunday): self.w(u'') - self.w(u'%s' % _(WEEKDAYS[day.day_of_week])) + self.w(u'%s' % _(WEEKDAYS[day.weekday()])) self.w(u'%s' % (day.strftime('%Y-%m-%d'))) events = schedule.get(day) if events: @@ -288,35 +285,35 @@ else: self.w(WEEK_EMPTY_CELL) self.w(u'') - + def nav_header(self, date, smallshift=1, bigshift=3): """prints shortcut links to go to previous/next steps (month|week)""" - prev1 = date - RelativeDateTime(weeks=smallshift) - prev2 = date - RelativeDateTime(weeks=bigshift) - next1 = date + RelativeDateTime(weeks=smallshift) - next2 = date + RelativeDateTime(weeks=bigshift) - rql, vid = self.rset.printable_rql(), self.id + prev1 = date - ONEWEEK * smallshift + prev2 = date - ONEWEEK * bigshift + next1 = date + ONEWEEK * smallshift + next2 = date + ONEWEEK * bigshift + rql = self.rset.printable_rql() return self.NAV_HEADER % ( - html_escape(self.build_url(rql=rql, vid=vid, year=prev2.year, week=prev2.iso_week[1])), - html_escape(self.build_url(rql=rql, vid=vid, year=prev1.year, week=prev1.iso_week[1])), - html_escape(self.build_url(rql=rql, vid=vid, year=next1.year, week=next1.iso_week[1])), - html_escape(self.build_url(rql=rql, vid=vid, year=next2.year, week=next2.iso_week[1]))) + html_escape(self.build_url(rql=rql, vid=self.id, year=prev2.year, week=prev2.isocalendar()[1])), + html_escape(self.build_url(rql=rql, vid=self.id, year=prev1.year, week=prev1.isocalendar()[1])), + html_escape(self.build_url(rql=rql, vid=self.id, year=next1.year, week=next1.isocalendar()[1])), + html_escape(self.build_url(rql=rql, vid=self.id, year=next2.year, week=next2.isocalendar()[1]))) - + class AMPMYearCalendarView(YearCalendarView): id = 'ampmcalendaryear' title = _('am/pm calendar (year)') - + def build_calendar(self, schedule, first_day): """method responsible for building *one* HTML calendar""" umonth = self.format_date(first_day, '%B %Y') # localized month name rows = [] # each row is: (am,pm), (am,pm) ... week_title - current_row = [(NO_CELL, NO_CELL, NO_CELL)] * first_day.day_of_week + current_row = [(NO_CELL, NO_CELL, NO_CELL)] * first_day.weekday() rql = self.rset.printable_rql() - for daynum in xrange(0, first_day.days_in_month): + for daynum in xrange(0, days_in_month(first_day)): # build cells day - day = first_day + daynum + day = first_day + timedelta(daynum) events = schedule.get(day) if events: current_row.append((AMPM_DAY % (daynum+1),) + self._build_ampm_cells(daynum, events)) @@ -325,18 +322,18 @@ AMPM_EMPTY % ("amCell", "am"), AMPM_EMPTY % ("pmCell", "pm"))) # store & reset current row on Sundays - if day.day_of_week == Sunday: + if day.weekday() == 6: url = self.build_url(rql=rql, vid='ampmcalendarweek', - year=day.year, week=day.iso_week[1]) + year=day.year, week=day.isocalendar()[1]) weeklink = '%s' % (html_escape(url), - day.iso_week[1]) + day.isocalendar()[1]) current_row.append(WEEKNUM_CELL % weeklink) rows.append(current_row) current_row = [] - current_row.extend([(NO_CELL, NO_CELL, NO_CELL)] * (Sunday-day.day_of_week)) + current_row.extend([(NO_CELL, NO_CELL, NO_CELL)] * (6-day.weekday())) url = self.build_url(rql=rql, vid='ampmcalendarweek', - year=day.year, week=day.iso_week[1]) - weeklink = '%s' % (html_escape(url), day.iso_week[1]) + year=day.year, week=day.isocalendar()[1]) + weeklink = '%s' % (html_escape(url), day.isocalendar()[1]) current_row.append(WEEKNUM_CELL % weeklink) rows.append(current_row) # build two rows for each week: am & pm @@ -354,7 +351,7 @@ year=first_day.year, month=first_day.month) monthlink = '%s' % (html_escape(url), umonth) return CALENDAR(self.req) % (monthlink, '\n'.join(formatted_rows)) - + class AMPMSemesterCalendarView(SemesterCalendarView): @@ -365,7 +362,7 @@ def build_calendars(self, schedule, begin, end): self.w(u'') rql = self.rset.printable_rql() - for cur_month in date_range(begin, end, incr=ONE_MONTH): + for cur_month in date_range(begin, end, incmonth=1): umonth = u'%s %s' % (self.format_date(cur_month, '%B'), cur_month.year) url = self.build_url(rql=rql, vid=self.id, year=cur_month.year, month=cur_month.month) @@ -375,22 +372,22 @@ _ = self.req._ for day_num in xrange(31): self.w(u'') - for cur_month in date_range(begin, end, incr=ONE_MONTH): - if day_num >= cur_month.days_in_month: + for cur_month in date_range(begin, end, incmonth=1): + if day_num >= days_in_month(cur_month): self.w(u'%s%s%s' % (NO_CELL, NO_CELL, NO_CELL)) else: - day = DateTime(cur_month.year, cur_month.month, day_num+1) + day = date(cur_month.year, cur_month.month, day_num+1) events = schedule.get(day) - self.w(u'%s %s\n' % (_(WEEKDAYS[day.day_of_week])[0].upper(), + self.w(u'%s %s\n' % (_(WEEKDAYS[day.weekday()])[0].upper(), day_num+1)) self.format_day_events(day, events) self.w(u'') - + def format_day_events(self, day, events): if events: self.w(u'\n'.join(self._build_ampm_cells(day, events))) else: - self.w(u'%s %s'% (AMPM_EMPTY % ("amCell", "am"), + self.w(u'%s %s'% (AMPM_EMPTY % ("amCell", "am"), AMPM_EMPTY % ("pmCell", "pm"))) @@ -403,11 +400,11 @@ """method responsible for building *one* HTML calendar""" umonth = self.format_date(first_day, '%B %Y') # localized month name rows = [] # each row is: (am,pm), (am,pm) ... week_title - current_row = [(NO_CELL, NO_CELL, NO_CELL)] * first_day.day_of_week + current_row = [(NO_CELL, NO_CELL, NO_CELL)] * first_day.weekday() rql = self.rset.printable_rql() - for daynum in xrange(0, first_day.days_in_month): + for daynum in xrange(0, days_in_month(first_day)): # build cells day - day = first_day + daynum + day = first_day + timedelta(daynum) events = schedule.get(day) if events: current_row.append((AMPM_DAY % (daynum+1),) + self._build_ampm_cells(daynum, events)) @@ -416,19 +413,19 @@ AMPM_EMPTY % ("amCell", "am"), AMPM_EMPTY % ("pmCell", "pm"))) # store & reset current row on Sundays - if day.day_of_week == Sunday: + if day.weekday() == 6: url = self.build_url(rql=rql, vid='ampmcalendarweek', - year=day.year, week=day.iso_week[1]) + year=day.year, week=day.isocalendar()[1]) weeklink = '%s' % (html_escape(url), - day.iso_week[1]) + day.isocalendar()[1]) current_row.append(WEEKNUM_CELL % weeklink) rows.append(current_row) current_row = [] - current_row.extend([(NO_CELL, NO_CELL, NO_CELL)] * (Sunday-day.day_of_week)) + current_row.extend([(NO_CELL, NO_CELL, NO_CELL)] * (6-day.weekday())) url = self.build_url(rql=rql, vid='ampmcalendarweek', - year=day.year, week=day.iso_week[1]) + year=day.year, week=day.isocalendar()[1]) weeklink = '%s' % (html_escape(url), - day.iso_week[1]) + day.isocalendar()[1]) current_row.append(WEEKNUM_CELL % weeklink) rows.append(current_row) # build two rows for each week: am & pm @@ -446,10 +443,10 @@ year=first_day.year, month=first_day.month) monthlink = '%s' % (html_escape(url), umonth) - return CALENDAR(self.req) % (monthlink, '\n'.join(formatted_rows)) - + return CALENDAR(self.req) % (monthlink, '\n'.join(formatted_rows)) - + + class AMPMWeekCalendarView(WeekCalendarView): """this view renders a 3x1 calendars' table""" id = 'ampmcalendarweek' @@ -465,17 +462,17 @@ year=monday.year, month=monday.month) monthlink = '%s' % (html_escape(url), umonth) w(u'%s' % ( - WEEK_TITLE % (_('week'), monday.iso_week[1], monthlink))) + WEEK_TITLE % (_('week'), monday.isocalendar()[1], monthlink))) w(u'%s '% _(u'Date')) for day in date_range(monday, sunday): events = schedule.get(day) - style = day.day_of_week % 2 and "even" or "odd" + style = day.weekday() % 2 and "even" or "odd" w(u'' % style) if events: hours = events.keys() hours.sort() w(AMPM_DAYWEEK % ( - len(hours), _(WEEKDAYS[day.day_of_week]), + len(hours), _(WEEKDAYS[day.weekday()]), self.format_date(day))) w(AMPM_WEEK_CELL % ( hours[0].hour, hours[0].minute, @@ -487,7 +484,7 @@ '\n'.join(events[hour])))) else: w(AMPM_DAYWEEK_EMPTY % ( - _(WEEKDAYS[day.day_of_week]), + _(WEEKDAYS[day.weekday()]), self.format_date(day))) w(WEEK_EMPTY_CELL) w(u'') diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/owl.py --- a/web/views/owl.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/owl.py Thu May 14 12:48:11 2009 +0200 @@ -1,11 +1,20 @@ +"""produces some Ontology Web Language schema and views + +:organization: Logilab +:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + from logilab.mtconverter import TransformError, xml_escape -from cubicweb.common.view import StartupView -from cubicweb.common.view import EntityView +from cubicweb.view import StartupView, EntityView +from cubicweb.web.action import Action +from cubicweb.selectors import none_rset, match_view _ = unicode -OWL_CARD_MAP = {'1': '', +OWL_CARD_MAP = {'1': '', '?': '1', '+': '1', '*': '' @@ -28,7 +37,7 @@ -]> +]> - %(appid)s Cubicweb OWL Ontology + %(appid)s Cubicweb OWL Ontology ''' @@ -62,7 +71,7 @@ self.visit_schema(skipmeta=skipmeta) if writeprefix: self.w(OWL_CLOSING_ROOT) - + def visit_schema(self, skiprels=DEFAULT_SKIP_RELS, skipmeta=True): """get a layout for a whole schema""" entities = sorted([eschema for eschema in self.schema.entities() @@ -80,8 +89,8 @@ def visit_entityschema(self, eschema, skiprels=()): """get a layout for an entity OWL schema""" - self.w(u''% eschema) - self.w(u'') + self.w(u''% eschema) + self.w(u'') for rschema, targetschemas, role in eschema.relation_definitions(): if rschema.type in skiprels: continue @@ -104,7 +113,7 @@ ''' % (label, cardtag)) self.w(u'') - + for rschema, aschema in eschema.attribute_definitions(): if not (rschema.has_local_role('read') or rschema.has_perm(self.req, 'read')): continue @@ -116,10 +125,10 @@ -''' +''' % aname) self.w(u'') - + def visit_property_schema(self, eschema, skiprels=()): """get a layout for property entity OWL schema""" for rschema, targetschemas, role in eschema.relation_definitions(): @@ -132,7 +141,7 @@ self.w(u''' - + ''' % (label, eschema, oeschema.type)) def visit_property_object_schema(self, eschema): @@ -148,16 +157,15 @@ ''' % (aname, eschema, OWL_TYPE_MAP[aschema.type])) - + class OWLABOXView(EntityView): '''This view represents a part of the ABOX for a given entity.''' - + id = 'owlabox' title = _('owlabox') templatable = False - accepts = ('Any',) content_type = 'application/xml' # 'text/xml' - + def call(self): self.w(OWL_OPENING_ROOT % {'appid': self.schema.name}) for i in xrange(self.rset.rowcount): @@ -167,13 +175,11 @@ def cell_call(self, row, col, skiprels=DEFAULT_SKIP_RELS): self.wview('owlaboxitem', self.rset, row=row, col=col, skiprels=skiprels) - + class OWLABOXItemView(EntityView): '''This view represents a part of the ABOX for a given entity.''' - id = 'owlaboxitem' templatable = False - accepts = ('Any',) content_type = 'application/xml' # 'text/xml' def cell_call(self, row, col, skiprels=DEFAULT_SKIP_RELS): @@ -202,10 +208,20 @@ if not (rschema.has_local_role('read') or rschema.has_perm(self.req, 'read')): continue if role == 'object': - attr = 'reverse_%s' % rschema.type + attr = 'reverse_%s' % rschema.type else: - attr = rschema.type + attr = rschema.type for x in getattr(entity, attr): self.w(u'<%s>%s %s' % (attr, x.id, x.eid, attr)) self.w(u''% eschema) + +class DownloadOWLSchemaAction(Action): + id = 'download_as_owl' + __select__ = none_rset() & match_view('schema') + + category = 'mainactions' + title = _('download schema as owl') + + def url(self): + return self.build_url('view', vid='owl') diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/plots.py --- a/web/views/plots.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/plots.py Thu May 14 12:48:11 2009 +0200 @@ -2,8 +2,10 @@ from logilab.common import flatten +from cubicweb.vregistry import objectify_selector from cubicweb.web.views import baseviews +@objectify_selector def plot_selector(cls, req, rset, *args, **kwargs): """accept result set with at least one line and two columns of result all columns after second must be of numerical types""" @@ -23,8 +25,7 @@ import sys if 'matplotlib.backends' not in sys.modules: matplotlib.use('Agg') - from matplotlib.ticker import FormatStrFormatter - from pylab import figure, show + from pylab import figure except ImportError: pass else: @@ -34,7 +35,7 @@ binary = True content_type = 'image/png' _plot_count = 0 - __selectors__ = (plot_selector,) + __select__ = plot_selector() def call(self, width=None, height=None): # compute dimensions @@ -55,7 +56,7 @@ abscisses = [row[0] for row in self.rset] courbes = [] nbcols = len(self.rset.rows[0]) - for col in range(1,nbcols): + for col in xrange(1, nbcols): courbe = [row[col] for row in self.rset] courbes.append(courbe) if not courbes: @@ -70,7 +71,7 @@ except ValueError: xlabels = abscisses abscisses = range(len(xlabels)) - for idx,courbe in enumerate(courbes): + for idx, courbe in enumerate(courbes): ax.plot(abscisses, courbe, '%sv-' % colors[idx], label=self.rset.description[0][idx+1]) ax.autoscale_view() alldata = flatten(courbes) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/primary.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/primary.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,240 @@ +"""The default primary view + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" +_ = unicode + +from warnings import warn + +from logilab.mtconverter import html_escape + +from cubicweb import Unauthorized +from cubicweb.view import EntityView +from cubicweb.web import uicfg + + + +class PrimaryView(EntityView): + """the full view of an non final entity""" + id = 'primary' + title = _('primary') + show_attr_label = True + show_rel_label = True + skip_none = True + rsection = uicfg.primaryview_section + display_ctrl = uicfg.primaryview_display_ctrl + main_related_section = True + + def html_headers(self): + """return a list of html headers (eg something to be inserted between + and of the returned page + + by default primary views are indexed + """ + return [] + + def cell_call(self, row, col): + self.row = row + # XXX move render_entity implementation here + self.render_entity(self.complete_entity(row, col)) + self.maxrelated = self.req.property_value('navigation.related-limit') + + def render_entity(self, entity): + """return html to display the given entity""" + self.render_entity_title(entity) + self.render_entity_metadata(entity) + # entity's attributes and relations, excluding meta data + # if the entity isn't meta itself + boxes = self._prepare_side_boxes(entity) + if boxes or hasattr(self, 'render_side_related'): + self.w(u'

') + self.w(u'

') + try: + self.render_entity_attributes(entity) + except TypeError: # XXX bw compat + warn('siderelations argument of render_entity_attributes is ' + 'deprecated (%s)' % self.__class__) + self.render_entity_attributes(entity, []) + self.w(u'

') + self.content_navigation_components('navcontenttop') + if self.main_related_section: + try: + self.render_entity_relations(entity) + except TypeError: # XXX bw compat + warn('siderelations argument of render_entity_relations is ' + 'deprecated') + self.render_entity_relations(entity, []) + self.w(u'

') + if boxes or hasattr(self, 'render_side_related'): + self.w(u'

') + # side boxes + self.w(u'

') + if hasattr(self, 'render_side_related'): + warn('render_side_related is deprecated') + self.render_side_related(entity, []) + self.render_side_boxes(boxes) + self.w(u'

') + self.w(u'

') + self.content_navigation_components('navcontentbottom') + + + def content_navigation_components(self, context): + self.w(u'

' % context) + for comp in self.vreg.possible_vobjects('contentnavigation', + self.req, self.rset, row=self.row, + view=self, context=context): + try: + comp.render(w=self.w, row=self.row, view=self) + except NotImplementedError: + warn('component %s doesnt implement cell_call, please update' + % comp.__class__, DeprecationWarning) + comp.render(w=self.w, view=self) + self.w(u'

') + + def render_entity_title(self, entity): + """default implementation return dc_title""" + title = html_escape(entity.dc_title()) + if title: + self.w(u'

%s %s

' + % (entity.dc_type().capitalize(), title)) + + def render_entity_metadata(self, entity): + entity.view('metadata', w=self.w) + summary = self.summary(entity) # deprecate summary? + if summary: + self.w(u'

' % summary) + + def summary(self, entity): + """default implementation return an empty string""" + return u'' + + def render_entity_attributes(self, entity, siderelations=None): + for rschema, tschemas, role, dispctrl in self._section_def(entity, 'attributes'): + vid = dispctrl.get('vid', 'reledit') + if rschema.is_final() or vid == 'reledit': + value = entity.view(vid, rtype=rschema.type, role=role) + else: + rset = self._relation_rset(entity, rschema, role, dispctrl) + if rset: + value = self.view(vid, rset) + else: + value = None + if self.skip_none and (value is None or value == ''): + continue + self._render_attribute(rschema, value) + + def render_entity_relations(self, entity, siderelations=None): + for rschema, tschemas, role, dispctrl in self._section_def(entity, 'relations'): + rset = self._relation_rset(entity, rschema, role, dispctrl) + if rset: + self._render_relation(rset, dispctrl, 'autolimited', + self.show_rel_label) + + def render_side_boxes(self, boxes): + """display side related relations: + non-meta in a first step, meta in a second step + """ + for box in boxes: + if isinstance(box, tuple): + label, rset, vid = box + self.w(u'

') + self.wview(vid, rset, title=label) + self.w(u'

') + else: + try: + box.render(w=self.w, row=self.row) + except NotImplementedError: + # much probably a context insensitive box, which only implements + # .call() and not cell_call() + box.render(w=self.w) + + def _prepare_side_boxes(self, entity): + sideboxes = [] + for rschema, tschemas, role, dispctrl in self._section_def(entity, 'sideboxes'): + rset = self._relation_rset(entity, rschema, role, dispctrl) + if not rset: + continue + label = display_name(self.req, rschema.type, role) + vid = dispctrl.get('vid', 'sidebox') + sideboxes.append( (label, rset, vid) ) + sideboxes += self.vreg.possible_vobjects('boxes', self.req, self.rset, + row=self.row, view=self, + context='incontext') + return sideboxes + + def _section_def(self, entity, where): + rdefs = [] + eschema = entity.e_schema + for rschema, tschemas, role in eschema.relation_definitions(True): + matchtschemas = [] + for tschema in tschemas: + section = self.rsection.etype_get(eschema, rschema, role, + tschema) + if section == where: + matchtschemas.append(tschema) + if matchtschemas: + # XXX pick the latest dispctrl + dispctrl = self.display_ctrl.etype_get(eschema, rschema, role, + matchtschemas[-1]) + + rdefs.append( (rschema, matchtschemas, role, dispctrl) ) + return sorted(rdefs, key=lambda x: x[-1]['order']) + + def _relation_rset(self, entity, rschema, role, dispctrl): + try: + if dispctrl.get('limit'): + rset = entity.related(rschema.type, role, + limit=self.maxrelated+1) + else: + rset = entity.related(rschema.type, role) + except Unauthorized: + return + if 'filter' in dispctrl: + rset = dispctrl['filter'](rset) + return rset + + def _render_relation(self, rset, dispctrl, defaultvid, showlabel): + self.w(u'

') + if showlabel: + self.w(u'

%s

' % self.req._(dispctrl['label'])) + self.wview(dispctrl.get('vid', defaultvid), rset) + self.w(u'

') + + def _render_attribute(self, rschema, value, role='subject'): + if rschema.is_final(): + show_label = self.show_attr_label + else: + show_label = self.show_rel_label + label = display_name(self.req, rschema.type, role) + self.field(label, value, show_label=show_label, tr=False) + + +class RelatedView(EntityView): + id = 'autolimited' + def call(self, title=None, **kwargs): + # if not too many entities, show them all in a list + maxrelated = self.req.property_value('navigation.related-limit') + if title: + self.w(u'

' % title) + if self.rset.rowcount <= maxrelated: + if self.rset.rowcount == 1: + self.wview('incontext', self.rset, row=0) + elif 1 < self.rset.rowcount <= 5: + self.wview('csv', self.rset) + else: + self.w(u'

') + self.wview('simplelist', self.rset) + self.w(u'

') + # else show links to display related entities + else: + rql = self.rset.printable_rql() + self.rset.limit(maxrelated) + self.w(u'

') + self.wview('simplelist', self.rset) + self.w(u'[%s]' % (self.build_url(rql=rql), + self.req._('see them all'))) + self.w(u'

') diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/schema.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/schema.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,213 @@ +"""Specific views for schema related entities + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from itertools import cycle + +from logilab.mtconverter import html_escape +from yams import schema2dot as s2d + +from cubicweb.selectors import implements, yes +from cubicweb.schemaviewer import SchemaViewer +from cubicweb.view import EntityView, StartupView +from cubicweb.common import tags, uilib +from cubicweb.web import action +from cubicweb.web.views import TmpFileViewMixin, primary, baseviews + + +class ViewSchemaAction(action.Action): + id = 'schema' + __select__ = yes() + + title = _("site schema") + category = 'siteactions' + order = 30 + + def url(self): + return self.build_url(self.id) + + +# schema entity types views ################################################### + +class CWRDEFPrimaryView(primary.PrimaryView): + __select__ = implements('CWAttribute', 'CWRelation') + cache_max_age = 60*60*2 # stay in http cache for 2 hours by default + + def render_entity_title(self, entity): + self.w(u'

%s %s

' + % (entity.dc_type().capitalize(), + html_escape(entity.dc_long_title()))) + + +class CWETypeOneLineView(baseviews.OneLineView): + __select__ = implements('CWEType') + + def cell_call(self, row, col, **kwargs): + entity = self.entity(row, col) + final = entity.final + if final: + self.w(u'') + super(CWETypeOneLineView, self).cell_call(row, col, **kwargs) + if final: + self.w(u'') + + +# in memory schema views (yams class instances) ############################### +SKIPPED_RELS = ('is', 'is_instance_of', 'identity', 'created_by', 'owned_by', + 'has_text',) + +class CWETypeSchemaView(primary.PrimaryView): + id = 'eschema' + __select__ = implements('CWEType') + title = _('in memory entity schema') + main_related_section = False + skip_rels = SKIPPED_RELS + + def render_entity_attributes(self, entity): + super(CWETypeSchemaView, self).render_entity_attributes(entity) + eschema = self.vreg.schema.eschema(entity.name) + viewer = SchemaViewer(self.req) + layout = viewer.visit_entityschema(eschema, skiprels=self.skip_rels) + self.w(uilib.ureport_as_html(layout)) + if not eschema.is_final(): + msg = self.req._('graphical schema for %s') % entity.name + self.w(tags.img(src=entity.absolute_url(vid='eschemagraph'), + alt=msg)) + + +class CWRTypeSchemaView(primary.PrimaryView): + id = 'eschema' + __select__ = implements('CWRType') + title = _('in memory relation schema') + main_related_section = False + + def render_entity_attributes(self, entity): + super(CWRTypeSchemaView, self).render_entity_attributes(entity) + rschema = self.vreg.schema.rschema(entity.name) + viewer = SchemaViewer(self.req) + layout = viewer.visit_relationschema(rschema) + self.w(uilib.ureport_as_html(layout)) + if not rschema.is_final(): + msg = self.req._('graphical schema for %s') % entity.name + self.w(tags.img(src=entity.absolute_url(vid='eschemagraph'), + alt=msg)) + + +# schema images ############################################################### + +class ImageView(EntityView): + __select__ = implements('CWEType') + id = 'image' + title = _('image') + + def cell_call(self, row, col): + entity = self.entity(row, col) + url = entity.absolute_url(vid='eschemagraph') + self.w(u'

' % ( + html_escape(url), + html_escape(self.req._('graphical schema for %s') % entity.name))) + + +class RestrictedSchemaDotPropsHandler(s2d.SchemaDotPropsHandler): + def __init__(self, req): + # FIXME: colors are arbitrary + self.nextcolor = cycle( ('#aa0000', '#00aa00', '#0000aa', + '#000000', '#888888') ).next + self.req = req + + def display_attr(self, rschema): + return not rschema.meta and (rschema.has_local_role('read') + or rschema.has_perm(self.req, 'read')) + + # XXX remove this method once yams > 0.20 is out + def node_properties(self, eschema): + """return default DOT drawing options for an entity schema""" + label = ['{', eschema.type, '|'] + label.append(r'\l'.join(rel.type for rel in eschema.subject_relations() + if rel.final and self.display_attr(rel))) + label.append(r'\l}') # trailing \l ensure alignement of the last one + return {'label' : ''.join(label), 'shape' : "record", + 'fontname' : "Courier", 'style' : "filled"} + + def edge_properties(self, rschema, subjnode, objnode): + kwargs = super(RestrictedSchemaDotPropsHandler, self).edge_properties(rschema, subjnode, objnode) + # symetric rels are handled differently, let yams decide what's best + if not rschema.symetric: + kwargs['color'] = self.nextcolor() + kwargs['fontcolor'] = kwargs['color'] + # dot label decoration is just awful (1 line underlining the label + # + 1 line going to the closest edge spline point) + kwargs['decorate'] = 'false' + return kwargs + + +class RestrictedSchemaVisitorMiIn: + def __init__(self, req, *args, **kwargs): + # hack hack hack + assert len(self.__class__.__bases__) == 2 + self.__parent = self.__class__.__bases__[1] + self.__parent.__init__(self, *args, **kwargs) + self.req = req + + def nodes(self): + for etype, eschema in self.__parent.nodes(self): + if eschema.has_local_role('read') or eschema.has_perm(self.req, 'read'): + yield eschema.type, eschema + + def edges(self): + for setype, oetype, rschema in self.__parent.edges(self): + if rschema.has_local_role('read') or rschema.has_perm(self.req, 'read'): + yield setype, oetype, rschema + + +class FullSchemaVisitor(RestrictedSchemaVisitorMiIn, s2d.FullSchemaVisitor): + pass + +class OneHopESchemaVisitor(RestrictedSchemaVisitorMiIn, s2d.OneHopESchemaVisitor): + pass + +class OneHopRSchemaVisitor(RestrictedSchemaVisitorMiIn, s2d.OneHopRSchemaVisitor): + pass + + +class SchemaImageView(TmpFileViewMixin, StartupView): + id = 'schemagraph' + + content_type = 'image/png' + skip_rels = SKIPPED_RELS + def _generate(self, tmpfile): + """display global schema information""" + skipmeta = not int(self.req.form.get('withmeta', 0)) + visitor = FullSchemaVisitor(self.req, self.schema, skiprels=self.skip_rels, skipmeta=skipmeta) + s2d.schema2dot(outputfile=tmpfile, visitor=visitor, + prophdlr=RestrictedSchemaDotPropsHandler(self.req)) + +class CWETypeSchemaImageView(TmpFileViewMixin, EntityView): + id = 'eschemagraph' + __select__ = implements('CWEType') + + content_type = 'image/png' + skip_rels = SKIPPED_RELS + + def _generate(self, tmpfile): + """display schema information for an entity""" + entity = self.entity(self.row, self.col) + eschema = self.vreg.schema.eschema(entity.name) + visitor = OneHopESchemaVisitor(self.req, eschema, skiprels=self.skip_rels) + s2d.schema2dot(outputfile=tmpfile, visitor=visitor, + prophdlr=RestrictedSchemaDotPropsHandler(self.req)) + +class CWRTypeSchemaImageView(CWETypeSchemaImageView): + __select__ = implements('CWRType') + + def _generate(self, tmpfile): + """display schema information for an entity""" + entity = self.entity(self.row, self.col) + rschema = self.vreg.schema.rschema(entity.name) + visitor = OneHopRSchemaVisitor(self.req, rschema) + s2d.schema2dot(outputfile=tmpfile, visitor=visitor, + prophdlr=RestrictedSchemaDotPropsHandler(self.req)) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/schemaentities.py --- a/web/views/schemaentities.py Tue May 05 17:18:49 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,123 +0,0 @@ -"""Specific views for schema related entities - -:organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. -:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr -""" -__docformat__ = "restructuredtext en" - -from logilab.mtconverter import html_escape - -from cubicweb.schemaviewer import SchemaViewer -from cubicweb.common.uilib import ureport_as_html -from cubicweb.common.view import EntityView -from cubicweb.web.views import baseviews - - -class ImageView(EntityView): - accepts = ('EEType',) - id = 'image' - title = _('image') - - def cell_call(self, row, col): - entity = self.entity(row, col) - url = entity.absolute_url(vid='eschemagraph') - self.w(u'

' % ( - html_escape(url), - html_escape(self.req._('graphical schema for %s') % entity.name))) - - -class _SchemaEntityPrimaryView(baseviews.PrimaryView): - show_attr_label = False - cache_max_age = 60*60*2 # stay in http cache for 2 hours by default - - def content_title(self, entity): - return html_escape(entity.dc_long_title()) - -class EETypePrimaryView(_SchemaEntityPrimaryView): - accepts = ('EEType',) - skip_attrs = _SchemaEntityPrimaryView.skip_attrs + ('name', 'meta', 'final') - -class ERTypePrimaryView(_SchemaEntityPrimaryView): - accepts = ('ERType',) - skip_attrs = _SchemaEntityPrimaryView.skip_attrs + ('name', 'meta', 'final', - 'symetric', 'inlined') - -class ErdefPrimaryView(_SchemaEntityPrimaryView): - accepts = ('EFRDef', 'ENFRDef') - show_attr_label = True - -class EETypeSchemaView(EETypePrimaryView): - id = 'eschema' - title = _('in memory entity schema') - main_related_section = False - skip_rels = ('is', 'is_instance_of', 'identity', 'created_by', 'owned_by', - 'has_text',) - - def render_entity_attributes(self, entity, siderelations): - super(EETypeSchemaView, self).render_entity_attributes(entity, siderelations) - eschema = self.vreg.schema.eschema(entity.name) - viewer = SchemaViewer(self.req) - layout = viewer.visit_entityschema(eschema, skiprels=self.skip_rels) - self.w(ureport_as_html(layout)) - if not eschema.is_final(): - self.w(u'

' % ( - html_escape(entity.absolute_url(vid='eschemagraph')), - html_escape(self.req._('graphical schema for %s') % entity.name))) - -class ERTypeSchemaView(ERTypePrimaryView): - id = 'eschema' - title = _('in memory relation schema') - main_related_section = False - - def render_entity_attributes(self, entity, siderelations): - super(ERTypeSchemaView, self).render_entity_attributes(entity, siderelations) - rschema = self.vreg.schema.rschema(entity.name) - viewer = SchemaViewer(self.req) - layout = viewer.visit_relationschema(rschema) - self.w(ureport_as_html(layout)) - if not rschema.is_final(): - self.w(u'

' % ( - html_escape(entity.absolute_url(vid='eschemagraph')), - html_escape(self.req._('graphical schema for %s') % entity.name))) - - -class EETypeWorkflowView(EntityView): - id = 'workflow' - accepts = ('EEType',) - cache_max_age = 60*60*2 # stay in http cache for 2 hours by default - - def cell_call(self, row, col, **kwargs): - entity = self.entity(row, col) - self.w(u'

%s

' % (self.req._('workflow for %s') - % display_name(self.req, entity.name))) - self.w(u'

' % ( - html_escape(entity.absolute_url(vid='ewfgraph')), - html_escape(self.req._('graphical workflow for %s') % entity.name))) - - -class EETypeOneLineView(baseviews.OneLineView): - accepts = ('EEType',) - - def cell_call(self, row, col, **kwargs): - entity = self.entity(row, col) - final = entity.final - if final: - self.w(u'') - super(EETypeOneLineView, self).cell_call(row, col, **kwargs) - if final: - self.w(u'') - - -from cubicweb.web.action import EntityAction - -class ViewWorkflowAction(EntityAction): - id = 'workflow' - category = 'mainactions' - title = _('view workflow') - accepts = ('EEType',) - condition = 'S state_of X' # must have at least one state associated - def url(self): - entity = self.rset.get_entity(self.row or 0, self.col or 0) - return entity.absolute_url(vid='workflow') - diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/searchrestriction.py --- a/web/views/searchrestriction.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/searchrestriction.py Thu May 14 12:48:11 2009 +0200 @@ -2,7 +2,7 @@ a search :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/sessions.py --- a/web/views/sessions.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/sessions.py Thu May 14 12:48:11 2009 +0200 @@ -2,18 +2,18 @@ object :/ :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" -from cubicweb.web import ExplicitLogin, InvalidSession +from cubicweb.web import InvalidSession from cubicweb.web.application import AbstractSessionManager class InMemoryRepositorySessionManager(AbstractSessionManager): """manage session data associated to a session identifier""" - + def __init__(self): AbstractSessionManager.__init__(self) # XXX require a RepositoryAuthenticationManager which violates @@ -23,7 +23,7 @@ def current_sessions(self): return self._sessions.values() - + def get_session(self, req, sessionid): """return existing session for the given session identifier""" if not sessionid in self._sessions: @@ -47,13 +47,13 @@ def open_session(self, req): """open and return a new session for the given request - + :raise ExplicitLogin: if authentication is required """ session = self.authmanager.authenticate(req) self._sessions[session.sessionid] = session return session - + def close_session(self, session): """close session on logout or on invalid session detected (expired out, corrupted...) @@ -66,4 +66,3 @@ # already closed, may occurs if the repository session expired but # not the web session pass - diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/startup.py --- a/web/views/startup.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/startup.py Thu May 14 12:48:11 2009 +0200 @@ -6,24 +6,38 @@ :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" +_ = unicode +from logilab.common.textutils import unormalize from logilab.mtconverter import html_escape -from cubicweb.common.uilib import ureport_as_html, unormalize, ajax_replace_url -from cubicweb.common.view import StartupView -from cubicweb.web.httpcache import EtagHTTPCacheManager - -_ = unicode +from cubicweb.view import StartupView +from cubicweb.selectors import match_user_groups +from cubicweb.common.uilib import ureport_as_html +from cubicweb.web import ajax_replace_url, uicfg, httpcache +from cubicweb.web.views.management import SecurityViewMixIn class ManageView(StartupView): id = 'manage' - title = _('manage') - http_cache_manager = EtagHTTPCacheManager + title = _('manage') + http_cache_manager = httpcache.EtagHTTPCacheManager + + @classmethod + def vreg_initialization_completed(cls): + for eschema in cls.schema.entities(): + if eschema.schema_entity(): + uicfg.indexview_etype_section.setdefault(eschema, 'schema') + elif eschema.is_subobject(strict=True): + uicfg.indexview_etype_section.setdefault(eschema, 'subobject') + elif eschema.meta: + uicfg.indexview_etype_section.setdefault(eschema, 'system') + else: + uicfg.indexview_etype_section.setdefault(eschema, 'application') def display_folders(self): return False - + def call(self, **kwargs): """The default view representing the application's management""" self.req.add_css('cubicweb.manageview.css') @@ -34,7 +48,7 @@ self.w(u'\n') self.w(u'') self.w(u'

') self._main_index() - self.w(u'

') + self.w(u'

') self.folders() self.w(u'

\n') @@ -62,22 +76,22 @@ href = req.build_url('view', vid='creation', etype='Card', wikiid='index') label = self.req._('create an index page') self.w(u'
%s\n' % (html_escape(href), label)) - + def folders(self): self.w(u'

%s

\n' % self.req._('Browse by category')) - self.vreg.select_view('tree', self.req, None).dispatch(w=self.w) - + self.vreg.select_view('tree', self.req, None).render(w=self.w) + def startup_views(self): self.w(u'

%s

\n' % self.req._('Startup views')) self.startupviews_table() - + def startupviews_table(self): for v in self.vreg.possible_views(self.req, None): if v.category != 'startupview' or v.id in ('index', 'tree', 'manage'): continue self.w('

' % ( html_escape(v.url()), html_escape(self.req._(v.title).capitalize()))) - + def entities(self): schema = self.schema self.w(u'

%s

\n' % self.req._('The repository holds the following entities')) @@ -86,17 +100,17 @@ if manager: self.w(u'%s\n' % self.req._('application entities')) self.entity_types_table(eschema for eschema in schema.entities() - if not eschema.meta and not eschema.is_subobject(strict=True)) - if manager: + if uicfg.indexview_etype_section.get(eschema) == 'application') + if manager: self.w(u'%s\n' % self.req._('system entities')) self.entity_types_table(eschema for eschema in schema.entities() - if eschema.meta and not eschema.schema_entity()) - if 'EFRDef' in schema: # check schema support + if uicfg.indexview_etype_section.get(eschema) == 'system') + if 'CWAttribute' in schema: # check schema support self.w(u'%s\n' % self.req._('schema entities')) - self.entity_types_table(schema.eschema(etype) - for etype in schema.schema_entity_types()) + self.entity_types_table(eschema for eschema in schema.entities() + if uicfg.indexview_etype_section.get(eschema) == 'schema') self.w(u'') - + def entity_types_table(self, eschemas): newline = 0 infos = sorted(self.entity_types(eschemas), @@ -110,8 +124,8 @@ self.w(u'%s%s\n' % (addlink, etypelink)) self.w(u'%s%s\n' % (addlink2, etypelink2)) self.w(u'\n') - - + + def entity_types(self, eschemas): """return a list of formatted links to get a list of entities of a each entity's types @@ -132,7 +146,7 @@ etypelink = u' %s (%d)' % ( html_escape(url), label, nb) yield (label, etypelink, self.add_entity_link(eschema, req)) - + def add_entity_link(self, eschema, req): """creates a [+] link for adding an entity if user has permission to do so""" if not eschema.has_perm(req, 'add'): @@ -141,14 +155,14 @@ html_escape(self.create_url(eschema.type)), self.req.__('add a %s' % eschema)) - + class IndexView(ManageView): id = 'index' title = _('index') - + def display_folders(self): return 'Folder' in self.schema and self.req.execute('Any COUNT(X) WHERE X is Folder')[0][0] - + class SchemaView(StartupView): @@ -158,23 +172,132 @@ def call(self): """display schema information""" self.req.add_js('cubicweb.ajax.js') - self.req.add_css('cubicweb.schema.css') + self.req.add_css(('cubicweb.schema.css','cubicweb.acl.css')) withmeta = int(self.req.form.get('withmeta', 0)) + section = self.req.form.get('sec', '') self.w(u'

\n' % ( html_escape(self.req.build_url('view', vid='schemagraph', withmeta=withmeta)), self.req._("graphical representation of the application'schema"))) if withmeta: self.w(u'

' % ( - self.build_url('schema', withmeta=0), + html_escape(self.build_url('schema', withmeta=0, sec=section)), self.req._('hide meta-data'))) else: self.w(u'

' % ( - self.build_url('schema', withmeta=1), + html_escape(self.build_url('schema', withmeta=1, sec=section)), self.req._('show meta-data'))) - self.w(u'

' % + self.w(u'%s
' % (html_escape(ajax_replace_url('detailed_schema', '', 'schematext', skipmeta=int(not withmeta))), self.req._('detailed schema view'))) + if self.req.user.matching_groups('managers'): + self.w(u'%s' % + (html_escape(ajax_replace_url('detailed_schema', '', 'schema_security', + skipmeta=int(not withmeta))), + self.req._('security'))) + self.w(u'

') + if section: + self.wview(section, None) + self.w(u'

') + + +class ManagerSchemaPermissionsView(StartupView, SecurityViewMixIn): + id = 'schema_security' + __select__ = StartupView.__select__ & match_user_groups('managers') + + def call(self, display_relations=True, + skiprels=('is', 'is_instance_of', 'identity', 'owned_by', 'created_by')): + _ = self.req._ + formparams = {} + formparams['sec'] = self.id + formparams['withmeta'] = int(self.req.form.get('withmeta', True)) + schema = self.schema + # compute entities + entities = [eschema for eschema in schema.entities() + if not eschema.is_final()] + if not formparams['withmeta']: + entities = [eschema for eschema in entities + if not eschema.meta] + # compute relations + relations = [] + if display_relations: + relations = [rschema for rschema in schema.relations() + if not (rschema.is_final() or rschema.type in skiprels)] + if not formparams['withmeta']: + relations = [rschema for rschema in relations + if not rschema.meta] + # index + self.w(u'

') + self.w(u'

%s

' % _('index').capitalize()) + self.w(u'

%s

' % _('Entities').capitalize()) + ents = [] + for eschema in sorted(entities): + url = html_escape(self.build_url('schema', **formparams) + '#' + eschema.type) + ents.append(u'%s (%s)' % (url, eschema.type, _(eschema.type))) + self.w('%s' % ', '.join(ents)) + self.w(u'

%s

' % (_('relations').capitalize())) + rels = [] + for eschema in sorted(relations): + url = html_escape(self.build_url('schema', **formparams) + '#' + eschema.type) + rels.append(u'%s (%s), ' % (url , eschema.type, _(eschema.type))) + self.w('%s' % ', '.join(ents)) + # entities + self.display_entities(entities, formparams) + # relations + if relations: + self.display_relations(relations, formparams) + self.w(u'

') + + def display_entities(self, entities, formparams): + _ = self.req._ + self.w(u'') + self.w(u'

%s

' % _('permissions for entities').capitalize()) + for eschema in sorted(entities): + self.w(u'' % (eschema.type, eschema.type)) + self.w(u'

%s (%s) ' % (eschema.type, _(eschema.type))) + url = html_escape(self.build_url('schema', **formparams) + '#index') + self.w(u'' % (url, self.req.external_resource('UP_ICON'), _('up'))) + self.w(u'

') + self.w(u'

') + self.schema_definition(eschema, link=False) + + # display entity attributes only if they have some permissions modified + modified_attrs = [] + for attr, etype in eschema.attribute_definitions(): + if self.has_schema_modified_permissions(attr, attr.ACTIONS): + modified_attrs.append(attr) + if modified_attrs: + self.w(u'

%s

' % _('attributes with modified permissions:').capitalize()) + self.w(u'

') + self.w(u'

') + for attr in modified_attrs: + self.w(u'

%s (%s)

' % (attr.type, _(attr.type))) + self.schema_definition(attr, link=False) + self.w(u'

') + else: + self.w(u'

') + + + def display_relations(self, relations, formparams): + _ = self.req._ + self.w(u'') + self.w(u'

%s

' % _('permissions for relations').capitalize()) + for rschema in sorted(relations): + self.w(u'' % (rschema.type, rschema.type)) + self.w(u'

%s (%s) ' % (rschema.type, _(rschema.type))) + url = html_escape(self.build_url('schema', **formparams) + '#index') + self.w(u'' % (url, self.req.external_resource('UP_ICON'), _('up'))) + self.w(u'

') + self.w(u'

') + subjects = [str(subj) for subj in rschema.subjects()] + self.w(u'

%s %s (%s)

' % (_('subject_plural:'), + ', '.join( [str(subj) for subj in rschema.subjects()]), + ', '.join( [_(str(subj)) for subj in rschema.subjects()]))) + self.w(u'

%s %s (%s)

' % (_('object_plural:'), + ', '.join( [str(obj) for obj in rschema.objects()]), + ', '.join( [_(str(obj)) for obj in rschema.objects()]))) + self.schema_definition(rschema, link=False) + self.w(u'

') class SchemaUreportsView(StartupView): diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/tableview.py --- a/web/views/tableview.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/tableview.py Thu May 14 12:48:11 2009 +0200 @@ -11,13 +11,13 @@ from logilab.mtconverter import html_escape -from cubicweb.common.utils import make_uid -from cubicweb.common.uilib import toggle_action, limitsize, jsonize, htmlescape -from cubicweb.common.view import EntityView, AnyRsetView -from cubicweb.common.selectors import (nonempty_rset, match_form_params, - accept_rset) +from cubicweb.selectors import nonempty_rset, match_form_params +from cubicweb.utils import make_uid +from cubicweb.view import EntityView, AnyRsetView +from cubicweb.common.uilib import toggle_action, limitsize, htmlescape +from cubicweb.web import jsonize from cubicweb.web.htmlwidgets import (TableWidget, TableColumn, MenuWidget, - PopupBoxMenu, BoxLink) + PopupBoxMenu, BoxLink) from cubicweb.web.facet import prepare_facets_rqlst, filter_hiddens class TableView(AnyRsetView): @@ -45,7 +45,7 @@ 'displayfilter': displayfilter}) return self.show_hide_actions(divid, not hidden) return () - + def _generate_form(self, divid, baserql, fwidgets, hidden=True, vidargs={}): """display a form to filter table's content. This should only occurs when a context eid is given @@ -89,7 +89,7 @@ else: displaycols = range(len(self.rset.syntax_tree().children[0].selection)) return displaycols - + def call(self, title=None, subvid=None, displayfilter=None, headers=None, displaycols=None, displayactions=None, actions=(), divid=None, cellvids=None, cellattrs=None): @@ -170,7 +170,7 @@ if currentlydisplayed: return [(showhide, showlabel, 'hidden', '%sShow' % divid), (showhide, hidelabel, None, '%sHide' % divid)] - return [(showhide, showlabel, None, '%sShow' % divid), + return [(showhide, showlabel, None, '%sShow' % divid), (showhide, hidelabel, 'hidden', '%sHide' % divid)] def render_actions(self, divid, actions): @@ -185,7 +185,7 @@ menu.append(BoxLink(url, label, klass, ident=ident, escape=True)) box.render(w=self.w) self.w(u'

') - + def get_columns(self, rqlstdescr, displaycols, headers, subvid, cellvids, cellattrs, mainindex): columns = [] @@ -215,15 +215,15 @@ if cellattrs and colindex in cellattrs: for name, value in cellattrs[colindex].iteritems(): - column.add_attr(name,value) + column.add_attr(name, value) # add column columns.append(column) return columns - + - def render(self, cellvid, row, col, w): + def render_cell(self, cellvid, row, col, w): self.view('cell', self.rset, row=row, col=col, cellvid=cellvid, w=w) - + def get_rows(self): return self.rset @@ -246,18 +246,18 @@ entity = self.rset.get_entity(row, col) return entity.sortvalue() + class EditableTableView(TableView): id = 'editable-table' finalview = 'editable-final' title = _('editable-table') - + class CellView(EntityView): - __selectors__ = (nonempty_rset, accept_rset) - + __select__ = nonempty_rset() + id = 'cell' - accepts = ('Any',) - + def cell_call(self, row, col, cellvid=None): """ :param row, col: indexes locating the cell value in view's result set @@ -278,23 +278,22 @@ class InitialTableView(TableView): """same display as table view but consider two rql queries : - + * the default query (ie `rql` form parameter), which is only used to select this view and to build the filter form. This query should have the same structure as the actual without actual restriction (but link to restriction variables) and usually with a limit for efficiency (limit set to 2 is advised) - + * the actual query (`actualrql` form parameter) whose results will be displayed with default restrictions set """ id = 'initialtable' - __selectors__ = nonempty_rset, match_form_params - form_params = ('actualrql',) + __select__ = nonempty_rset() & match_form_params('actualrql') # should not be displayed in possible view since it expects some specific # parameters title = None - + def call(self, title=None, subvid=None, headers=None, divid=None, displaycols=None, displayactions=None): """Dumps a table displaying a composite query""" @@ -328,4 +327,3 @@ class EditableInitialTableTableView(InitialTableView): id = 'editable-initialtable' finalview = 'editable-final' - diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/tabs.py --- a/web/views/tabs.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/tabs.py Thu May 14 12:48:11 2009 +0200 @@ -1,22 +1,18 @@ """base classes to handle tabbed views :organization: Logilab -:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" -from logilab.common.decorators import monkeypatch from logilab.mtconverter import html_escape from cubicweb import NoSelectableObject, role -from cubicweb.common.view import EntityView -from cubicweb.common.selectors import has_related_entities -from cubicweb.common.utils import HTMLHead -from cubicweb.common.uilib import rql_for_eid - -from cubicweb.web.views.basecontrollers import JSonController +from cubicweb.selectors import partial_has_related_entities +from cubicweb.view import EntityView +from cubicweb.common import tags, uilib class LazyViewMixin(object): @@ -42,11 +38,11 @@ 'lazyview wants at least : rql, or an eid, or an rset -- or call it with static=True' w = w or self.w self.req.add_js('cubicweb.lazy.js') - urlparams = {'vid' : vid, 'mode' : 'html'} + urlparams = {'vid' : vid, 'fname' : 'view'} if rql: urlparams['rql'] = rql elif eid: - urlparams['rql'] = rql_for_eid(eid) + urlparams['rql'] = uilib.rql_for_eid(eid) elif rset: urlparams['rql'] = rset.printable_rql() w(u'

' % ( @@ -148,9 +144,8 @@ 'cookiename' : self.cookie_name}) -class EntityRelatedTab(EntityView): - """A view you should inherit from leftmost, - to wrap another actual view displaying entity related stuff. +class EntityRelationView(EntityView): + """view displaying entity related stuff. Such a view _must_ provide the rtype, target and vid attributes : Example : @@ -158,23 +153,22 @@ class ProjectScreenshotsView(EntityRelationView): '''display project's screenshots''' id = title = _('projectscreenshots') - accepts = ('Project',) + __select__ = EntityRelationView.__select__ & implements('Project') rtype = 'screenshot' - target = 'object' + role = 'subject' vid = 'gallery' - __selectors__ = EntityRelationView.__selectors__ + (one_line_rset,) - This is the view we want to have in a tab, only if there is something to show. - Then, just define as below, and declare this being the tab content : - - class ProjectScreenshotTab(EntityRelatedTab, ProjectScreenshotsView): - id = 'screenshots_tab' + in this example, entities related to project entity by the'screenshot' + relation (where the project is subject of the relation) will be displayed + using the 'gallery' view. """ - __selectors__ = EntityView.__selectors__ + (has_related_entities,) + __select__ = EntityView.__select__ & partial_has_related_entities() vid = 'list' def cell_call(self, row, col): rset = self.entity(row, col).related(self.rtype, role(self)) self.w(u'

') + if self.title: + self.w(tags.h1(self.req._(self.title))) self.wview(self.vid, rset, 'noresult') self.w(u'

') diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/timeline.py --- a/web/views/timeline.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/timeline.py Thu May 14 12:48:11 2009 +0200 @@ -3,7 +3,7 @@ cf. http://code.google.com/p/simile-widgets/ :organization: Logilab -:copyright: 2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -13,11 +13,10 @@ from logilab.mtconverter import html_escape from cubicweb.interfaces import ICalendarable -from cubicweb.common.view import EntityView, StartupView -from cubicweb.common.selectors import implement_interface +from cubicweb.selectors import implements +from cubicweb.view import EntityView, StartupView -# class TimelineJsonView(EntityView): """generates a json file to feed Timeline.loadJSON() NOTE: work in progress (image_url, bubbleUrl and so on @@ -28,10 +27,9 @@ templatable = False content_type = 'application/json' - __selectors__ = (implement_interface,) - accepts_interfaces = (ICalendarable,) + __select__ = implements(ICalendarable) date_fmt = '%Y/%m/%d' - + def call(self): events = [] for entity in self.rset.entities(): @@ -45,13 +43,13 @@ # FIXME: those properties should be defined by the entity class def onclick_url(self, entity): return entity.absolute_url() - + def onclick(self, entity): url = self.onclick_url(entity) if url: return u"javascript: document.location.href='%s'" % url return None - + def build_event(self, entity): """converts `entity` into a JSON object {'start': '1891', @@ -79,13 +77,13 @@ event_data['end'] = stop.strftime(self.date_fmt) return event_data - + class TimelineViewMixIn(object): widget_class = 'TimelineWidget' jsfiles = ('cubicweb.timeline-bundle.js', 'cubicweb.widgets.js', 'cubicweb.timeline-ext.js', 'cubicweb.ajax.js') - - def render(self, loadurl, tlunit=None): + + def render_url(self, loadurl, tlunit=None): tlunit = tlunit or self.req.form.get('tlunit') self.req.add_js(self.jsfiles) self.req.add_css('timeline-bundle.css') @@ -103,22 +101,21 @@ class TimelineView(TimelineViewMixIn, EntityView): """builds a cubicweb timeline widget node""" id = 'timeline' - __selectors__ = (implement_interface,) - accepts_interfaces = (ICalendarable,) + __select__ = implements(ICalendarable) need_navigation = False def call(self, tlunit=None): self.req.html_headers.define_var('Timeline_urlPrefix', self.req.datadir_url) rql = self.rset.printable_rql() loadurl = self.build_url(rql=rql, vid='timeline-json') - self.render(loadurl, tlunit) - - + self.render_url(loadurl, tlunit) + + class StaticTimelineView(TimelineViewMixIn, StartupView): """similar to `TimelineView` but loads data from a static JSON file instead of one after a RQL query. """ id = 'static-timeline' - + def call(self, loadurl, tlunit=None, wdgclass=None): - self.widget_class = wdgclass or self.widget_clas - self.render(loadurl, tlunit) + self.widget_class = wdgclass or self.widget_class + self.render_url(loadurl, tlunit) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/timetable.py --- a/web/views/timetable.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/timetable.py Thu May 14 12:48:11 2009 +0200 @@ -1,16 +1,16 @@ """html calendar views :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ from logilab.mtconverter import html_escape from cubicweb.interfaces import ITimetableViews -from cubicweb.common.utils import date_range -from cubicweb.common.selectors import implement_interface -from cubicweb.common.view import AnyRsetView +from cubicweb.selectors import implements +from cubicweb.utils import date_range +from cubicweb.view import AnyRsetView class _TaskEntry(object): @@ -25,8 +25,7 @@ class TimeTableView(AnyRsetView): id = 'timetable' title = _('timetable') - __selectors__ = (implement_interface,) - accepts_interfaces = (ITimetableViews,) + __select__ = implements(ITimetableViews) need_navigation = False def call(self, title=None): @@ -39,14 +38,14 @@ # XXX: try refactoring with calendar.py:OneMonthCal for row in xrange(self.rset.rowcount): - task = self.rset.get_entity(row,0) + task = self.rset.get_entity(row, 0) if len(self.rset[row])>1: - user = self.rset.get_entity(row,1) + user = self.rset.get_entity(row, 1) else: user = u"*" the_dates = [] if task.start and task.stop: - if task.start.absdate == task.stop.absdate: + if task.start.toordinal() == task.stop.toordinal(): the_dates.append(task.start) else: the_dates += date_range( task.start, task.stop ) @@ -56,9 +55,9 @@ the_dates.append(task.stop) for d in the_dates: d_users = dates.setdefault(d, {}) - u_tasks = d_users.setdefault(user,set()) + u_tasks = d_users.setdefault(user, set()) u_tasks.add( task ) - task_max = users_max.setdefault(user,0) + task_max = users_max.setdefault(user, 0) if len(u_tasks)>task_max: users_max[user] = len(u_tasks) if user not in users: @@ -72,7 +71,7 @@ rows = [] # colors here are class names defined in cubicweb.css - colors = [ "col%x"%i for i in range(12) ] + colors = ["col%x" % i for i in xrange(12)] next_color_index = 0 visited_tasks = {} # holds a description of a task for a user @@ -93,7 +92,7 @@ if key in visited_tasks: task_descr = visited_tasks[ key ] user_columns[task_descr.column] = task_descr, False - task_descr.lines+=1 + task_descr.lines += 1 else: postpone.append(key) for key in postpone: @@ -101,7 +100,7 @@ # (which must be the same for every user concerned # by the task) task, user = key - for i,t in enumerate(user_columns): + for i, t in enumerate(user_columns): if t is None: if task in task_colors: color = task_colors[task] @@ -129,16 +128,16 @@ self.w(u'') self.w(u'

\n') - def render_col_headers(self,users,widths): + def render_col_headers(self, users, widths): """ render column headers """ self.w(u'\n') self.w(u' \n') columns = [] - for user,width in zip(users,widths): - self.w(u'' % max(MIN_COLS,width)) - if user!=u"*": - user.view('secondary',w=self.w) + for user, width in zip(users, widths): + self.w(u'' % max(MIN_COLS, width)) + if user != u"*": + user.view('secondary', w=self.w) else: self.w(user) self.w(u'') @@ -165,7 +164,7 @@ previous_is_empty = False klass = "even" - if date.day_of_week in (5,6) and not empty_line: + if date.weekday() in (5, 6) and not empty_line: klass = "odd" self.w(u'' % klass) odd = not odd diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/treeview.py --- a/web/views/treeview.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/treeview.py Thu May 14 12:48:11 2009 +0200 @@ -1,22 +1,24 @@ """Set of tree-building widgets, based on jQuery treeview plugin :organization: Logilab -:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" + from logilab.mtconverter import html_escape + from cubicweb.interfaces import ITree -from cubicweb.common.selectors import implement_interface, yes -from cubicweb.common.utils import make_uid -from cubicweb.common.view import EntityView +from cubicweb.selectors import implements +from cubicweb.view import EntityView +from cubicweb.utils import make_uid def treecookiename(treeid): return str('treestate-%s' % treeid) + class TreeView(EntityView): id = 'treeview' - accepts = ('Any',) itemvid = 'treeitemview' css_classes = 'treeview widget' title = _('tree view') @@ -37,14 +39,14 @@ self.req.add_css('jquery.treeview.css') self.req.add_js(('cubicweb.ajax.js', 'jquery.treeview.js')) self.req.html_headers.add_onload(u""" - jQuery("#tree-%s").treeview({toggle: toggleTree, - prerendered: true});""" % treeid) +jQuery("#tree-%s").treeview({toggle: toggleTree, prerendered: true});""" % treeid) self.w(u'

' % (treeid, self.css_classes)) for rowidx in xrange(len(self.rset)): self.wview(self.itemvid, self.rset, row=rowidx, col=0, - vid=subvid, parentvid=self.id, treeid=treeid) + vid=subvid, parentvid=self.id) self.w(u'') + class FileTreeView(TreeView): """specific version of the treeview to display file trees """ @@ -55,6 +57,8 @@ def call(self, subvid=None, treeid=None, initial_load=True): super(FileTreeView, self).call(treeid=treeid, subvid='filetree-oneline', initial_load=initial_load) + + class FileItemInnerView(EntityView): """inner view used by the TreeItemView instead of oneline view @@ -66,20 +70,17 @@ def cell_call(self, row, col): entity = self.entity(row, col) if ITree.is_implemented_by(entity.__class__) and not entity.is_leaf(): - self.w(u'

\n' % entity.view('oneline')) + self.w(u'

' % entity.view('oneline')) else: # XXX define specific CSS classes according to mime types - self.w(u'

\n' % entity.view('oneline')) + self.w(u'

' % entity.view('oneline')) class DefaultTreeViewItemView(EntityView): - """default treeitem view for entities which don't implement ITree - """ + """default treeitem view for entities which don't implement ITree""" id = 'treeitemview' - accepts = ('Any',) - def cell_call(self, row, col, vid='oneline', parentvid='treeview', treeid=None): - assert treeid is not None + def cell_call(self, row, col, vid='oneline', parentvid='treeview'): entity = self.entity(row, col) itemview = self.view(vid, self.rset, row=row, col=col) if row == len(self.rset) - 1: @@ -91,90 +92,35 @@ class TreeViewItemView(EntityView): """specific treeitem view for entities which implement ITree - (each item should be exandable if it's not a tree leaf) + (each item should be expandable if it's not a tree leaf) """ id = 'treeitemview' - # XXX append yes to make sure we get an higher score than - # the default treeitem view - __selectors__ = (implement_interface, yes) - accepts_interfaces = (ITree,) - - def open_state(self, eeid, treeid): - cookies = self.req.get_cookie() - treestate = cookies.get(treecookiename(treeid)) - if treestate: - return str(eeid) in treestate.value.split(';') - return False + __select__ = implements(ITree) - def cell_call(self, row, col, treeid, vid='oneline', parentvid='treeview'): - w = self.w + def cell_call(self, row, col, vid='oneline', parentvid='treeview'): entity = self.entity(row, col) - liclasses = [] + cssclasses = [] is_leaf = False - is_last = row == len(self.rset) - 1 - is_open = self.open_state(entity.eid, treeid) + if row == len(self.rset) - 1: + is_leaf = True if not hasattr(entity, 'is_leaf') or entity.is_leaf(): - if is_last: - liclasses.append('last') - w(u'

' % u' '.join(liclasses)) + if is_leaf : cssclasses.append('last') + self.w(u'

' % u' '.join(cssclasses)) else: rql = entity.children_rql() % {'x': entity.eid} url = html_escape(self.build_url('json', rql=rql, vid=parentvid, pageid=self.req.pageid, - treeid=treeid, - subvid=vid)) - divclasses = ['hitarea'] - if is_open: - liclasses.append('collapsable') - divclasses.append('collapsable-hitarea') - else: - liclasses.append('expandable') - divclasses.append('closed-hitarea expandable-hitarea') - if is_last: - if is_open: - liclasses.append('lastCollapsable') - divclasses.append('lastCollapsable-hitarea') - else: - liclasses.append('lastExpandable') - divclasses.append('lastExpandable-hitarea') - if is_open: - w(u'

' % u' '.join(liclasses)) - else: - w(u'

' % (url, u' '.join(liclasses))) - if is_leaf: - divtail = '' - else: - divtail = ''' onclick="async_remote_exec('node_clicked', '%s', '%s')"''' % \ - (treeid, entity.eid) - w(u'

' % (u' '.join(divclasses), divtail)) - + subvid=vid, + noautoload=True)) + cssclasses.append('expandable') + divclasses = ['hitarea expandable-hitarea'] + if is_leaf : + cssclasses.append('lastExpandable') + divclasses.append('lastExpandable-hitarea') + self.w(u'

' % (url, u' '.join(cssclasses))) + self.w(u'

' % u' '.join(divclasses)) # add empty

place holder

place holder

%s

\n') previousidx = brothers.index(node) - 1 if previousidx >= 0: - self.navsection(brothers[previousidx], 'prev') - self.navsection(parent, 'up') + self.navsection(brothers[previousidx], 'prev') + self.navsection(parent, 'up') nextidx = brothers.index(node) + 1 if nextidx < len(brothers): - self.navsection(brothers[nextidx], 'next') + self.navsection(brothers[nextidx], 'next') self.w(u'

' % htmlclass) self.w(u'%s : ' % self.req._(msgid)) self.w(u'%s' % ( self.req.build_url('doc/'+node.attrib['resource']), - title(node, self.req.lang))) + title_for_lang(node, self.req.lang))) self.w(u'

%s' % ( self.req.build_url('doc/'+child.attrib['resource']), - title(child, self.req.lang))) + title_for_lang(child, self.req.lang))) self.subsections_links(child, False) self.w(u'

\n') - + class InlineHelpImageView(StartupView): - __selectors__ = (match_form_params,) - form_params = ('fid',) id = 'wdocimages' + __select__ = match_form_params('fid') binary = True templatable = False content_type = 'image/png' - + def call(self): fid = self.req.form['fid'] for lang in chain((self.req.lang, self.vreg.property_value('ui.language')), @@ -187,13 +185,14 @@ id = 'changelog' title = _('What\'s new?') maxentries = 25 - + def call(self): rid = 'ChangeLog_%s' % (self.req.lang) allentries = [] title = self.req._(self.title) restdata = ['.. -*- coding: utf-8 -*-', '', title, '='*len(title), ''] w = restdata.append + today = date.today() for fpath in self.config.locate_all_files(rid): cl = ChangeLog(fpath) encoding = 'utf-8' @@ -207,9 +206,9 @@ w(unicode(line, encoding)) for entry in cl.entries: if entry.date: - date = strptime(entry.date, '%Y-%m-%d') + edate = todate(strptime(entry.date, '%Y-%m-%d')) else: - date = today() + edate = today messages = [] for msglines, submsgs in entry.messages: msgstr = unicode(' '.join(l.strip() for l in msglines), encoding) @@ -218,16 +217,16 @@ msgstr += ' - ' + unicode(' '.join(l.strip() for l in submsglines), encoding) msgstr += u'\n' messages.append(msgstr) - entry = (date, messages) + entry = (edate, messages) allentries.insert(bisect_right(allentries, entry), entry) latestdate = None i = 0 - for date, messages in reversed(allentries): - if latestdate != date: - fdate = self.format_date(date) + for edate, messages in reversed(allentries): + if latestdate != edate: + fdate = self.format_date(edate) w(u'\n%s' % fdate) - w('~'*len(fdate)) - latestdate = date + w('~' * len(fdate)) + latestdate = edate for msg in messages: w(u'* %s' % msg) i += 1 @@ -235,4 +234,3 @@ break w('') # blank line self.w(rest_publish(self, '\n'.join(restdata))) - diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/wfentities.py --- a/web/views/wfentities.py Tue May 05 17:18:49 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -"""html view for workflow related entities - -:organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. -:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr -""" -__docformat__ = "restructuredtext en" - -from cubicweb.common.view import EntityView - -class CellView(EntityView): - id = 'cell' - accepts = ('TrInfo',) - def cell_call(self, row, col, cellvid=None): - entity = self.entity(row, col) - self.w(entity.printable_value('comment')) diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/workflow.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/workflow.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,216 @@ +"""workflow views: + +* IWorkflowable views and forms +* workflow entities views (State, Transition, TrInfo) + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" +_ = unicode + +from logilab.mtconverter import html_escape +from logilab.common.graph import escape, GraphGenerator, DotBackend + +from cubicweb import Unauthorized, view +from cubicweb.selectors import (implements, has_related_entities, + relation_possible, match_form_params) +from cubicweb.interfaces import IWorkflowable +from cubicweb.web import stdmsgs, action, component, form +from cubicweb.web.form import FormViewMixIn +from cubicweb.web.formfields import StringField, RichTextField +from cubicweb.web.formwidgets import HiddenInput, SubmitButton, Button +from cubicweb.web.views import TmpFileViewMixin +from cubicweb.web.views.boxes import EditBox + + +# IWorkflowable views ######################################################### + +class ChangeStateForm(form.EntityFieldsForm): + id = 'changestate' + + __method = StringField(name='__method', initial='set_state', + widget=HiddenInput) + state = StringField(eidparam=True, widget=HiddenInput) + trcomment = RichTextField(label=_('comment:'), eidparam=True) + form_buttons = [SubmitButton(stdmsgs.YES), + Button(stdmsgs.NO, cwaction='cancel')] + + +class ChangeStateFormView(FormViewMixIn, view.EntityView): + id = 'statuschange' + title = _('status change') + __select__ = implements(IWorkflowable) & match_form_params('treid') + + def cell_call(self, row, col): + entity = self.entity(row, col) + state = entity.in_state[0] + transition = self.req.eid_rset(self.req.form['treid']).get_entity(0, 0) + dest = transition.destination() + _ = self.req._ + form = self.vreg.select_object('forms', 'changestate', self.req, + self.rset, row=row, col=col, + entity=entity, + redirect_path=self.redirectpath(entity)) + self.w(form.error_message()) + self.w(u'

%s %s

\n' % (_(transition.name), + entity.view('oneline'))) + msg = _('status will change from %(st1)s to %(st2)s') % { + 'st1': _(state.name), + 'st2': _(dest.name)} + self.w(u'

\n' % msg) + self.w(form.form_render(state=dest.eid, trcomment=u'')) + + def redirectpath(self, entity): + return entity.rest_path() + + +class WFHistoryVComponent(component.EntityVComponent): + """display the workflow history for entities supporting it""" + id = 'wfhistory' + __select__ = (component.EntityVComponent.__select__ + & relation_possible('wf_info_for', role='object')) + context = 'navcontentbottom' + title = _('Workflow history') + + def cell_call(self, row, col, view=None): + _ = self.req._ + eid = self.rset[row][col] + sel = 'Any FS,TS,WF,D' + rql = ' ORDERBY D DESC WHERE WF wf_info_for X,'\ + 'WF from_state FS, WF to_state TS, WF comment C,'\ + 'WF creation_date D' + if self.vreg.schema.eschema('CWUser').has_perm(self.req, 'read'): + sel += ',U,C' + rql += ', WF owned_by U?' + displaycols = range(5) + headers = (_('from_state'), _('to_state'), _('comment'), _('date'), + _('CWUser')) + else: + sel += ',C' + displaycols = range(4) + headers = (_('from_state'), _('to_state'), _('comment'), _('date')) + rql = '%s %s, X eid %%(x)s' % (sel, rql) + try: + rset = self.req.execute(rql, {'x': eid}, 'x') + except Unauthorized: + return + if rset: + self.wview('table', rset, title=_(self.title), displayactions=False, + displaycols=displaycols, headers=headers) + + +# workflow entity types views ################################################# + +class CellView(view.EntityView): + id = 'cell' + __select__ = implements('TrInfo') + + def cell_call(self, row, col, cellvid=None): + self.w(self.entity(row, col).printable_value('comment')) + + +class StateInContextView(view.EntityView): + """convenience trick, State's incontext view should not be clickable""" + id = 'incontext' + __select__ = implements('State') + + def cell_call(self, row, col): + self.w(html_escape(self.view('textincontext', self.rset, + row=row, col=col))) + + +# workflow images ############################################################# + +class ViewWorkflowAction(action.Action): + id = 'workflow' + __select__ = implements('CWEType') & has_related_entities('state_of', 'object') + + category = 'mainactions' + title = _('view workflow') + def url(self): + entity = self.rset.get_entity(self.row or 0, self.col or 0) + return entity.absolute_url(vid='workflow') + + +class CWETypeWorkflowView(view.EntityView): + id = 'workflow' + __select__ = implements('CWEType') + cache_max_age = 60*60*2 # stay in http cache for 2 hours by default + + def cell_call(self, row, col, **kwargs): + entity = self.entity(row, col) + self.w(u'

%s

' % (self.req._('workflow for %s') + % display_name(self.req, entity.name))) + self.w(u'

' % ( + html_escape(entity.absolute_url(vid='ewfgraph')), + html_escape(self.req._('graphical workflow for %s') % entity.name))) + + +class WorkflowDotPropsHandler(object): + def __init__(self, req): + self._ = req._ + + def node_properties(self, stateortransition): + """return default DOT drawing options for a state or transition""" + props = {'label': stateortransition.name, + 'fontname': 'Courier'} + if hasattr(stateortransition, 'state_of'): + props['shape'] = 'box' + props['style'] = 'filled' + if stateortransition.reverse_initial_state: + props['color'] = '#88CC88' + else: + props['shape'] = 'ellipse' + descr = [] + tr = stateortransition + if tr.require_group: + descr.append('%s %s'% ( + self._('groups:'), + ','.join(g.name for g in tr.require_group))) + if tr.condition: + descr.append('%s %s'% (self._('condition:'), tr.condition)) + if descr: + props['label'] += escape('\n'.join(descr)) + return props + + def edge_properties(self, transition, fromstate, tostate): + return {'label': '', 'dir': 'forward', + 'color': 'black', 'style': 'filled'} + + +class WorkflowVisitor: + def __init__(self, entity): + self.entity = entity + + def nodes(self): + for state in self.entity.reverse_state_of: + state.complete() + yield state.eid, state + + for transition in self.entity.reverse_transition_of: + transition.complete() + yield transition.eid, transition + + def edges(self): + for transition in self.entity.reverse_transition_of: + for incomingstate in transition.reverse_allowed_transition: + yield incomingstate.eid, transition.eid, transition + yield transition.eid, transition.destination().eid, transition + + +class CWETypeWorkflowImageView(TmpFileViewMixin, view.EntityView): + id = 'ewfgraph' + content_type = 'image/png' + __select__ = implements('CWEType') + + def _generate(self, tmpfile): + """display schema information for an entity""" + entity = self.entity(self.row, self.col) + visitor = WorkflowVisitor(entity) + prophdlr = WorkflowDotPropsHandler(self.req) + generator = GraphGenerator(DotBackend('workflow', 'LR', + ratio='compress', size='30,12')) + return generator.generate(visitor, prophdlr, tmpfile) + diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/xbel.py --- a/web/views/xbel.py Tue May 05 17:18:49 2009 +0200 +++ b/web/views/xbel.py Thu May 14 12:48:11 2009 +0200 @@ -1,7 +1,7 @@ """xbel views :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -9,18 +9,20 @@ from logilab.mtconverter import html_escape -from cubicweb.web.views.baseviews import XmlView, EntityView +from cubicweb.selectors import implements +from cubicweb.view import EntityView +from cubicweb.web.views.xmlrss import XMLView -class XbelView(XmlView): +class XbelView(XMLView): id = 'xbel' title = _('xbel') templatable = False - content_type = 'text/xml' #application/xbel+xml - + content_type = 'text/xml' #application/xbel+xml + def cell_call(self, row, col): self.wview('xbelitem', self.rset, row=row, col=col) - + def call(self): """display a list of entities by calling their view""" title = self.page_title() @@ -32,7 +34,7 @@ for i in xrange(self.rset.rowcount): self.cell_call(i, 0) self.w(u"") - + class XbelItemView(EntityView): id = 'xbelitem' @@ -45,10 +47,11 @@ def url(self, entity): return entity.absolute_url() - + + class XbelItemBookmarkView(XbelItemView): - accepts = ('Bookmark',) + __select__ = implements('Bookmark') def url(self, entity): return entity.actual_url() - + diff -r 49075f57cf2c -r aa09e20dd8c0 web/views/xmlrss.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/views/xmlrss.py Thu May 14 12:48:11 2009 +0200 @@ -0,0 +1,208 @@ +"""base xml and rss views + +:organization: Logilab +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr +""" +__docformat__ = "restructuredtext en" + +from time import timezone + +from logilab.mtconverter import xml_escape + +from cubicweb.selectors import non_final_entity, one_line_rset, appobject_selectable +from cubicweb.view import EntityView, AnyRsetView +from cubicweb.web.httpcache import MaxAgeHTTPCacheManager +from cubicweb.web.component import Component +from cubicweb.web.box import BoxTemplate +from cubicweb.common.uilib import simple_sgml_tag + +_ = unicode + + +# base xml views ############################################################## + +class XMLView(EntityView): + """xml view for entities""" + id = 'xml' + title = _('xml') + templatable = False + content_type = 'text/xml' + xml_root = 'rset' + item_vid = 'xmlitem' + + def cell_call(self, row, col): + self.wview(self.item_vid, self.rset, row=row, col=col) + + def call(self): + """display a list of entities by calling their view""" + self.w(u'\n' % self.req.encoding) + self.w(u'<%s size="%s">\n' % (self.xml_root, len(self.rset))) + for i in xrange(self.rset.rowcount): + self.cell_call(i, 0) + self.w(u'\n' % self.xml_root) + + +class XMLItemView(EntityView): + id = 'xmlitem' + + def cell_call(self, row, col): + """ element as an item for an xml feed """ + entity = self.complete_entity(row, col) + self.w(u'<%s>\n' % (entity.e_schema)) + for rschema, attrschema in entity.e_schema.attribute_definitions(): + attr = rschema.type + try: + value = entity[attr] + except KeyError: + # Bytes + continue + if value is not None: + if attrschema == 'Bytes': + from base64 import b64encode + value = '' % b64encode(value.getvalue()) + elif isinstance(value, basestring): + value = xml_escape(value) + self.w(u' <%s>%s\n' % (attr, value, attr)) + self.w(u'\n' % (entity.e_schema)) + + +class XMLRsetView(AnyRsetView): + """dumps raw rset as xml""" + id = 'rsetxml' + title = _('xml export') + templatable = False + content_type = 'text/xml' + xml_root = 'rset' + + def call(self): + w = self.w + rset, descr = self.rset, self.rset.description + eschema = self.schema.eschema + labels = self.columns_labels(False) + w(u'\n' % self.req.encoding) + w(u'<%s query="%s">\n' % (self.xml_root, xml_escape(rset.printable_rql()))) + for rowindex, row in enumerate(self.rset): + w(u' \n') + for colindex, val in enumerate(row): + etype = descr[rowindex][colindex] + tag = labels[colindex] + attrs = {} + if '(' in tag: + attrs['expr'] = tag + tag = 'funccall' + if val is not None and not eschema(etype).is_final(): + attrs['eid'] = val + # csvrow.append(val) # val is eid in that case + val = self.view('textincontext', rset, + row=rowindex, col=colindex) + else: + val = self.view('final', rset, displaytime=True, + row=rowindex, col=colindex, format='text/plain') + w(simple_sgml_tag(tag, val, **attrs)) + w(u' \n') + w(u'\n' % self.xml_root) + + +# RSS stuff ################################################################### + +class RSSFeedURL(Component): + id = 'rss_feed_url' + __select__ = non_final_entity() + + def feed_url(self): + return self.build_url(rql=self.limited_rql(), vid='rss') + + +class RSSEntityFeedURL(Component): + id = 'rss_feed_url' + __select__ = non_final_entity() & one_line_rset() + + def feed_url(self): + return self.entity(0, 0).rss_feed_url() + + +class RSSIconBox(BoxTemplate): + """just display the RSS icon on uniform result set""" + id = 'rss' + __select__ = (BoxTemplate.__select__ + & appobject_selectable('components', 'rss_feed_url')) + + visible = False + order = 999 + + def call(self, **kwargs): + try: + rss = self.req.external_resource('RSS_LOGO') + except KeyError: + self.error('missing RSS_LOGO external resource') + return + urlgetter = self.vreg.select_component('rss_feed_url', self.req, self.rset) + url = urlgetter.feed_url() + self.w(u'

\n' % (xml_escape(url), rss)) + + +class RSSView(XMLView): + id = 'rss' + title = _('rss') + templatable = False + content_type = 'text/xml' + http_cache_manager = MaxAgeHTTPCacheManager + cache_max_age = 60*60*2 # stay in http cache for 2 hours by default + + def _open(self): + req = self.req + self.w(u'\n' % req.encoding) + self.w(u'\n') + self.w(u' \n') + self.w(u' %s RSS Feed\n' + % xml_escape(self.page_title())) + self.w(u' %s\n' + % xml_escape(req.form.get('vtitle', ''))) + params = req.form.copy() + params.pop('vid', None) + self.w(u' %s\n' % xml_escape(self.build_url(**params))) + + def _close(self): + self.w(u' \n') + self.w(u'') + + def call(self): + """display a list of entities by calling their view""" + self._open() + for i in xrange(self.rset.rowcount): + self.cell_call(i, 0) + self._close() + + def cell_call(self, row, col): + self.wview('rssitem', self.rset, row=row, col=col) + + +class RSSItemView(EntityView): + id = 'rssitem' + date_format = '%%Y-%%m-%%dT%%H:%%M%+03i:00' % (timezone / 3600) + add_div_section = False + + def cell_call(self, row, col): + entity = self.complete_entity(row, col) + self.w(u'\n') + self.w(u'%s\n' + % xml_escape(entity.absolute_url())) + self.render_title_link(entity) + self._marker('description', entity.dc_description(format='text/html')) + self._marker('dc:date', entity.dc_date(self.date_format)) + self.render_entity_creator(entity) + self.w(u'\n') + + def render_title_link(self, entity): + self._marker('title', entity.dc_long_title()) + self._marker('link', entity.absolute_url()) + + def render_entity_creator(self, entity): + if entity.creator: + self._marker('dc:creator', entity.dc_creator()) + + + def _marker(self, marker, value): + if value: + self.w(u' <%s>%s\n' % (marker, xml_escape(value), marker)) diff -r 49075f57cf2c -r aa09e20dd8c0 web/wdoc/custom_view_rss_fr.rst --- a/web/wdoc/custom_view_rss_fr.rst Tue May 05 17:18:49 2009 +0200 +++ b/web/wdoc/custom_view_rss_fr.rst Thu May 14 12:48:11 2009 +0200 @@ -14,5 +14,5 @@ :raw-html:`

latest changes

` +alt="rss" src="data/rss.png"> latest changes

` diff -r 49075f57cf2c -r aa09e20dd8c0 web/wdoc/tut_rql_en.rst --- a/web/wdoc/tut_rql_en.rst Tue May 05 17:18:49 2009 +0200 +++ b/web/wdoc/tut_rql_en.rst Thu May 14 12:48:11 2009 +0200 @@ -127,16 +127,16 @@ * `creation_date (Datetime)`, date on which the entity has been created * `modification_date (Datetime)`, lastest date on which the entity has been modified -* `created_by (EUser)`, relation to the user which has created this entity +* `created_by (CWUser)`, relation to the user which has created this entity -* `owned_by (EUser)`, relation to the user()s considered as owner of this +* `owned_by (CWUser)`, relation to the user()s considered as owner of this entity, the entity's creator by default * `is (Eetype)`, special relation to specify a variable type. A user's entity has the following schema: -:EUser: +:CWUser: :: login (String) not null diff -r 49075f57cf2c -r aa09e20dd8c0 web/wdoc/tut_rql_fr.rst --- a/web/wdoc/tut_rql_fr.rst Tue May 05 17:18:49 2009 +0200 +++ b/web/wdoc/tut_rql_fr.rst Thu May 14 12:48:11 2009 +0200 @@ -134,9 +134,9 @@ * `creation_date (Datetime)`, date de création de l'entité * `modification_date (Datetime)`, date de dernière modification de l'entité -* `created_by (EUser)`, relation vers l'utilisateur ayant créé l'entité +* `created_by (CWUser)`, relation vers l'utilisateur ayant créé l'entité -* `owned_by (EUser)`, relation vers le où les utilisateurs considérés comme +* `owned_by (CWUser)`, relation vers le où les utilisateurs considérés comme propriétaire de l'entité, par défaut le créateur de l'entité * `is (Eetype)`, relation spéciale permettant de spécifier le @@ -144,7 +144,7 @@ Enfin, le schéma standard d'un utilisateur est le suivant : -:EUser: +:CWUser: :: login (String, obligatoire) diff -r 49075f57cf2c -r aa09e20dd8c0 web/webconfig.py --- a/web/webconfig.py Tue May 05 17:18:49 2009 +0200 +++ b/web/webconfig.py Thu May 14 12:48:11 2009 +0200 @@ -7,8 +7,7 @@ __docformat__ = "restructuredtext en" import os -from os.path import join, dirname, exists, split -from urlparse import urljoin +from os.path import join, exists, split from logilab.common.configuration import Method from logilab.common.decorators import cached @@ -23,10 +22,10 @@ ('site-title', {'type' : 'string', 'default': 'unset title', 'help': _('site title'), - 'sitewide': True, 'group': 'ui', + 'sitewide': True, 'group': 'ui', }), ('main-template', - {'type' : 'string', 'default': 'main', + {'type' : 'string', 'default': 'main-template', 'help': _('id of main template used to render pages'), 'sitewide': True, 'group': 'ui', }), @@ -55,7 +54,7 @@ 'help': _('maximum number of entities to display in related combo box'), 'group': 'navigation', }), - + )) @@ -65,7 +64,7 @@ """ cubicweb_vobject_path = CubicWebConfiguration.cubicweb_vobject_path | set(['web/views']) cube_vobject_path = CubicWebConfiguration.cube_vobject_path | set(['views']) - + options = merge_options(CubicWebConfiguration.options + ( ('anonymous-user', {'type' : 'string', @@ -80,6 +79,12 @@ 'if anonymous-user is set', 'group': 'main', 'inputlevel': 1, }), + ('allow-email-login', + {'type' : 'yn', + 'default': False, + 'help': 'allow users to login with their primary email if set', + 'group': 'main', 'inputlevel': 2, + }), ('query-log-file', {'type' : 'string', 'default': None, @@ -180,7 +185,7 @@ 'interface\'s language according to browser defined preferences', 'group': 'web', 'inputlevel': 2, }), - + ('print-traceback', {'type' : 'yn', 'default': not CubicWebConfiguration.mode == 'installed', @@ -193,16 +198,25 @@ try: cube = self.cubes()[0] cubeeid = self.cube_pkginfo(cube).cube_eid - except Exception, ex: + except Exception: return None if cubeeid: return 'http://intranet.logilab.fr/jpl/view?__linkto=concerns:%s:subject&etype=Ticket&type=bug&vid=creation' % cubeeid return None + def fckeditor_installed(self): + return exists(self.ext_resources['FCKEDITOR_PATH']) + + def eproperty_definitions(self): + for key, pdef in super(WebConfiguration, self).eproperty_definitions(): + if key == 'ui.fckeditor' and not self.fckeditor_installed(): + continue + yield key, pdef + # method used to connect to the repository: 'inmemory' / 'pyro' # Pyro repository by default repo_method = 'pyro' - + # don't use @cached: we want to be able to disable it while this must still # be cached def repository(self, vreg=None): @@ -221,7 +235,7 @@ def vc_config(self): return self.repository().get_versions() - + # mapping to external resources (id -> path) (`external_resources` file) ## ext_resources = { 'FAVICON': 'DATADIR/favicon.ico', @@ -230,13 +244,13 @@ 'HELP': 'DATADIR/help.png', 'CALENDAR_ICON': 'DATADIR/calendar.gif', 'SEARCH_GO':'DATADIR/go.png', - + 'FCKEDITOR_PATH': '/usr/share/fckeditor/', - + 'IE_STYLESHEETS': ['DATADIR/cubicweb.ie.css'], 'STYLESHEETS': ['DATADIR/cubicweb.css'], 'STYLESHEETS_PRINT': ['DATADIR/cubicweb.print.css'], - + 'JAVASCRIPTS': ['DATADIR/jquery.js', 'DATADIR/jquery.corner.js', 'DATADIR/jquery.json.js', @@ -244,8 +258,8 @@ 'DATADIR/cubicweb.python.js', 'DATADIR/cubicweb.htmlhelpers.js'], } - - + + def anonymous_user(self): """return a login and password to use for anonymous users. None may be returned for both if anonymous connections are not allowed @@ -258,7 +272,7 @@ if user is not None: user = unicode(user) return user, passwd - + def has_resource(self, rid): """return true if an external resource is defined""" return bool(self.ext_resources.get(rid)) @@ -267,19 +281,19 @@ def locate_resource(self, rid): """return the directory where the given resource may be found""" return self._fs_locate(rid, 'data') - + @cached def locate_doc_file(self, fname): """return the directory where the given resource may be found""" return self._fs_locate(fname, 'wdoc') - + def _fs_locate(self, rid, rdirectory): """return the directory where the given resource may be found""" path = [self.apphome] + self.cubes_path() + [join(self.shared_dir())] for directory in path: if exists(join(directory, rdirectory, rid)): return join(directory, rdirectory) - + def locate_all_files(self, rid, rdirectory='wdoc'): """return all files corresponding to the given resource""" path = [self.apphome] + self.cubes_path() + [join(self.shared_dir())] @@ -294,7 +308,7 @@ # load external resources definition self._build_ext_resources() self._init_base_url() - + def _init_base_url(self): # normalize base url(s) baseurl = self['base-url'] @@ -327,11 +341,11 @@ # static files handling ################################################### - + @property def static_directory(self): return join(self.appdatahome, 'static') - + def static_file_exists(self, rpath): return exists(join(self.static_directory, rpath)) @@ -351,4 +365,3 @@ def static_file_del(self, rpath): if self.static_file_exists(rpath): os.remove(join(self.static_directory, rpath)) - diff -r 49075f57cf2c -r aa09e20dd8c0 web/webctl.py --- a/web/webctl.py Tue May 05 17:18:49 2009 +0200 +++ b/web/webctl.py Thu May 14 12:48:11 2009 +0200 @@ -12,7 +12,7 @@ class WebCreateHandler(CommandHandler): cmdname = 'create' - + def bootstrap(self, cubes, inputlevel=0): """bootstrap this configuration""" print '** generic web configuration' @@ -23,9 +23,8 @@ print '-' * 72 config.input_config('pyro-client', inputlevel) if confirm('allow anonymous access', False): - config.global_set_option('anonymous-user', 'anon') - config.global_set_option('anonymous-password', 'anon') - + config.global_set_option('anonymous-user', 'anon') + config.global_set_option('anonymous-password', 'anon') + def postcreate(self): """hooks called once application's initialization has been completed""" - diff -r 49075f57cf2c -r aa09e20dd8c0 web/widgets.py --- a/web/widgets.py Tue May 05 17:18:49 2009 +0200 +++ b/web/widgets.py Thu May 14 12:48:11 2009 +0200 @@ -4,13 +4,12 @@ serialization time :organization: Logilab -:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" -from simplejson import dumps -from mx.DateTime import now, today +from datetime import datetime from logilab.mtconverter import html_escape @@ -64,7 +63,7 @@ autoid = True html_attributes = set(('id', 'class', 'tabindex', 'accesskey', 'onchange', 'onkeypress')) cubicwebns_attributes = set() - + def __init__(self, vreg, subjschema, rschema, objschema, role='subject', description=None, **kwattrs): @@ -84,12 +83,12 @@ because widget instances are cached) """ # brute force copy (subclasses don't have the - # same __init__ prototype) + # same __init__ prototype) widget = self.__new__(self.__class__) widget.__dict__ = dict(self.__dict__) widget.attrs = dict(widget.attrs) return widget - + @staticmethod def size_constraint_attrs(attrs, maxsize): """set html attributes in the attrs dict to consider maxsize""" @@ -106,7 +105,7 @@ elif name in self.html_attributes: attrs.append(u'%s="%s"' % (name, value)) return u' '.join(sorted(attrs)) - + def required(self, entity): """indicates if the widget needs a value to be filled in""" card = self.rschema.cardinality(self.subjtype, self.objtype, self.role) @@ -117,7 +116,7 @@ return self.rname except AttributeError: return eid_param(self.name, entity.eid) - + def render_label(self, entity, label=None): """render widget's label""" label = label or self.rschema.display_name(entity.req, self.role) @@ -131,7 +130,7 @@ else: label = u'%s' % (forattr, label) return label - + def render_error(self, entity): """return validation error for widget's field of the given entity, if any @@ -145,25 +144,26 @@ def render_help(self, entity): """render a help message about the (edited) field""" req = entity.req - help = [u'
'] + help = [u'

'] descr = self.description or self.rschema.rproperty(self.subjtype, self.objtype, 'description') if descr: - help.append(u'%s' % req._(descr)) + help.append(u'%s' % req._(descr)) example = self.render_example(req) if example: - help.append(u'(%s: %s)' + help.append(u'(%s: %s)' % (req._('sample format'), example)) + help.append(u'

') return u' '.join(help) - + def render_example(self, req): return u'' - + def render(self, entity): """render the widget for a simple view""" if not entity.has_eid(): return u'' return entity.printable_value(self.name) - + def edit_render(self, entity, tabindex=None, includehelp=False, useid=None, **kwargs): """render the widget for edition""" @@ -181,7 +181,7 @@ if includehelp: output += self.render_help(entity) return output - + def _edit_render(self, entity): """do the actual job to render the widget for edition""" raise NotImplementedError @@ -197,7 +197,7 @@ elif entity.has_eid(): return [row[0] for row in entity.related(self.name, self.role)] return () - + def current_value(self, entity): return _value_from_values(self.current_values(entity)) @@ -214,13 +214,13 @@ if not isinstance(cdvalues, (list, tuple)): cdvalues = (cdvalues,) return cdvalues - + def current_display_value(self, entity): """same as .current_value but consider values stored in session in case of validation error """ return _value_from_values(self.current_display_values(entity)) - + def hidden_input(self, entity, qvalue): """return an hidden field which 1. indicates that a field is edited @@ -259,7 +259,7 @@ def __init__(self, vreg, subjschema, rschema, objschema, role='subject', **kwattrs): InputWidget.__init__(self, vreg, subjschema, rschema, objschema, - role='subject', + role='subject', **kwattrs) # disable access key del self.attrs['accesskey'] @@ -271,18 +271,18 @@ def current_display_value(self, entity): value = InputWidget.current_display_value(self, entity) return value or INTERNAL_FIELD_VALUE - + def render_label(self, entity, label=None): """render widget's label""" return u'' - + def render_help(self, entity): return u'' - + def hidden_input(self, entity, value): """no hidden input for hidden input""" return '' - + class EidWidget(HiddenWidget): @@ -298,15 +298,15 @@ """set html attributes in the attrs dict to consider maxsize""" attrs['size'] = min(maxsize, 40) attrs['maxlength'] = maxsize - - + + class AutoCompletionWidget(StringWidget): cubicwebns_attributes = (StringWidget.cubicwebns_attributes | set(('accesskey', 'size', 'maxlength'))) attrs = () - + wdgtype = 'SuggestField' - + def current_value(self, entity): value = StringWidget.current_value(self, entity) return value or INTERNAL_FIELD_VALUE @@ -345,22 +345,22 @@ class StaticFileAutoCompletionWidget(AutoCompletionWidget): wdgtype = 'StaticFileSuggestField' - + def _get_url(self, entity): return entity.req.datadir_url + entity.autocomplete_initfuncs[self.rschema] class RestrictedAutoCompletionWidget(AutoCompletionWidget): - wdgtype = 'RestrictedSuggestField' + wdgtype = 'RestrictedSuggestField' - + class PasswordWidget(InputWidget): input_type = 'password' - + def required(self, entity): if InputWidget.required(self, entity) and not entity.has_eid(): return True return False - + def current_values(self, entity): # on existant entity, show password field has non empty (we don't have # the actual value @@ -375,10 +375,10 @@ html, self.input_type, name, name, entity.req.next_tabindex(), entity.req._('confirm password')) - + class TextWidget(Widget): html_attributes = Widget.html_attributes | set(('rows', 'cols')) - + @staticmethod def size_constraint_attrs(attrs, maxsize): """set html attributes in the attrs dict to consider maxsize""" @@ -386,16 +386,12 @@ attrs['cols'], attrs['rows'] = 60, 5 else: attrs['cols'], attrs['rows'] = 80, 10 - + def render(self, entity): if not entity.has_eid(): return u'' return entity.printable_value(self.name) - - def add_fckeditor_info(self, req): - req.add_js('fckeditor.js') - req.fckeditor_config() - + def _edit_render(self, entity, with_format=True): req = entity.req editor = self._edit_render_textarea(entity, with_format) @@ -403,7 +399,7 @@ if isinstance(value, basestring): value = html_escape(value) return u'%s%s' % (self.hidden_input(entity, value), editor) - + def _edit_render_textarea(self, entity, with_format): self.attrs.setdefault('cols', 80) self.attrs.setdefault('rows', 20) @@ -411,10 +407,10 @@ if isinstance(dvalue, basestring): dvalue = html_escape(dvalue) if entity.use_fckeditor(self.name): - self.add_fckeditor_info(entity.req) + entity.req.fckeditor_config() if with_format: if entity.has_eid(): - format = entity.format(self.name) + format = entity.attr_metadata(self.name, 'format') else: format = '' frname = eid_param(self.name + '_format', entity.eid) @@ -423,7 +419,7 @@ frname, format, frname) return u'%s' % ( hidden, self.rname, self.format_attrs(), dvalue) - if with_format and entity.has_format(self.name): + if with_format and entity.e_schema.has_metadata(self.name, 'format'): fmtwdg = entity.get_widget(self.name + '_format') fmtwdgstr = fmtwdg.edit_render(entity, tabindex=self.attrs['tabindex']) self.attrs['tabindex'] = entity.req.next_tabindex() @@ -431,8 +427,8 @@ fmtwdgstr = '' return u'%s
' % ( fmtwdgstr, self.rname, self.format_attrs(), dvalue) - - + + class CheckBoxWidget(Widget): html_attributes = Widget.html_attributes | set(('checked', )) def _edit_render(self, entity): @@ -465,13 +461,14 @@ u'%s
' % (self.rname, attrs2, entity.req._('no'))] return '\n'.join(wdgs) - + class FileWidget(Widget): need_multipart = True def _file_wdg(self, entity): wdgs = [u'' % (self.rname, self.format_attrs())] req = entity.req - if entity.has_format(self.name) or entity.has_text_encoding(self.name): + if (entity.e_schema.has_metadata(self.name, 'format') + or entity.e_schema.has_metadata(self.name, 'encoding')): divid = '%s-%s-advanced' % (self.name, entity.eid) wdgs.append(u'

' % (html_escape(toggle_action(divid)), @@ -496,7 +493,7 @@ wdgs.append(u'
') wdgs.append(req._('currently attached file: %s' % entity.dc_title())) return '\n'.join(wdgs) - + def _edit_render(self, entity): return self.hidden_input(entity, None) + self._file_wdg(entity) @@ -514,17 +511,17 @@ 'You can either submit a new file using the browse button above' ', or edit file content online with the widget below.') return msg - + def _edit_render(self, entity): wdgs = [self._file_wdg(entity)] - if entity.format(self.name) in ('text/plain', 'text/html', 'text/rest'): + if entity.attr_metadata(self.name, 'format') in ('text/plain', 'text/html', 'text/rest'): msg = self._edit_msg(entity) wdgs.append(u'

' % msg) twdg = TextWidget(self.vreg, self.subjtype, self.rschema, self.objtype) twdg.rname = self.rname data = getattr(entity, self.name) if data: - encoding = entity.text_encoding(self.name) + encoding = entity.attr_metadata(self.name, 'encoding') try: entity[self.name] = unicode(data.getvalue(), encoding) except UnicodeError: @@ -538,7 +535,7 @@ class ComboBoxWidget(Widget): html_attributes = Widget.html_attributes | set(('multiple', 'size')) - + def __init__(self, vreg, subjschema, rschema, objschema, multiple=False, **kwattrs): super(ComboBoxWidget, self).__init__(vreg, subjschema, rschema, objschema, @@ -549,10 +546,10 @@ self.attrs['size'] = '5' # disable access key (dunno why but this is not allowed by xhtml 1.0) del self.attrs['accesskey'] - + def vocabulary(self, entity): raise NotImplementedError() - + def form_value(self, entity, value, values): if value in values: flag = 'selected="selected"' @@ -578,9 +575,9 @@ res.append(u'') return '\n'.join(res) - + class StaticComboBoxWidget(ComboBoxWidget): - + def __init__(self, vreg, subjschema, rschema, objschema, vocabfunc, multiple=False, sort=False, **kwattrs): super(StaticComboBoxWidget, self).__init__(vreg, subjschema, rschema, objschema, @@ -595,11 +592,11 @@ if self.rschema.rproperty(self.subjtype, self.objtype, 'internationalizable'): return zip((entity.req._(v) for v in choices), choices) return zip(choices, choices) - + class EntityLinkComboBoxWidget(ComboBoxWidget): """to be used be specific forms""" - + def current_values(self, entity): if entity.has_eid(): return [r[0] for r in entity.related(self.name, self.role)] @@ -607,13 +604,13 @@ if hasattr(entity, defaultmeth): return getattr(entity, defaultmeth)() return () - + def vocabulary(self, entity): return [('', INTERNAL_FIELD_VALUE)] + entity.vocabulary(self.rschema, self.role) class RawDynamicComboBoxWidget(EntityLinkComboBoxWidget): - + def vocabulary(self, entity, limit=None): req = entity.req # first see if its specified by __linkto form parameters @@ -636,7 +633,7 @@ class DynamicComboBoxWidget(RawDynamicComboBoxWidget): - + def vocabulary(self, entity, limit=None): return sorted(super(DynamicComboBoxWidget, self).vocabulary(entity, limit)) @@ -667,17 +664,17 @@ res.append(u'

') return '\n'.join(res) + class IntegerWidget(StringWidget): def __init__(self, vreg, subjschema, rschema, objschema, **kwattrs): kwattrs['size'] = 5 kwattrs['maxlength'] = 15 StringWidget.__init__(self, vreg, subjschema, rschema, objschema, **kwattrs) - + def render_example(self, req): return '23' - - + class FloatWidget(StringWidget): def __init__(self, vreg, subjschema, rschema, objschema, **kwattrs): kwattrs['size'] = 5 @@ -687,7 +684,7 @@ def render_example(self, req): formatstr = req.property_value('ui.float-format') return formatstr % 1.23 - + def current_values(self, entity): values = entity.attribute_values(self.name) if values: @@ -700,41 +697,24 @@ return [formatstr % value] return () + class DecimalWidget(StringWidget): def __init__(self, vreg, subjschema, rschema, objschema, **kwattrs): kwattrs['size'] = 5 kwattrs['maxlength'] = 15 StringWidget.__init__(self, vreg, subjschema, rschema, objschema, **kwattrs) - + def render_example(self, req): return '345.0300' - class DateWidget(StringWidget): format_key = 'ui.date-format' - monthnames = ("january", "february", "march", "april", - "may", "june", "july", "august", - "september", "october", "november", "december") - - daynames = ("monday", "tuesday", "wednesday", "thursday", - "friday", "saturday", "sunday") - - def __init__(self, vreg, subjschema, rschema, objschema, **kwattrs): - kwattrs.setdefault('size', 10) - kwattrs.setdefault('maxlength', 10) - StringWidget.__init__(self, vreg, subjschema, rschema, objschema, **kwattrs) - - def current_values(self, entity): - values = entity.attribute_values(self.name) - if values and hasattr(values[0], 'strftime'): - formatstr = entity.req.property_value(self.format_key) - return [values[0].strftime(formatstr)] - return values - - def render_example(self, req): - formatstr = req.property_value(self.format_key) - return now().strftime(formatstr) + monthnames = ('january', 'february', 'march', 'april', + 'may', 'june', 'july', 'august', + 'september', 'october', 'november', 'december') + daynames = ('monday', 'tuesday', 'wednesday', 'thursday', + 'friday', 'saturday', 'sunday') @classmethod def add_localized_infos(cls, req): @@ -746,6 +726,22 @@ req.html_headers.define_var('MONTHNAMES', monthnames) req.html_headers.define_var('DAYNAMES', daynames) + def __init__(self, vreg, subjschema, rschema, objschema, **kwattrs): + kwattrs.setdefault('size', 10) + kwattrs.setdefault('maxlength', 10) + StringWidget.__init__(self, vreg, subjschema, rschema, objschema, **kwattrs) + + def current_values(self, entity): + values = entity.attribute_values(self.name) + if values and hasattr(values[0], 'strftime'): + formatstr = entity.req.property_value(self.format_key) + return [values[0].strftime(str(formatstr))] + return values + + def render_example(self, req): + formatstr = req.property_value(self.format_key) + return datetime.now().strftime(str(formatstr)) + def _edit_render(self, entity): wdg = super(DateWidget, self)._edit_render(entity) @@ -755,14 +751,15 @@ def render_help(self, entity): """calendar popup widget""" req = entity.req - help = [ u'
' ] + help = [ u'

' ] descr = self.rschema.rproperty(self.subjtype, self.objtype, 'description') if descr: - help.append('%s' % req._(descr)) + help.append('%s' % req._(descr)) example = self.render_example(req) if example: - help.append('(%s: %s)' + help.append('(%s: %s)' % (req._('sample format'), example)) + help.append(u'

') return u' '.join(help) def render_calendar_popup(self, entity): @@ -773,7 +770,7 @@ req.add_css(('cubicweb.calendar_popup.css',)) inputid = self.attrs.get('id', self.rname) helperid = "%shelper" % inputid - _today = today() + _today = datetime.now() year = int(req.form.get('year', _today.year)) month = int(req.form.get('month', _today.month)) @@ -784,23 +781,20 @@ class DateTimeWidget(DateWidget): format_key = 'ui.datetime-format' - - def render_example(self, req): - formatstr1 = req.property_value('ui.datetime-format') - formatstr2 = req.property_value('ui.date-format') - return req._('%(fmt1)s, or without time: %(fmt2)s') % { - 'fmt1': now().strftime(formatstr1), - 'fmt2': now().strftime(formatstr2), - } - - - def __init__(self, vreg, subjschema, rschema, objschema, **kwattrs): kwattrs['size'] = 16 kwattrs['maxlength'] = 16 DateWidget.__init__(self, vreg, subjschema, rschema, objschema, **kwattrs) + def render_example(self, req): + formatstr1 = req.property_value('ui.datetime-format') + formatstr2 = req.property_value('ui.date-format') + return req._('%(fmt1)s, or without time: %(fmt2)s') % { + 'fmt1': datetime.now().strftime(str(formatstr1)), + 'fmt2': datetime.now().strftime(str(formatstr2)), + } + class TimeWidget(StringWidget): format_key = 'ui.time-format' @@ -809,26 +803,26 @@ kwattrs['maxlength'] = 5 StringWidget.__init__(self, vreg, subjschema, rschema, objschema, **kwattrs) - + class EmailWidget(StringWidget): - + def render(self, entity): email = getattr(entity, self.name) if not email: return u'' return u'%s' % (email, email) - + class URLWidget(StringWidget): - + def render(self, entity): url = getattr(entity, self.name) if not url: return u'' url = html_escape(url) return u'%s' % (url, url) - + class EmbededURLWidget(StringWidget): - + def render(self, entity): url = getattr(entity, self.name) if not url: @@ -838,59 +832,6 @@ -class PropertyKeyWidget(ComboBoxWidget): - """specific widget for EProperty.pkey field to set the value widget according to - the selected key - """ - - def _edit_render(self, entity): - entity.req.add_js( ('cubicweb.ajax.js', 'cubicweb.edition.js') ) - vtabindex = self.attrs.get('tabindex', 0) + 1 - self.attrs['onchange'] = "javascript:setPropValueWidget('%s', %s)" % ( - entity.eid, vtabindex) - # limit size - if not entity.has_eid(): - self.attrs['size'] = 10 - else: - self.attrs['size'] = 1 - return super(PropertyKeyWidget, self)._edit_render(entity) - - def vocabulary(self, entity): - _ = entity.req._ - if entity.has_eid(): - return [(_(entity.pkey), entity.pkey)] - # key beginning with 'system.' should usually not be edited by hand - choices = entity.vreg.user_property_keys() - return sorted(zip((_(v) for v in choices), choices)) - - -class PropertyValueWidget(Widget): - """specific widget for EProperty.value field which will be different according to - the selected key type and vocabulary information - """ - - def render_help(self, entity): - return u'' - - def render(self, entity): - assert entity.has_eid() - w = self.vreg.property_value_widget(entity.pkey, req=entity.req, **self.attrs) - return w.render(entity) - - def _edit_render(self, entity): - if not entity.has_eid(): - # no key set yet, just include an empty div which will be filled - # on key selection - # empty span as well else html validation fail (label is refering to this id) - return u'

' % (self.rname, self.attrs.get('id')) - w = self.vreg.property_value_widget(entity.pkey, req=entity.req, **self.attrs) - if entity.pkey.startswith('system.'): - value = '%s' % (self.attrs.get('id'), w.render(entity)) - msg = entity.req._('value associated to this key is not editable manually') - return value + '

' % msg - return w.edit_render(entity, self.attrs.get('tabindex'), includehelp=True) - - def widget_factory(vreg, subjschema, rschema, objschema, role='subject', **kwargs): """return the most adapated widget to edit the relation @@ -900,7 +841,7 @@ eclass, subjschema = _eclass_eschema(subjschema) else: eclass, objschema = _eclass_eschema(objschema) - if eclass is not None and rschema in eclass.widgets: + if eclass is not None and rschema in getattr(eclass, 'widgets', ()): wcls = WIDGETS[eclass.widgets[rschema]] elif not rschema.is_final(): card = rschema.rproperty(subjschema, objschema, 'cardinality') @@ -918,14 +859,14 @@ # factories to find the most adapated widget according to a type and other constraints - + def _string_widget_factory(vreg, subjschema, rschema, objschema, wcls=None, **kwargs): w = None for c in rschema.rproperty(subjschema, objschema, 'constraints'): if isinstance(c, StaticVocabularyConstraint): # may have been set by a previous SizeConstraint but doesn't make sense # here (even doesn't have the same meaning on a combobox actually) - kwargs.pop('size', None) + kwargs.pop('size', None) return (wcls or StaticComboBoxWidget)(vreg, subjschema, rschema, objschema, vocabfunc=c.vocabulary, **kwargs) if isinstance(c, SizeConstraint) and c.max is not None: @@ -975,7 +916,7 @@ 'String' : StringWidget, 'Time': TimeWidget, } - + # widgets registry WIDGETS = {} def register(widget_list): diff -r 49075f57cf2c -r aa09e20dd8c0 wsgi/__init__.py --- a/wsgi/__init__.py Tue May 05 17:18:49 2009 +0200 +++ b/wsgi/__init__.py Thu May 14 12:48:11 2009 +0200 @@ -7,7 +7,7 @@ WSGI corresponding PEP: http://www.python.org/dev/peps/pep-0333/ :organization: Logilab -:copyright: 2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" @@ -25,7 +25,7 @@ return _pformat(obj) except: return u'' - + def qs2dict(qs): """transforms a query string into a regular python dict""" result = {} @@ -35,7 +35,7 @@ def normalize_header(header): """returns a normalized header name - + >>> normalize_header('User_Agent') 'User-agent' """ @@ -84,4 +84,3 @@ else: post.setdefault(key, []).append(submessage.get_payload()) return post, files - diff -r 49075f57cf2c -r aa09e20dd8c0 wsgi/handler.py --- a/wsgi/handler.py Tue May 05 17:18:49 2009 +0200 +++ b/wsgi/handler.py Thu May 14 12:48:11 2009 +0200 @@ -1,7 +1,7 @@ """WSGI request handler for cubicweb :organization: Logilab -:copyright: 2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ @@ -74,7 +74,7 @@ def __iter__(self): return iter(self.body) - + class CubicWebWSGIApplication(object): @@ -100,7 +100,7 @@ self.url_rewriter = self.appli.vreg.select_component('urlrewriter') except ObjectNotFound: self.url_rewriter = None - + def _render(self, req): """this function performs the actual rendering XXX missing: https handling, url rewriting, cache management, @@ -156,8 +156,8 @@ # 500 Internal server error return self.redirect(req, req.build_url('error')) return WSGIResponse(200, req, result) - - + + def __call__(self, environ, start_response): """WSGI protocol entry point""" req = CubicWebWsgiRequest(environ, self.appli.vreg, self.base_url) @@ -170,7 +170,7 @@ self.debug('redirecting to %s', location) req.set_header('location', str(location)) return WSGIResponse(303, req) - + def request_auth(self, req, loggedout=False): """returns the appropriate WSGIResponse to require the user to log in """ diff -r 49075f57cf2c -r aa09e20dd8c0 wsgi/request.py --- a/wsgi/request.py Tue May 05 17:18:49 2009 +0200 +++ b/wsgi/request.py Thu May 14 12:48:11 2009 +0200 @@ -5,7 +5,7 @@ http://www.djangoproject.com/ :organization: Logilab -:copyright: 2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved. +:copyright: 2008-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved. :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ @@ -25,7 +25,7 @@ class CubicWebWsgiRequest(CubicWebRequestBase): """most of this code COMES FROM DJANO """ - + def __init__(self, environ, vreg, base_url=None): self.environ = environ self.path = environ['PATH_INFO'] @@ -42,7 +42,7 @@ self.form.update(files) # prepare output headers self.headers_out = {} - + def __repr__(self): # Since this is called as part of error handling, we need to be very # robust against potentially malformed input. @@ -52,14 +52,14 @@ (form, meta) ## cubicweb request interface ################################################ - + def base_url(self): return self._base_url def http_method(self): """returns 'POST', 'GET', 'HEAD', etc.""" return self.method - + def relative_path(self, includeparams=True): """return the normalized path of the request (ie at least relative to the application's root, but some other normalization may be needed @@ -74,7 +74,7 @@ qs = self.environ.get('QUERY_STRING') if qs: return '%s?%s' % (path, qs) - + return path def get_header(self, header, default=None): @@ -82,7 +82,7 @@ raise KeyError if the header is not set """ return self._headers.get(normalize_header(header), default) - + def set_header(self, header, value, raw=True): """set an output HTTP header""" assert raw, "don't know anything about non-raw headers for wsgi requests" @@ -91,7 +91,7 @@ def add_header(self, header, value): """add an output HTTP header""" self.headers_out[header] = value - + def remove_header(self, header): """remove an output HTTP header""" self.headers_out.pop(header, None) @@ -101,9 +101,9 @@ mx date time value (GMT), else return None """ return None - + ## wsgi request helpers ################################################### - + def application_uri(self): """Return the application's base URI (no PATH_INFO or QUERY_STRING) @@ -123,7 +123,7 @@ url += ':' + environ['SERVER_PORT'] url += quote(environ.get('SCRIPT_NAME') or '/') return url - + def get_full_path(self): return '%s%s' % (self.path, self.environ.get('QUERY_STRING', '') and ('?' + self.environ.get('QUERY_STRING', '')) or '')

%(from_header)s	%(from)s
%(recipients_header)s	%(recipients)s
%(subject)s