1
=== modified file 'plugins/about/PageComponent.qml'
2
--- plugins/about/PageComponent.qml	2014-10-31 14:53:32 +0000
3
+++ plugins/about/PageComponent.qml	2014-11-19 12:03:52 +0000
4
@@ -33,6 +33,7 @@
5
33
33
6
34
    title: i18n.tr("About this phone")
34
    title: i18n.tr("About this phone")
7
35
    flickable: scrollWidget
35
    flickable: scrollWidget
8
36
    property var modemsSorted: manager.modems.slice(0).sort()
9
36
37
10
37
    UbuntuStorageAboutPanel {
38
    UbuntuStorageAboutPanel {
11
38
        id: backendInfos
39
        id: backendInfos
12
@@ -52,7 +53,7 @@
13
52
            if (manager.modems.length === 1) {
53
            if (manager.modems.length === 1) {
14
53
                phoneNumbers.setSource("PhoneNumber.qml", {path: manager.modems[0]})
54
                phoneNumbers.setSource("PhoneNumber.qml", {path: manager.modems[0]})
15
54
            } else if (manager.modems.length > 1) {
55
            } else if (manager.modems.length > 1) {
17
55
                phoneNumbers.setSource("PhoneNumbers.qml", {paths: manager.modems.slice(0).sort()})
56
                phoneNumbers.setSource("PhoneNumbers.qml", {paths: modemsSorted})
18
56
            }
57
            }
19
57
        }
58
        }
20
58
    }
59
    }
21
@@ -117,8 +118,23 @@
22
117
                property string imeiNumber
118
                property string imeiNumber
23
118
                imeiNumber: deviceInfos.imei(0)
119
                imeiNumber: deviceInfos.imei(0)
24
119
                text: "IMEI"
120
                text: "IMEI"
27
120
                value: imeiNumber
121
                value: modemsSorted.length ? (imeiNumber || i18n.tr("None")) :
28
121
                visible: imeiNumber
122
                    i18n.tr("None")
29
123
                visible: modemsSorted.length <= 1
30
124
            }
31
125
32
126
            ListItem.MultiValue {
33
127
                text: "IMEI"
34
128
                objectName: "imeiItems"
35
129
                values: {
36
130
                    var imeis = [];
37
131
                    modemsSorted.forEach(function (path, i) {
38
132
                        var imei = deviceInfos.imei(i);
39
133
                        imei ? imeis.push(imei) : imeis.push(i18n.tr("None"));
40
134
                    });
41
135
                    return imeis;
42
136
                }
43
137
                visible: modemsSorted.length > 1
44
122
            }
138
            }
45
123
139
46
124
            ListItem.SingleValue {
140
            ListItem.SingleValue {
47
125
141
48
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_about.py'
49
--- tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-09-03 14:48:02 +0000
50
+++ tests/autopilot/ubuntu_system_settings/tests/test_about.py	2014-11-19 12:03:52 +0000
51
@@ -132,13 +132,6 @@
52
132
            displayed_imei = self.about_page.get_imei()
132
            displayed_imei = self.about_page.get_imei()
53
133
            self.assertThat(displayed_imei, Equals(device_imei))
133
            self.assertThat(displayed_imei, Equals(device_imei))
54
134
134
55
135
    def test_device_without_imei_must_not_display_it(self):
56
136
        device_imei = self._get_imei_from_dbus()
57
137
        if device_imei:
58
138
            self.skipTest('The device has imei.')
59
139
        else:
60
140
            self.assertFalse(self.about_page.is_imei_visible())
61
141
62
142
    def test_phone_number(self):
135
    def test_phone_number(self):
63
143
        number = self.system_settings.main_view.about_page.select_single(
136
        number = self.system_settings.main_view.about_page.select_single(
64
144
            objectName="numberItem"
137
            objectName="numberItem"
Reviewer	Review Type	Date Requested	Status
Sebastien Bacher (community)		2014-11-17	Approve on 2014-12-08
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-12-01
Review via email: mp+241977@code.launchpad.net