diff --git a/objets.py b/objets.py index 700f52b..d1ba3c2 100644 --- a/objets.py +++ b/objets.py @@ -279,8 +279,8 @@ class CransLdapObject(object): else: return self.attrs.items() - def display(self): - print printing.sprint(self) + def display(self, historique=5, blacklist=5): + print printing.sprint(self, historique=historique, blacklist=blacklist) def history_add(self, login, chain): """Ajoute une ligne à l'historique de l'objet. diff --git a/printing/templates.py b/printing/templates.py index 6e9fe44..5c8fb2a 100644 --- a/printing/templates.py +++ b/printing/templates.py @@ -243,9 +243,9 @@ def blacklist(blacklist, params): params['o']=blacklist return template().get_template("blacklist").render(params) -def sprint(object, limit=5, **params): +def sprint(object, historique=5, blacklist=5, **params): from lc_ldap import objets, attributs - params.update({'limit':limit}) + params.update({'historique':historique, "blacklist":blacklist}) if isinstance(object, objets.machine): return machine(object, params) elif isinstance(object, objets.adherent): diff --git a/printing/templates/blacklists b/printing/templates/blacklists index cac9c73..93f138a 100644 --- a/printing/templates/blacklists +++ b/printing/templates/blacklists @@ -1,4 +1,4 @@ {% if o.get('blacklist', []) %} -{{"Blackliste : "|coul('gras')}}{{o.get('blacklist', [])[-limit:]|reverse|blacklists|join('\n ')}} +{{"Blackliste : "|coul('gras')}}{{o.get('blacklist', [])[-blacklist:]|reverse|blacklists|join('\n ')}} {% endif %} {% include 'object' %} diff --git a/printing/templates/object b/printing/templates/object index c0ca2fa..b86895b 100644 --- a/printing/templates/object +++ b/printing/templates/object @@ -3,5 +3,5 @@ {{o.info|join('\n ')}} {% endif %} {% if o.historique %} -{{"Historique : "|coul('gras')}}{{o.historique[-limit:]|reverse|join('\n ')}} +{{"Historique : "|coul('gras')}}{{o.historique[-historique:]|reverse|join('\n ')}} {% endif %}