← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~googol/openlp/registry into lp:openlp

 

Andreas Preikschat has proposed merging lp:~googol/openlp/registry into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/registry/+merge/151155

Hello,

- fixed rename errors
-- 
https://code.launchpad.net/~googol/openlp/registry/+merge/151155
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/registry into lp:openlp.
=== modified file 'openlp/core/ui/printserviceform.py'
--- openlp/core/ui/printserviceform.py	2013-02-07 08:42:17 +0000
+++ openlp/core/ui/printserviceform.py	2013-03-01 08:41:21 +0000
@@ -406,7 +406,7 @@
         # Only continue when we include the song's text.
         if not self.slideTextCheckBox.isChecked():
             return
-        for item in self.service_manager.serviceItems:
+        for item in self.service_manager.service_items:
             # Trigger Audit requests
             Registry().register_function(u'print_service_started', [item[u'service_item']])
 

=== modified file 'openlp/plugins/remotes/lib/httpserver.py'
--- openlp/plugins/remotes/lib/httpserver.py	2013-02-16 09:15:40 +0000
+++ openlp/plugins/remotes/lib/httpserver.py	2013-03-01 08:41:21 +0000
@@ -255,7 +255,7 @@
             current_unique_identifier = self.parent.current_item.unique_identifier
         else:
             current_unique_identifier = None
-        for item in self.service_manager.serviceItems:
+        for item in self.service_manager.service_items:
             service_item = item[u'service_item']
             service_items.append({
                 u'id': unicode(service_item.unique_identifier),


Follow ups