Ubuntu One Windows Installer

Merge lp:~ralsina/ubuntuone-windows-installer/fix_904799 into lp:ubuntuone-windows-installer

  1. fix_904799
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Approved by: Roberto Alsina
Approved revision: 99
Merged at revision: 98
Proposed branch: lp:~ralsina/ubuntuone-windows-installer/fix_904799
Merge into: lp:ubuntuone-windows-installer
Diff against target: 41 lines (+3/-5)
2 files modified
ubuntuone_installer/gui/qt/local_folders.py (+1/-1)
ubuntuone_installer/gui/qt/tests/test_local_folders.py (+2/-4)
To merge this branch: bzr merge lp:~ralsina/ubuntuone-windows-installer/fix_904799
Reviewer Review Type Date Requested Status
Guillermo Gonzalez Approve
John O'Brien (community) Approve
Review via email: mp+86910@code.launchpad.net

Commit message

Make UDF creation from the wizard work.

Description of the change

Make UDF creation from the wizard work.

To test it, run the wizard without credentials, and login using a fresh account (or at least one that has no UDFs or shares).

Once you login, you can create a UDF, click next, it should appear in the web interface.

To post a comment you must log in.
Revision history for this message
John O'Brien (jdobrien) wrote :

The diff is pretty...that's about all I can review.

review: Approve
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

pretty and small, +1

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/local_folders.py'
2--- ubuntuone_installer/gui/qt/local_folders.py 2011-10-06 20:28:12 +0000
3+++ ubuntuone_installer/gui/qt/local_folders.py 2011-12-26 18:09:25 +0000
4@@ -176,7 +176,7 @@
5 self.wizard().currentIdChanged.disconnect(self.changed_page)
6 except KeyError:
7 pass
8- if page_id == self.wizard().SYNC_NOW_OR_LATER_PAGE:
9+ if page_id == self.wizard().CONGRATULATIONS_PAGE:
10 # The page following this one
11 self.wizard().overlay.show()
12 for path, item in self.items.items():
13
14=== modified file 'ubuntuone_installer/gui/qt/tests/test_local_folders.py'
15--- ubuntuone_installer/gui/qt/tests/test_local_folders.py 2011-11-07 20:18:58 +0000
16+++ ubuntuone_installer/gui/qt/tests/test_local_folders.py 2011-12-26 18:09:25 +0000
17@@ -1,6 +1,4 @@
18 # -*- coding: utf-8 -*-
19-
20-# Authors: Roberto Alsina <roberto.alsina@canonical.com>
21 #
22 # Copyright 2011 Canonical Ltd.
23 #
24@@ -482,7 +480,7 @@
25 yield self.ui.get_info()
26 show_counter = self.ui.wizard().overlay.show_counter
27 hide_counter = self.ui.wizard().overlay.hide_counter
28- self.ui.changed_page(self.ui.wizard().SYNC_NOW_OR_LATER_PAGE)
29+ self.ui.changed_page(self.ui.wizard().CONGRATULATIONS_PAGE)
30 changes = sorted(self.ui.cp_backend.volume_setings_changes)
31 self.assertEqual(changes,
32 [('asdfgh', {'subscribed': True})])
33@@ -503,7 +501,7 @@
34 item.setCheckState(0, QtCore.Qt.Checked)
35 item = yield self.ui.add_folder("whatever2")
36 item.setCheckState(0, QtCore.Qt.Unchecked)
37- self.ui.changed_page(self.ui.wizard().SYNC_NOW_OR_LATER_PAGE)
38+ self.ui.changed_page(self.ui.wizard().CONGRATULATIONS_PAGE)
39 self.assertEqual(self.ui.cp_backend.folders_created,
40 [('whatever',)])
41 self.assertEqual(self.ui.wizard().overlay.show_counter,

Subscribers

People subscribed via source and target branches