Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authorArthur Lutz <arthur.lutz@logilab.fr>
Wed, 11 Feb 2009 17:00:39 +0100
changeset 596 5ecf67090c2f
parent 595 178fc96fd148 (current diff)
parent 584 3ca2cbf1e2ce (diff)
child 597 f8c1f8a40749
merge
entities/authobjs.py file | annotate | diff | comparison | revisions
web/views/basetemplates.py file | annotate | diff | comparison | revisions 
--- a/entities/authobjs.py	Wed Feb 11 14:46:46 2009 +0100
+++ b/entities/authobjs.py	Wed Feb 11 17:00:39 2009 +0100
@@ -1,3 +1,10 @@
+"""entity classes user and group 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 logilab.common.decorators import cached
 
 from cubicweb import Unauthorized
@@ -26,6 +33,7 @@
                   'in_group'   : 'primary', 
                   ('owned_by', '*', 'object') : ('generated', 'link'),
                   ('created_by','*','object') : ('generated', 'link'),
+                  ('bookmarked_by', '*', 'object'): ('generated', 'create'),
                   }
     
     # used by repository to check if  the user can log in or not
--- a/entities/lib.py	Wed Feb 11 14:46:46 2009 +0100
+++ b/entities/lib.py	Wed Feb 11 17:00:39 2009 +0100
@@ -1,7 +1,7 @@
 """entity classes for optional library 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"
--- a/i18n/en.po	Wed Feb 11 14:46:46 2009 +0100
+++ b/i18n/en.po	Wed Feb 11 17:00:39 2009 +0100
@@ -376,6 +376,9 @@
 msgid "Problem occured"
 msgstr ""
 
+msgid "Project linked data"
+msgstr ""
+
 msgid "RQLExpression"
 msgstr "RQL expression"
 
@@ -717,6 +720,9 @@
 msgid "add"
 msgstr ""
 
+msgid "add Bookmark bookmarked_by EUser object"
+msgstr "bookmark"
+
 msgid "add EEType add_permission RQLExpression subject"
 msgstr "rql expression for the add permission"
 
@@ -1311,6 +1317,9 @@
 msgid "created_by_object"
 msgstr "has created"
 
+msgid "creating Bookmark (Bookmark bookmarked_by EUser %(linkto)s)"
+msgstr "creating bookmark for %(linkto)s"
+
 msgid "creating EConstraint (EFRDef %(linkto)s constrained_by EConstraint)"
 msgstr "creating constraint for attribute %(linkto)s"
 
@@ -1668,12 +1677,18 @@
 msgid "february"
 msgstr ""
 
+msgid "file tree view"
+msgstr ""
+
 msgid "final"
 msgstr ""
 
 msgid "firstname"
 msgstr ""
 
+msgid "foaf"
+msgstr ""
+
 msgid "follow"
 msgstr ""
 
@@ -1997,6 +2012,9 @@
 msgid "list"
 msgstr ""
 
+msgid "loading"
+msgstr ""
+
 msgid "log in"
 msgstr ""
 
@@ -2025,6 +2043,9 @@
 msgid "manage bookmarks"
 msgstr ""
 
+msgid "manage permissions"
+msgstr ""
+
 msgid "manage security"
 msgstr ""
 
@@ -2137,6 +2158,9 @@
 msgid "not authorized"
 msgstr ""
 
+msgid "not selected"
+msgstr ""
+
 msgid "not specified"
 msgstr ""
 
@@ -2173,6 +2197,15 @@
 msgid "ordernum"
 msgstr "order"
 
+msgid "owl (tbox+abox)"
+msgstr ""
+
+msgid "owlabox"
+msgstr ""
+
+msgid "owlaboxlight"
+msgstr ""
+
 msgid "owned_by"
 msgstr "owned by"
 
@@ -2416,6 +2449,9 @@
 msgid "select this entity"
 msgstr ""
 
+msgid "selected"
+msgstr ""
+
 msgid "semantic description of this attribute"
 msgstr ""
 
@@ -2541,6 +2577,9 @@
 msgid "task progression"
 msgstr ""
 
+msgid "tbox"
+msgstr ""
+
 msgid "text"
 msgstr ""
 
@@ -2617,6 +2656,9 @@
 msgid "transition_of_object"
 msgstr "use transitions"
 
+msgid "tree view"
+msgstr ""
+
 msgid "tuesday"
 msgstr ""
 
--- a/i18n/es.po	Wed Feb 11 14:46:46 2009 +0100
+++ b/i18n/es.po	Wed Feb 11 17:00:39 2009 +0100
@@ -381,6 +381,9 @@
 msgid "Problem occured"
 msgstr "Ha ocurrido un error"
 
+msgid "Project linked data"
+msgstr ""
+
 msgid "RQLExpression"
 msgstr "Expresión RQL"
 
@@ -738,6 +741,9 @@
 msgid "add"
 msgstr "agregar"
 
+msgid "add Bookmark bookmarked_by EUser object"
+msgstr ""
+
 msgid "add EEType add_permission RQLExpression subject"
 msgstr "Definir una expresión RQL de agregación"
 
