Tim Bentley has proposed merging lp:~trb143/openlp/bug-955738 into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #955738 in OpenLP: "Remote Search displays UI error messages if there is
an error"
https://bugs.launchpad.net/openlp/+bug/955738
For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-955738/+merge/97699
Fix search error from Web and Android
--
https://code.launchpad.net/~trb143/openlp/bug-955738/+merge/97699
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/bug-955738 into lp:openlp.
=== added directory '.idea'
=== added directory '.idea/inspectionProfiles'
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py 2012-03-04 14:52:09 +0000
+++ openlp/core/lib/mediamanageritem.py 2012-03-15 17:00:40 +0000
@@ -641,7 +641,7 @@
if item:
self.autoSelectId = item.data(QtCore.Qt.UserRole).toInt()[0]
- def search(self, string):
+ def search(self, string, showError=True):
"""
Performs a plugin specific search for items containing ``string``
"""
=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py 2012-03-04 21:50:32 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py 2012-03-15 17:00:40 +0000
@@ -1025,12 +1025,13 @@
return u'{su}[%s]{/su}' % verse_text
return u'{su}%s{/su}' % verse_text
- def search(self, string):
+ def search(self, string, showError):
"""
Search for some Bible verses (by reference).
"""
bible = unicode(self.quickVersionComboBox.currentText())
- search_results = self.plugin.manager.get_verses(bible, string, False)
+ search_results = self.plugin.manager.get_verses(bible, string, False,
+ showError)
if search_results:
versetext = u' '.join([verse.text for verse in search_results])
return [[string, versetext]]
=== modified file 'openlp/plugins/custom/lib/mediaitem.py'
--- openlp/plugins/custom/lib/mediaitem.py 2012-03-04 14:52:09 +0000
+++ openlp/plugins/custom/lib/mediaitem.py 2012-03-15 17:00:40 +0000
@@ -267,7 +267,7 @@
self.searchTextEdit.clear()
self.onSearchTextButtonClick()
- def search(self, string):
+ def search(self, string, showError):
search_results = self.manager.get_all_objects(CustomSlide,
or_(func.lower(CustomSlide.title).like(u'%' +
string.lower() + u'%'),
=== modified file 'openlp/plugins/images/lib/mediaitem.py'
--- openlp/plugins/images/lib/mediaitem.py 2012-03-04 14:52:09 +0000
+++ openlp/plugins/images/lib/mediaitem.py 2012-03-15 17:00:40 +0000
@@ -234,7 +234,7 @@
'There was a problem replacing your background, '
'the image file "%s" no longer exists.')) % filename)
- def search(self, string):
+ def search(self, string, showError):
files = SettingsManager.load_list(self.settingsSection, u'images')
results = []
string = string.lower()
=== modified file 'openlp/plugins/media/lib/mediaitem.py'
--- openlp/plugins/media/lib/mediaitem.py 2012-03-12 10:53:17 +0000
+++ openlp/plugins/media/lib/mediaitem.py 2012-03-15 17:00:40 +0000
@@ -310,7 +310,7 @@
media = filter(lambda x: os.path.splitext(x)[1] in ext, media)
return media
- def search(self, string):
+ def search(self, string, showError):
files = SettingsManager.load_list(self.settingsSection, u'media')
results = []
string = string.lower()
=== modified file 'openlp/plugins/presentations/lib/mediaitem.py'
--- openlp/plugins/presentations/lib/mediaitem.py 2012-01-18 13:50:06 +0000
+++ openlp/plugins/presentations/lib/mediaitem.py 2012-03-15 17:00:40 +0000
@@ -322,7 +322,7 @@
return controller
return None
- def search(self, string):
+ def search(self, string, showError):
files = SettingsManager.load_list(
self.settingsSection, u'presentations')
results = []
=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py 2011-12-29 18:47:39 +0000
+++ openlp/plugins/remotes/lib/httpserver.py 2012-03-15 17:00:40 +0000
@@ -522,7 +522,7 @@
plugin = self.parent.plugin.pluginManager.get_plugin_by_name(type)
if plugin.status == PluginStatus.Active and \
plugin.mediaItem and plugin.mediaItem.hasSearch:
- results = plugin.mediaItem.search(text)
+ results = plugin.mediaItem.search(text, False)
else:
results = []
return HttpResponse(
=== modified file 'openlp/plugins/songs/lib/mediaitem.py'
--- openlp/plugins/songs/lib/mediaitem.py 2012-03-05 10:09:07 +0000
+++ openlp/plugins/songs/lib/mediaitem.py 2012-03-15 17:00:40 +0000
@@ -586,7 +586,7 @@
Receiver.send_message(u'service_item_update',
u'%s:%s:%s' % (editId, item._uuid, temporary))
- def search(self, string):
+ def search(self, string, showError):
"""
Search for some songs
"""
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
