Ubuntu Weather App

Merge lp:~ahayzen/ubuntu-weather-app/fix-1420609 into lp:ubuntu-weather-app/obsolete.trunk

  1. fix-1420609
  2. Merge into trunk
Proposed by Andrew Hayzen
Status: Merged
Approved by: Victor Thompson
Approved revision: 399
Merged at revision: 398
Proposed branch: lp:~ahayzen/ubuntu-weather-app/fix-1420609
Merge into: lp:ubuntu-weather-app/obsolete.trunk
Diff against target: 25 lines (+2/-2)
2 files modified
components/WeatherApi.js (+1/-1)
components/WeatherTemperatureComponent.qml (+1/-1)
To merge this branch: bzr merge lp:~ahayzen/ubuntu-weather-app/fix-1420609
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Victor Thompson Approve
Review via email: mp+249279@code.launchpad.net

Commit message

* Fix for maxTemps <= 0 not visible when using The Weather Channel and Centigrade

Description of the change

* Fix for maxTemps <= 0 not visible when using The Weather Channel and Centigrade

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:398
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/310/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/24
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/18

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/310/rebuild

review: Approve (continuous-integration)
lp:~ahayzen/ubuntu-weather-app/fix-1420609 updated
399. By Andrew Hayzen

* Further fix

Revision history for this message
Victor Thompson (vthompson) wrote :

lgtm!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:399
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/311/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/25
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid-weather-app/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-vivid-amd64-ci/19

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-weather-app-ci/311/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'components/WeatherApi.js'
2--- components/WeatherApi.js 2014-05-19 22:53:45 +0000
3+++ components/WeatherApi.js 2015-02-11 05:13:46 +0000
4@@ -480,7 +480,7 @@
5 },
6 imperial: {
7 tempMin: calcFahrenheit(data.minTemp),
8- tempMax: calcFahrenheit(data.maxTemp || data.minTemp),
9+ tempMax: calcFahrenheit(data.maxTemp !== undefined ? data.maxTemp : data.minTemp),
10 windSpeed: convertKmhToMph(partData.wSpeed)
11 },
12 precipType: partData.precip_type,
13
14=== modified file 'components/WeatherTemperatureComponent.qml'
15--- components/WeatherTemperatureComponent.qml 2014-09-20 10:55:31 +0000
16+++ components/WeatherTemperatureComponent.qml 2015-02-11 05:13:46 +0000
17@@ -118,7 +118,7 @@
18 font.pixelSize: (viewMode == 0) ? units.gu(2) : units.gu(3.5)
19 verticalAlignment: Text.AlignVCenter
20 horizontalAlignment: Text.AlignHCenter
21- visible: (dailyForecastList.currentIndex === 0 && tempComponent.maxTemp)
22+ visible: (dailyForecastList.currentIndex === 0 && tempComponent.maxTemp !== undefined)
23 anchors {
24 bottom: parent.bottom
25 bottomMargin: units.gu(2)

Subscribers

People subscribed via source and target branches