@@ -1359,6 +1365,9 @@
 msgid "created_by_object"
 msgstr "ha creado"
 
+msgid "creating Bookmark (Bookmark bookmarked_by EUser %(linkto)s)"
+msgstr ""
+
 msgid "creating EConstraint (EFRDef %(linkto)s constrained_by EConstraint)"
 msgstr "creación condicionada por el atributo %(linkto)s"
 
@@ -1745,12 +1754,18 @@
 msgid "february"
 msgstr "febrero"
 
+msgid "file tree view"
+msgstr ""
+
 msgid "final"
 msgstr "final"
 
 msgid "firstname"
 msgstr "nombre"
 
+msgid "foaf"
+msgstr ""
+
 msgid "follow"
 msgstr "seguir la liga"
 
@@ -2090,6 +2105,9 @@
 msgid "list"
 msgstr "liste"
 
+msgid "loading"
+msgstr ""
+
 msgid "log in"
 msgstr "s'identifier"
 
@@ -2118,6 +2136,9 @@
 msgid "manage bookmarks"
 msgstr "gÈrer les signets"
 
+msgid "manage permissions"
+msgstr ""
+
 msgid "manage security"
 msgstr "gestion de la sÈcuritÈ"
 
@@ -2232,6 +2253,9 @@
 msgid "not authorized"
 msgstr "non autorisÈ"
 
+msgid "not selected"
+msgstr ""
+
 msgid "not specified"
 msgstr "non spÈcifiÈ"
 
@@ -2268,6 +2292,15 @@
 msgid "ordernum"
 msgstr "ordre"
 
+msgid "owl (tbox+abox)"
+msgstr ""
+
+msgid "owlabox"
+msgstr ""
+
+msgid "owlaboxlight"
+msgstr ""
+
 msgid "owned_by"
 msgstr "appartient ‡"
 
@@ -2521,6 +2554,9 @@
 msgid "select this entity"
 msgstr "sÈlectionner cette entitÈ"
 
+msgid "selected"
+msgstr ""
+
 msgid "semantic description of this attribute"
 msgstr "description sÈmantique de cet attribut"
 
@@ -2649,6 +2685,9 @@
 msgid "task progression"
 msgstr "avancement de la t‚che"
 
+msgid "tbox"
+msgstr ""
+
 msgid "text"
 msgstr "text"
 
@@ -2726,6 +2765,9 @@
 msgid "transition_of_object"
 msgstr "a pour transition"
 
+msgid "tree view"
+msgstr ""
+
 msgid "tuesday"
 msgstr "mardi"
 
--- a/i18n/fr.po	Wed Feb 11 14:46:46 2009 +0100
+++ b/i18n/fr.po	Wed Feb 11 17:00:39 2009 +0100
@@ -381,6 +381,9 @@
 msgid "Problem occured"
 msgstr "Une erreur est survenue"
 
+msgid "Project linked data"
+msgstr ""
+
 msgid "RQLExpression"
 msgstr "Expression RQL"
 
@@ -740,6 +743,9 @@
 msgid "add"
 msgstr "ajouter"
 
+msgid "add Bookmark bookmarked_by EUser object"
+msgstr "signet"
+
 msgid "add EEType add_permission RQLExpression subject"
 msgstr "définir une expression RQL d'ajout"
 
@@ -1197,7 +1203,7 @@
 msgstr "la barre de requête rql, dans l'en-tête de page"
 
 msgid "components_rss_feed_url"
-msgstr ""
+msgstr "syndication rss"
 
 msgid "components_rss_feed_url_description"
 msgstr ""
@@ -1361,14 +1367,17 @@
 msgid "created_by_object"
 msgstr "a créé"
 
+msgid "creating Bookmark (Bookmark bookmarked_by EUser %(linkto)s)"
+msgstr "création d'un signet pour %(linkto)s"
+
 msgid "creating EConstraint (EFRDef %(linkto)s constrained_by EConstraint)"
-msgstr "création contrainte pour l'attribut %(linkto)s"
+msgstr "création d'une contrainte pour l'attribut %(linkto)s"
 
 msgid "creating EConstraint (ENFRDef %(linkto)s constrained_by EConstraint)"
-msgstr "création contrainte pour la relation %(linkto)s"
+msgstr "création d'une contrainte pour la relation %(linkto)s"
 
 msgid "creating EFRDef (EFRDef relation_type ERType %(linkto)s)"
-msgstr "création attribut %(linkto)s"
+msgstr "création d'un attribut %(linkto)s"
 
 msgid "creating ENFRDef (ENFRDef relation_type ERType %(linkto)s)"
 msgstr "création relation %(linkto)s"
@@ -1744,12 +1753,18 @@
 msgid "february"
 msgstr "février"
 
+msgid "file tree view"
+msgstr "arborescence (fichiers)"
+
 msgid "final"
 msgstr "final"
 
 msgid "firstname"
 msgstr "prénom"
 
+msgid "foaf"
+msgstr "foaf"
+
 msgid "follow"
 msgstr "suivre le lien"
 
