Fix song editor bugs - take 2

This commit is contained in:
Jon Tibble 2009-09-21 01:47:10 +01:00
parent f684ffb0c3
commit a4da4bae72
2 changed files with 1 additions and 5 deletions

View File

@ -431,10 +431,6 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
Receiver().send_message(u'load_song_list') Receiver().send_message(u'load_song_list')
self.close() self.close()
def closeEvent(self, event):
self.songmanager.session.rollback()
event.accept()
def processLyrics(self): def processLyrics(self):
log.debug(u'processLyrics') log.debug(u'processLyrics')
sxml = SongXMLBuilder() sxml = SongXMLBuilder()

View File

@ -32,7 +32,7 @@ from openlp.plugins.songs.lib.classes import *
def init_models(url): def init_models(url):
engine = create_engine(url) engine = create_engine(url)
metadata.bind = engine metadata.bind = engine
session = scoped_session(sessionmaker(autoflush=True, session = scoped_session(sessionmaker(autoflush=False,
autocommit=False, bind=engine)) autocommit=False, bind=engine))
mapper(Author, authors_table) mapper(Author, authors_table)
mapper(Book, song_books_table) mapper(Book, song_books_table)