forked from openlp/openlp
improvement + fix
This commit is contained in:
parent
2691636e71
commit
c4a59586a6
@ -291,7 +291,7 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
|
|||||||
'exist, do you want to add them?'),
|
'exist, do you want to add them?'),
|
||||||
QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
|
QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
|
||||||
QtGui.QMessageBox.Yes) == QtGui.QMessageBox.Yes:
|
QtGui.QMessageBox.Yes) == QtGui.QMessageBox.Yes:
|
||||||
if text.find(' ') == -1:
|
if text.find(u' ') == -1:
|
||||||
author = Author.populate(first_name=u'', last_name=u'',
|
author = Author.populate(first_name=u'', last_name=u'',
|
||||||
display_name=text)
|
display_name=text)
|
||||||
else:
|
else:
|
||||||
|
@ -350,6 +350,8 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
|
|||||||
book_id = self._getCurrentItemId(self.BooksListWidget)
|
book_id = self._getCurrentItemId(self.BooksListWidget)
|
||||||
if book_id != -1:
|
if book_id != -1:
|
||||||
book = self.songmanager.get_object(Book, book_id)
|
book = self.songmanager.get_object(Book, book_id)
|
||||||
|
if book.publisher is None:
|
||||||
|
book.publisher = u''
|
||||||
self.bookform.NameEdit.setText(book.name)
|
self.bookform.NameEdit.setText(book.name)
|
||||||
self.bookform.PublisherEdit.setText(book.publisher)
|
self.bookform.PublisherEdit.setText(book.publisher)
|
||||||
# Save the book's name and publisher for the case that they have to
|
# Save the book's name and publisher for the case that they have to
|
||||||
|
Loading…
Reference in New Issue
Block a user