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

Fix problem where importing new song databases now does not work.

Browse Source 
Fixes: https://launchpad.net/bugs/863845
This commit is contained in:
Raoul Snyman 2011-12-03 20:23:46 +02:00
parent a5a2b0a881
commit 5b67d36b3c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/plugins/songs/lib/olpimport.py
View File

@ -39,7 +39,7 @@ from openlp.core.lib import translate
from openlp.core.lib.db import BaseModel
from openlp.core.ui.wizard import WizardStrings
from openlp.plugins.songs.lib import clean_song
from openlp.plugins.songs.lib.db import Author, Book, Song, Topic #, MediaFile
from openlp.plugins.songs.lib.db import Author, Book, Song, Topic, MediaFile
from songimport import SongImport
log = logging.getLogger(__name__)
@ -143,7 +143,8 @@ class OpenLPSongImport(SongImport):
secondary=source_media_files_songs_table)
else:
song_props['media_files'] = relation(OldMediaFile,
backref='songs')
backref='songs', primaryjoin=source_songs_table.c.id==OldMediaFile.song_id,
foreign_keys=[source_media_files_table.c.song_id])
try:
class_mapper(OldAuthor)
except UnmappedClassError: