Merge lp:~diegosarmentero/ubuntuone-windows-installer/847796 into lp:ubuntuone-windows-installer

Proposed by Diego Sarmentero on 2011-09-13
Status: Merged
Approved by: Natalia Bidart on 2011-09-14
Approved revision: 60
Merged at revision: 62
Proposed branch: lp:~diegosarmentero/ubuntuone-windows-installer/847796
Merge into: lp:ubuntuone-windows-installer
Diff against target: 23 lines (+2/-0)
2 files modified
ubuntuone_installer/gui/qt/setup_account.py (+1/-0)
ubuntuone_installer/gui/qt/tests/test_gui.py (+1/-0)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-windows-installer/847796
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve on 2011-09-14
Natalia Bidart 2011-09-13 Approve on 2011-09-14
Review via email: mp+75158@code.launchpad.net

Commit message

Fixed: Setup account button can be clicked with no data

Description of the change

Fixed: Setup account button can be clicked with no data

To post a comment you must log in.
Natalia Bidart (nataliabidart) wrote :

The code looks good.

While testing it IRL, I got this trace:

2011-09-13 11:54:32,773:773.999929428 - ubuntu_sso.controllers - DEBUG - SetUpAc
countController.is_correct_password_confirmation
Traceback (most recent call last):
  File "E:\ussoc\trunk\ubuntu_sso\qt\controllers.py", line 358, in _enable_setup
_button
    self.view.wizard().button(self.set_up_account).setEnabled(enabled)
TypeError: QWidget.setEnabled(bool): argument 1 has unexpected type 'unicode'

Shall we fix that in this branch?

review: Needs Information
Diego Sarmentero (diegosarmentero) wrote :

> The code looks good.
>
> While testing it IRL, I got this trace:
>
> 2011-09-13 11:54:32,773:773.999929428 - ubuntu_sso.controllers - DEBUG -
> SetUpAc
> countController.is_correct_password_confirmation
> Traceback (most recent call last):
> File "E:\ussoc\trunk\ubuntu_sso\qt\controllers.py", line 358, in
> _enable_setup
> _button
> self.view.wizard().button(self.set_up_account).setEnabled(enabled)
> TypeError: QWidget.setEnabled(bool): argument 1 has unexpected type 'unicode'
>
> Shall we fix that in this branch?

This bug is from SSO and it is fixed in another branch

Natalia Bidart (nataliabidart) wrote :

Approving then!

review: Approve
Roberto Alsina (ralsina) wrote :

+1 allowing for the mentioned above

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
2--- ubuntuone_installer/gui/qt/setup_account.py 2011-09-12 19:34:20 +0000
3+++ ubuntuone_installer/gui/qt/setup_account.py 2011-09-13 11:24:24 +0000
4@@ -101,6 +101,7 @@
5 self.setButtonText(QtGui.QWizard.CustomButton3, _('Set Up Account'))
6 self.set_up_button = self.wizard().button(QtGui.QWizard.CustomButton3)
7 self.set_up_button.clicked.connect(self.wizard().overlay.show)
8+ self.set_up_button.setEnabled(False)
9
10 self.ui.name_label.setText(NAME)
11 self.ui.email_label.setText(EMAIL)
12
13=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
14--- ubuntuone_installer/gui/qt/tests/test_gui.py 2011-09-12 18:49:40 +0000
15+++ ubuntuone_installer/gui/qt/tests/test_gui.py 2011-09-13 11:24:24 +0000
16@@ -168,6 +168,7 @@
17 self.ui.restart()
18 self.ui.show()
19 self.addCleanup(self.ui.hide)
20+ self.assertFalse(setup_page.set_up_button.isEnabled())
21 self.assertFalse(setup_page.ui.name_assistance.isVisible())
22 self.assertFalse(setup_page.ui.email_assistance.isVisible())
23 self.assertFalse(setup_page.ui.confirm_email_assistance.isVisible())

Subscribers

People subscribed via source and target branches