Ubuntu Notes app

Merge lp:~rpadovani/reminders-app/1318078 into lp:reminders-app

  1. 1318078
  2. Merge into trunk
Proposed by Riccardo Padovani
Status: Merged
Approved by: David Planella
Approved revision: 133
Merged at revision: 138
Proposed branch: lp:~rpadovani/reminders-app/1318078
Merge into: lp:reminders-app
Diff against target: 13 lines (+3/-0)
1 file modified
src/app/qml/reminders.qml (+3/-0)
To merge this branch: bzr merge lp:~rpadovani/reminders-app/1318078
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
David Planella Approve
Review via email: mp+219091@code.launchpad.net

Commit message

Remove wrong actions in toolbar when close note opened from a notebook

Description of the change

Remove wrong actions in toolbar when close note opened from a notebook

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

FAILED: Continuous integration, rev:133
http://91.189.93.70:8080/job/reminders-app-ci/333/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2584
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2584/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic/123/console
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/334
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/28

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/333/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

Looks good to me, confirmed to fix the issue.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/reminders.qml'
2--- src/app/qml/reminders.qml 2014-05-09 09:49:47 +0000
3+++ src/app/qml/reminders.qml 2014-05-10 09:24:58 +0000
4@@ -236,6 +236,9 @@
5 print("foo", page.selectedNote);
6 if (page.selectedNote) {
7 root.displayNote(page.selectedNote);
8+ if (root.narrowMode) {
9+ page.selectedNote = null;
10+ }
11 }
12 })
13 page.editNote.connect(function(note) {

Subscribers

People subscribed via source and target branches