@@ -2091,6 +2106,9 @@
 msgid "list"
 msgstr "liste"
 
+msgid "loading"
+msgstr "chargement"
+
 msgid "log in"
 msgstr "s'identifier"
 
@@ -2119,6 +2137,9 @@
 msgid "manage bookmarks"
 msgstr "gérer les signets"
 
+msgid "manage permissions"
+msgstr "gestion des permissions"
+
 msgid "manage security"
 msgstr "gestion de la sécurité"
 
@@ -2233,6 +2254,9 @@
 msgid "not authorized"
 msgstr "non autorisé"
 
+msgid "not selected"
+msgstr "non sélectionné"
+
 msgid "not specified"
 msgstr "non spécifié"
 
@@ -2269,6 +2293,15 @@
 msgid "ordernum"
 msgstr "ordre"
 
+msgid "owl (tbox+abox)"
+msgstr ""
+
+msgid "owlabox"
+msgstr ""
+
+msgid "owlaboxlight"
+msgstr ""
+
 msgid "owned_by"
 msgstr "appartient à"
 
@@ -2522,6 +2555,9 @@
 msgid "select this entity"
 msgstr "sélectionner cette entité"
 
+msgid "selected"
+msgstr "sélectionné"
+
 msgid "semantic description of this attribute"
 msgstr "description sémantique de cet attribut"
 
@@ -2650,6 +2686,9 @@
 msgid "task progression"
 msgstr "avancement de la tâche"
 
+msgid "tbox"
+msgstr ""
+
 msgid "text"
 msgstr "text"
 
@@ -2727,6 +2766,9 @@
 msgid "transition_of_object"
 msgstr "a pour transition"
 
+msgid "tree view"
+msgstr "arborescence"
+
 msgid "tuesday"
 msgstr "mardi"
 
--- a/web/application.py	Wed Feb 11 14:46:46 2009 +0100
+++ b/web/application.py	Wed Feb 11 17:00:39 2009 +0100
@@ -1,7 +1,7 @@
 """CubicWeb web client application 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"
@@ -317,6 +317,7 @@
             try:
                 ctrlid, rset = self.url_resolver.process(req, path)
                 controller = self.select_controller(ctrlid, req)
+                req.update_search_state()
                 result = controller.publish(rset=rset)
                 if req.cnx is not None:
                     # req.cnx is None if anonymous aren't allowed and we are
--- a/web/views/basecontrollers.py	Wed Feb 11 14:46:46 2009 +0100
+++ b/web/views/basecontrollers.py	Wed Feb 11 17:00:39 2009 +0100
@@ -60,7 +60,6 @@
     
     def publish(self, rset=None):
         """publish a request, returning an encoded string"""
-        self.req.update_search_state()
         template = self.req.property_value('ui.main-template')
         if template not in self.vreg.registry('templates') :
             template = self.template
--- a/web/views/baseforms.py	Wed Feb 11 14:46:46 2009 +0100
+++ b/web/views/baseforms.py	Wed Feb 11 17:00:39 2009 +0100
@@ -2,7 +2,7 @@
 or a list of entities of the same type
 
 :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"
@@ -33,6 +33,9 @@
     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"""
@@ -392,10 +395,8 @@
                 if rschema != 'eid']
     
     def relations_form(self, entity, kwargs):
-        pendings = list(self.restore_pending_inserts(entity))
-        relations_table = list(self.relations_table(entity))
         srels_by_cat = entity.srelations_by_category(('generic', 'metadata'), 'add')
-        if not pendings and not relations_table and not srels_by_cat:
+        if not srels_by_cat:
             return u''
         req = self.req
         _ = self.req._
@@ -406,7 +407,7 @@
         w(u'<fieldset class="subentity">')
         w(u'<legend class="iformTitle">%s</legend>' % label)
         w(u'<table id="relatedEntities">')
-        for row in relations_table:
+        for row in self.relations_table(entity):
             # already linked entities
             if row[2]:
                 w(u'<tr><th class="labelCol">%s</th>' % row[0].display_name(req, row[1]))
@@ -420,6 +421,7 @@
                 w(u'</ul>')
                 w(u'</td>')
                 w(u'</tr>')
+        pendings = list(self.restore_pending_inserts(entity))
         if not pendings:
             w(u'<tr><th>&nbsp;</th><td>&nbsp;</td></tr>')
         else:
--- a/web/views/basetemplates.py	Wed Feb 11 14:46:46 2009 +0100
+++ b/web/views/basetemplates.py	Wed Feb 11 17:00:39 2009 +0100
@@ -2,7 +2,7 @@
 """default templates 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"
@@ -424,7 +424,7 @@
                                             req._(ChangeLogView.title).lower()))
         self.w(u'<a href="%s">%s</a> | ' % (req.build_url('doc/about'),
                                             req._('about this site')))
-        self.w(u'© 2001-2008 <a href="http://www.logilab.fr">Logilab S.A.</a>')
+        self.w(u'© 2001-2009 <a href="http://www.logilab.fr">Logilab S.A.</a>')
         self.w(u'</div>')
cubicweb