raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

keep copyright field empty if imported song does not have any copyright information

Browse Source
This commit is contained in:
Andreas Preikschat 2010-12-17 15:28:19 +01:00
parent 3cdac511e2
commit fa79dd2cca
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openlp/core/lib/serviceitem.py
View File

@ -44,6 +44,7 @@ class ServiceItemType(object):
Image = 2 Image = 2
Command = 3 Command = 3
class ItemCapabilities(object): class ItemCapabilities(object):
""" """
Provides an enumeration of a serviceitem's capabilities Provides an enumeration of a serviceitem's capabilities

2
openlp/plugins/songs/lib/xml.py
View File

@ -297,6 +297,8 @@ class OpenLyricsParser(object):
song_xml = objectify.fromstring(xml) song_xml = objectify.fromstring(xml)
properties = song_xml.properties properties = song_xml.properties
song.copyright = unicode(properties.copyright.text) song.copyright = unicode(properties.copyright.text)
if song.copyright == u'None':
song.copyright = u''
song.verse_order = unicode(properties.verseOrder.text) song.verse_order = unicode(properties.verseOrder.text)
if song.verse_order == u'None': if song.verse_order == u'None':
song.verse_order = u'' song.verse_order = u''