# HG changeset patch # User Goffi # Date 1560509459 -7200 # Node ID bed008b65d7c5c7fc7128fa2cfc1ba8b40a6c65a # Parent aee3d8fa679fc4e9808f0e91a822e3c96f3c35e0 pages (merge-requests/edit, tickets/edit, tickets/new): use serialised extra following backend change + fixed use of "update" when editing ticket: "update" was not set in extra, as a result some metadata could be lost on update (author, comments_uri). fix 301 diff -r aee3d8fa679f -r bed008b65d7c libervia/pages/merge-requests/edit/page_meta.py --- a/libervia/pages/merge-requests/edit/page_meta.py Wed Jun 12 20:05:45 2019 +0200 +++ b/libervia/pages/merge-requests/edit/page_meta.py Fri Jun 14 12:50:59 2019 +0200 @@ -5,6 +5,7 @@ from sat.core.i18n import _ from twisted.internet import defer from sat.tools.common import template_xmlui +from sat.tools.common import data_format from sat.core.log import getLogger """merge-requests edition""" @@ -102,6 +103,7 @@ posted_data[u'body'] = [u'
{body}
'.format(ns=C.NS_XHTML, body=body)] + extra = {u'update': True} yield self.host.bridgeCall( "mergeRequestSet", service.full(), @@ -111,7 +113,7 @@ posted_data, u"", ticket_id, - {"update": C.BOOL_TRUE}, + data_format.serialise(extra), profile, ) # we don't want to redirect to edit page on success, but to tickets list diff -r aee3d8fa679f -r bed008b65d7c libervia/pages/tickets/edit/page_meta.py --- a/libervia/pages/tickets/edit/page_meta.py Wed Jun 12 20:05:45 2019 +0200 +++ b/libervia/pages/tickets/edit/page_meta.py Fri Jun 14 12:50:59 2019 +0200 @@ -5,6 +5,7 @@ from sat.core.i18n import _ from twisted.internet import defer from sat.tools.common import template_xmlui +from sat.tools.common import data_format from sat.core.log import getLogger log = getLogger(__name__) @@ -102,8 +103,10 @@ posted_data[u'body'] = [u'
{body}
'.format(ns=C.NS_XHTML, body=body)] + extra = {u'update': True} yield self.host.bridgeCall( - "ticketSet", service.full(), node, posted_data, u"", ticket_id, {}, profile + "ticketSet", service.full(), node, posted_data, u"", ticket_id, + data_format.serialise(extra), profile ) # we don't want to redirect to edit page on success, but to tickets list data["post_redirect_page"] = ( diff -r aee3d8fa679f -r bed008b65d7c libervia/pages/tickets/new/page_meta.py --- a/libervia/pages/tickets/new/page_meta.py Wed Jun 12 20:05:45 2019 +0200 +++ b/libervia/pages/tickets/new/page_meta.py Fri Jun 14 12:50:59 2019 +0200 @@ -74,7 +74,7 @@ yield self.host.bridgeCall( - "ticketSet", service.full(), node, posted_data, u"", u"", {}, profile + "ticketSet", service.full(), node, posted_data, u"", u"", u"", profile ) # we don't want to redirect to creation page on success, but to tickets list data["post_redirect_page"] = (