From 3add2de140f85ed9ebf4d366bc23566cc72f96cf Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Wed, 18 May 2011 19:32:18 +0100 Subject: [PATCH 1/3] Fix song editing what I did broke. Oops --- openlp/plugins/songs/lib/mediaitem.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 59ee05b7a..0caa88a15 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -221,7 +221,7 @@ class SongMediaItem(MediaManagerItem): # Push edits to the service manager to update items if self.editItem and self.updateServiceOnEdit and \ not self.remoteTriggered: - item_id = _getIdOfItemToGenerate(self.editItem) + item_id = self._getIdOfItemToGenerate(self.editItem) item = self.buildServiceItem(item_id) self.parent.serviceManager.replaceServiceItem(item) self.onRemoteEditClear() From 7b534642b9e8ac9e9ea8597a18a3ff4b37af3103 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Wed, 18 May 2011 19:59:36 +0100 Subject: [PATCH 2/3] Plan B. Figure out what the code is actually meant to be doing --- openlp/plugins/songs/lib/mediaitem.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 0caa88a15..01597e93c 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -221,8 +221,7 @@ class SongMediaItem(MediaManagerItem): # Push edits to the service manager to update items if self.editItem and self.updateServiceOnEdit and \ not self.remoteTriggered: - item_id = self._getIdOfItemToGenerate(self.editItem) - item = self.buildServiceItem(item_id) + item = self.buildServiceItem(self.editItem) self.parent.serviceManager.replaceServiceItem(item) self.onRemoteEditClear() self.onSearchTextButtonClick() From 674260eadb5dd53c7b12125d2419cba6091bf6f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Armin=20K=C3=B6hler?= Date: Wed, 18 May 2011 21:07:08 +0200 Subject: [PATCH 3/3] fix bug https://bugs.launchpad.net/openlp/+bug/779995 --- openlp/plugins/songs/lib/foilpresenterimport.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/songs/lib/foilpresenterimport.py b/openlp/plugins/songs/lib/foilpresenterimport.py index c5dfd5d96..8cd328808 100644 --- a/openlp/plugins/songs/lib/foilpresenterimport.py +++ b/openlp/plugins/songs/lib/foilpresenterimport.py @@ -422,7 +422,8 @@ class FoilPresenter(object): VerseType.Tags[VerseType.PreChorus]: 1 } for strophe in foilpresenterfolie.strophen.strophe: - text = self._child(strophe.text_) + text = self._child(strophe.text_) if hasattr(strophe, u'text_') \ + else u'' verse_name = self._child(strophe.key) children = strophe.getchildren() sortnr = False