openlp-core team mailing list archive

[Ken Roberts <alisonken1@xxxxxxxxx>]

Ken Roberts has proposed merging lp:~alisonken1/openlp/bug-1386951 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~alisonken1/openlp/bug-1386951/+merge/245149

Fix projector edit form including text from previous edits.

lp:~alisonken1/openlp/bug-1386951 (revision 2459)
[SUCCESS] http://ci.openlp.org/job/Branch-01-Pull/827/
[SUCCESS] http://ci.openlp.org/job/Branch-02-Functional-Tests/759/
[SUCCESS] http://ci.openlp.org/job/Branch-03-Interface-Tests/705/
[FAILURE] http://ci.openlp.org/job/Branch-04a-Windows_Functional_Tests/609/
Stopping after failure

pep8 passes on local checks.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~alisonken1/openlp/bug-1386951 into lp:openlp.

=== modified file 'openlp/core/ui/projector/editform.py'
--- openlp/core/ui/projector/editform.py	2014-10-22 00:49:21 +0000
+++ openlp/core/ui/projector/editform.py	2014-12-18 19:00:50 +0000
@@ -132,6 +132,8 @@
         self.location_label.setText(translate('OpenLP.ProjectorEditForm', 'Location'))
         self.location_text.setText(self.projector.location)
         self.notes_label.setText(translate('OpenLP.ProjectorEditForm', 'Notes'))
+        self.notes_text.selectAll()
+        self.notes_text.cut()
         self.notes_text.insertPlainText(self.projector.notes)
 
 
@@ -158,7 +160,7 @@
         self.button_box.helpRequested.connect(self.help_me)
         self.button_box.rejected.connect(self.cancel_me)
 
-    def exec_(self, projector=None):
+    def exec_(self, projector=None, test=False):
         if projector is None:
             self.projector = Projector()
             self.new_projector = True
@@ -167,7 +169,8 @@
             self.new_projector = False
         self.retranslateUi(self)
         reply = QDialog.exec_(self)
-        self.projector = None
+        if not test:
+            self.projector = None
         return reply
 
     @pyqtSlot()

=== modified file 'openlp/core/ui/projector/manager.py'
--- openlp/core/ui/projector/manager.py	2014-10-23 02:40:22 +0000
+++ openlp/core/ui/projector/manager.py	2014-12-18 19:00:50 +0000
@@ -562,9 +562,8 @@
             return
         self.old_projector = projector
         projector.link.disconnect_from_host()
-        record = self.projectordb.get_projector_by_ip(projector.link.ip)
-        self.projector_form.exec_(record)
-        new_record = self.projectordb.get_projector_by_id(record.id)
+        self.projector_form.exec(projector.db_item)
+        projector.db_item = self.projectordb.get_projector_by_id(self.old_projector.db_item.id)
 
     def on_poweroff_projector(self, opt=None):
         """