Mercurial > libervia-backend
diff frontends/src/jp/common.py @ 2280:4bc9a2c2d6c9
jp (pubsub, common): fixed last item edition (keep item id instead of creating a new one)
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Wed, 28 Jun 2017 20:28:24 +0200 |
| parents | e2f96cd1887b |
| children | 276e546b7619 |
line wrap: on
line diff
--- a/frontends/src/jp/common.py Wed Jun 28 19:19:08 2017 +0200 +++ b/frontends/src/jp/common.py Wed Jun 28 20:28:24 2017 +0200 @@ -331,7 +331,7 @@ return max(available, key=lambda path: os.stat(path).st_mtime) def getItemData(self, service, node, item): - """return formatted content and metadata (or not if use_metadata is false)""" + """return formatted content, metadata (or not if use_metadata is false), and item id""" raise NotImplementedError def getTmpSuff(self): @@ -426,9 +426,9 @@ self.disp(u'Editing requested published item', 2) try: if self.use_metadata: - content, metadata = self.getItemData(pubsub_service, pubsub_node, pubsub_item) + content, metadata, pubsub_item = self.getItemData(pubsub_service, pubsub_node, pubsub_item) else: - content = self.getItemData(pubsub_service, pubsub_node, pubsub_item) + content, pubsub_item = self.getItemData(pubsub_service, pubsub_node, pubsub_item) except Exception as e: self.disp(u"Error while retrieving last item: {}".format(e)) self.host.quit(1) @@ -455,9 +455,9 @@ try: # we try to get existing item if self.use_metadata: - content, metadata = self.getItemData(pubsub_service, pubsub_node, self.args.item) + content, metadata, pubsub_item = self.getItemData(pubsub_service, pubsub_node, self.args.item) else: - content = self.getItemData(pubsub_service, pubsub_node, self.args.item) + content, pubsub_item = self.getItemData(pubsub_service, pubsub_node, self.args.item) except Exception as e: # FIXME: ugly but we have not good may to check errors in bridge if u'item-not-found' in unicode(e):