From a1def7f8f09e407ab7d28000c72d86b9ec8a8c68 Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 21 Feb 2017 21:01:40 +0100 Subject: [PATCH] jp (blog): set default template and data mapping for the new template output --- frontends/src/jp/cmd_blog.py | 5 +++++ frontends/src/jp/cmd_profile.py | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frontends/src/jp/cmd_blog.py b/frontends/src/jp/cmd_blog.py index 7d3fc358..87c5da1c 100644 --- a/frontends/src/jp/cmd_blog.py +++ b/frontends/src/jp/cmd_blog.py @@ -22,6 +22,7 @@ import base from sat.core.i18n import _ from sat_frontends.jp.constants import Const as C from sat.tools.common.ansi import ANSI as A +from sat.tools.common import data_objects from sat.tools import config from ConfigParser import NoSectionError, NoOptionError import json @@ -188,6 +189,7 @@ class BlogCommon(object): class Get(base.CommandBase): + TEMPLATE = u"blog/articles.html" def __init__(self, host): extra_outputs = {'default': self.default_output, @@ -207,6 +209,9 @@ class Get(base.CommandBase): help=_(u"JID of the PubSub service (default: request profile own blog)")) # TODO: add MAM filters + def template_data_mapping(self, data): + return {u'items': data_objects.BlogItems(data)} + def format_comments(self, item, keys): comments_data = data_format.dict2iterdict(u'comments', item, (u'node', u'service'), pop=True) lines = [] diff --git a/frontends/src/jp/cmd_profile.py b/frontends/src/jp/cmd_profile.py index 55e1dd2c..c55362fa 100644 --- a/frontends/src/jp/cmd_profile.py +++ b/frontends/src/jp/cmd_profile.py @@ -20,7 +20,8 @@ """This module permits to manage profiles. It can list, create, delete and retrieve information about a profile.""" -import logging as log +from sat.core.log import getLogger +log = getLogger(__name__) from sat.core.i18n import _ from sat_frontends.jp import base