# HG changeset patch # User Goffi # Date 1522132812 -7200 # Node ID ed67265205c469d88f4cfa9a21351de964eec587 # Parent 2c2b8c08e6c9256aff141e592d5fe61e9cd85057 pages (merge-requests): added a discovery page similar to tickets one: new "mr_handlers_json" option allows to add well known merge-requests handlers in configuration. diff -r 2c2b8c08e6c9 -r ed67265205c4 src/pages/merge-requests/disco/page_meta.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/pages/merge-requests/disco/page_meta.py Tue Mar 27 08:40:12 2018 +0200 @@ -0,0 +1,39 @@ +#!/usr/bin/env python2.7 +# -*- coding: utf-8 -*- + +from libervia.server.constants import Const as C +from twisted.words.protocols.jabber import jid +from sat.core.log import getLogger +log = getLogger('pages/ticket') +"""ticket handling pages""" + +name = u'merge-requests_disco' +access = C.PAGES_ACCESS_PUBLIC +template = u"merge-request/discover.html" + + +def prepare_render(self, request): + mr_handlers_config = self.host.options['mr_handlers_json'] + if mr_handlers_config: + handlers = request.template_data['mr_handlers'] = [] + try: + for handler_data in mr_handlers_config: + service = handler_data[u'service'] + node = handler_data[u'node'] + name = handler_data[u'name'] + url = self.getPageByName(u'merge-requests').getURL(service, node) + handlers.append({u'name': name, u'url': url}) + except KeyError as e: + log.warning(u"Missing field in mr_handlers_json: {msg}".format(msg=e)) + except Exception as e: + log.warning(u"Can't decode mr handlers: {msg}".format(msg=e)) + +def on_data_post(self, request): + jid_str = self.getPostedData(request, u'jid') + try: + jid_ = jid.JID(jid_str) + except RuntimeError: + self.pageError(request, C.HTTP_BAD_REQUEST) + # for now we just use default node + url = self.getPageByName(u'merge-requests').getURL(jid_.full(), u'@') + self.HTTPRedirect(request, url) diff -r 2c2b8c08e6c9 -r ed67265205c4 src/pages/merge-requests/page_meta.py --- a/src/pages/merge-requests/page_meta.py Tue Mar 27 08:36:37 2018 +0200 +++ b/src/pages/merge-requests/page_meta.py Tue Mar 27 08:40:12 2018 +0200 @@ -2,51 +2,29 @@ # -*- coding: utf-8 -*- from libervia.server.constants import Const as C -from sat.core.i18n import _ from twisted.internet import defer -from twisted.words.protocols.jabber import jid from sat.tools.common import template_xmlui from sat.tools.common import data_objects from sat.core.log import getLogger log = getLogger('pages/ticket') """ticket handling pages""" -name = u'merge-requests_list' +name = u'merge-requests' access = C.PAGES_ACCESS_PUBLIC template = u"ticket/overview.html" def parse_url(self, request): - # check the service and node to use - try: - service = self.nextPath(request) - node = self.nextPath(request) - except IndexError: - log.warning(_(u"missing service and node")) - self.pageError(request, C.HTTP_BAD_REQUEST) - - if not service or service == u'@': - service = u'' - - if service: - try: - service = jid.JID(service) - except Exception: - log.warning(_(u"bad service entered: {}").format(service)) - self.pageError(request, C.HTTP_BAD_REQUEST) - - if not node or node == u'@': - node = u'' - - + self.getPathArgs(request, ['service', 'node'], service='jid') + data = self.getRData(request) + service, node = data[u'service'], data[u'node'] + if node is None: + self.pageRedirect(u"merge-requests_disco", request) + if node == u'@': + node = data[u'node'] = u'' self.checkCache(request, C.CACHE_PUBSUB, service=service, node=node, short='merge-requests') - - data = self.getRData(request) - data['service'] = service - data['node'] = node - template_data = request.template_data - template_data[u'url_tickets_list'] = self.getPageByName('merge-requests_list').getURL(service.full(), node or u'@') + template_data[u'url_tickets_list'] = self.getPageByName('merge-requests').getURL(service.full(), node) template_data[u'url_tickets_new'] = self.getSubPageURL(request, 'merge-requests_new') @defer.inlineCallbacks diff -r 2c2b8c08e6c9 -r ed67265205c4 src/pages/tickets/page_meta.py --- a/src/pages/tickets/page_meta.py Tue Mar 27 08:36:37 2018 +0200 +++ b/src/pages/tickets/page_meta.py Tue Mar 27 08:40:12 2018 +0200 @@ -17,7 +17,6 @@ def parse_url(self, request): self.getPathArgs(request, ['service', 'node'], service='jid') data = self.getRData(request) - service, node = data[u'service'], data[u'node'] if node is None: self.pageRedirect(u"tickets_disco", request) diff -r 2c2b8c08e6c9 -r ed67265205c4 src/twisted/plugins/libervia_server.py --- a/src/twisted/plugins/libervia_server.py Tue Mar 27 08:36:37 2018 +0200 +++ b/src/twisted/plugins/libervia_server.py Tue Mar 27 08:40:12 2018 +0200 @@ -119,6 +119,7 @@ ['url_redirections_dict', None, {}, None], ['menu_json', None, C.DEFAULT_MENU, None], ['tickets_trackers_json', None, None, None], + ['mr_handlers_json', None, None, None], ] def initialise(options):