forked from openlp/openlp
Fix data format
This commit is contained in:
parent
05ea84fe1d
commit
3a4bb91633
@ -273,7 +273,7 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
def generateSlideData(self, service_item):
|
def generateSlideData(self, service_item):
|
||||||
raw_slides =[]
|
raw_slides =[]
|
||||||
raw_footer = []
|
raw_footer = []
|
||||||
author_list = u''
|
author_list = []
|
||||||
ccl = u''
|
ccl = u''
|
||||||
item = self.ListView.currentItem()
|
item = self.ListView.currentItem()
|
||||||
if item is None:
|
if item is None:
|
||||||
@ -293,9 +293,7 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
service_item.add_from_text(slide[:30], unicode(slide))
|
service_item.add_from_text(slide[:30], unicode(slide))
|
||||||
service_item.title = song.title
|
service_item.title = song.title
|
||||||
for author in song.authors:
|
for author in song.authors:
|
||||||
if len(author_list) > 1:
|
author_list.append(unicode(author.display_name))
|
||||||
author_list = author_list + u', '
|
|
||||||
author_list = author_list + unicode(author.display_name)
|
|
||||||
if song.ccli_number == None or len(song.ccli_number) == 0:
|
if song.ccli_number == None or len(song.ccli_number) == 0:
|
||||||
ccl = self.parent.settings.GeneralTab.CCLNumber
|
ccl = self.parent.settings.GeneralTab.CCLNumber
|
||||||
else:
|
else:
|
||||||
@ -306,5 +304,5 @@ class SongMediaItem(MediaManagerItem):
|
|||||||
raw_footer.append(unicode(
|
raw_footer.append(unicode(
|
||||||
translate(u'SongMediaItem', u'CCL Licence: ') + ccl ))
|
translate(u'SongMediaItem', u'CCL Licence: ') + ccl ))
|
||||||
service_item.raw_footer = raw_footer
|
service_item.raw_footer = raw_footer
|
||||||
service_item.audit = u'%s,%s,%s' % (service_item.title, author_list, ccl)
|
service_item.audit = [service_item.title, author_list, ccl]
|
||||||
return True
|
return True
|
||||||
|
Loading…
Reference in New Issue
Block a user