From nobody Thu Apr 25 22:30:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of ovirt.org designates 66.187.230.42 as permitted sender) client-ip=66.187.230.42; envelope-from=kimchi-devel-bounces@ovirt.org; helo=lists.ovirt.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of ovirt.org designates 66.187.230.42 as permitted sender) smtp.mailfrom=kimchi-devel-bounces@ovirt.org; Return-Path: Received: from lists.ovirt.org (lists.phx.ovirt.org [66.187.230.42]) by mx.zohomail.com with SMTPS id 1488503582255362.5145870679919; Thu, 2 Mar 2017 17:13:02 -0800 (PST) Received: from lists.phx.ovirt.org (localhost [127.0.0.1]) by lists.ovirt.org (Postfix) with ESMTP id 3D70182052A; Fri, 3 Mar 2017 01:12:59 +0000 (UTC) Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by lists.ovirt.org (Postfix) with ESMTPS id 68D7982052A for ; Fri, 3 Mar 2017 01:12:43 +0000 (UTC) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v2318k1i115571 for ; Thu, 2 Mar 2017 20:12:42 -0500 Received: from e24smtp01.br.ibm.com (e24smtp01.br.ibm.com [32.104.18.85]) by mx0a-001b2d01.pphosted.com with ESMTP id 28xs8dcgb7-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 02 Mar 2017 20:12:42 -0500 Received: from localhost by e24smtp01.br.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 2 Mar 2017 22:12:38 -0300 Received: from d24dlp01.br.ibm.com (9.18.248.204) by e24smtp01.br.ibm.com (10.172.0.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 2 Mar 2017 22:12:35 -0300 Received: from d24relay03.br.ibm.com (d24relay03.br.ibm.com [9.18.232.225]) by d24dlp01.br.ibm.com (Postfix) with ESMTP id 2BF4F352005F for ; Thu, 2 Mar 2017 20:12:01 -0500 (EST) Received: from d24av03.br.ibm.com (d24av03.br.ibm.com [9.8.31.95]) by d24relay03.br.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v231CYnm38797384 for ; Thu, 2 Mar 2017 22:12:35 -0300 Received: from d24av03.br.ibm.com (localhost [127.0.0.1]) by d24av03.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id v231CZvT002672 for ; Thu, 2 Mar 2017 22:12:35 -0300 Received: from alinefm-TP440.ibmmodules.com ([9.80.219.213]) by d24av03.br.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id v231CXRG002668 for ; Thu, 2 Mar 2017 22:12:34 -0300 X-Original-To: kimchi-devel@ovirt.org From: Aline Manera To: Kimchi Devel Date: Thu, 2 Mar 2017 22:12:31 -0300 X-Mailer: git-send-email 2.9.3 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17030301-1523-0000-0000-000002864317 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17030301-1524-0000-0000-00002A1C4B21 Message-Id: <20170303011231.431-1-alinefm@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-03-02_17:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1703030009 Subject: [Kimchi-devel] [PATCH] [Wok] Allow a plugin extends any HTML page from another one instead of only tabs content X-BeenThere: kimchi-devel@ovirt.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: kimchi-devel-bounces@ovirt.org Errors-To: kimchi-devel-bounces@ovirt.org X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Before this patch, a plugin could only extend anothers tab content. With this patch, a plugin can extend any HTML page from others. This is needed due the Ginger sidebar and Ginger s390x dependency. Signed-off-by: Aline Manera Reviewed-by: Daniel Barboza Tested-by: Daniel Barboza --- src/wok/root.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/wok/root.py b/src/wok/root.py index c01c7d1..ea88c8c 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -101,6 +101,7 @@ class Root(Resource): =20 @cherrypy.expose def default(self, page, **kwargs): + kwargs['scripts'] =3D self._get_scripts(page) if page.endswith('.html'): return template.render(page, kwargs) if page.endswith('.json'): @@ -121,13 +122,7 @@ class Root(Resource): =20 data =3D {} data['ui_dir'] =3D paths.ui_dir - - data['scripts'] =3D [] - for plugin, app in cherrypy.tree.apps.iteritems(): - if app.root.extends is not None: - scripts =3D app.root.extends.get(script_name, {}) - if page in scripts.keys(): - data['scripts'].append(scripts[page]) + data['scripts'] =3D self._get_scripts(page) =20 if page.endswith('.html'): context =3D template.render('/tabs/' + page, data) @@ -136,6 +131,16 @@ class Root(Resource): return context raise cherrypy.HTTPError(404) =20 + def _get_scripts(self, page): + result =3D [] + script_name =3D cherrypy.request.app.script_name or "/" + for plugin, app in cherrypy.tree.apps.iteritems(): + if app.root.extends is not None: + scripts =3D app.root.extends.get(script_name, {}) + if page in scripts.keys(): + result.append(scripts[page]) + return result + =20 class WokRoot(Root): def __init__(self, model, dev_env=3DFalse): --=20 2.9.3 _______________________________________________ Kimchi-devel mailing list Kimchi-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/kimchi-devel