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

[Riccardo Padovani]

Fixed #1340686 - Selecting a notebook then add a note doesn't default the note to the notebook

Fixed #1340686 - Selecting a notebook then add a note doesn't default the note to the notebook

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:178
http://91.189.93.70:8080/job/reminders-app-ci/454/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/999
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/999/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/150

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

one small inline nitpick. otherwise looks good

review: Needs Fixing

[Michael Zanetti (mzanetti)]

actually, you don't even need the if(), do you? If filter is an empty string it'll be the same calling it without an arg...

[lp:~rpadovani/reminders-app/1340686]

179. By Riccardo Padovani on 2014-07-14

Improved implementation of filter

[Riccardo Padovani (rpadovani)]

On Mon, Jul 14, 2014 at 07:44:13AM -0000, Michael Zanetti wrote:
>
> actually, you don't even need the if(), do you? If filter is an empty string it'll be the same calling it without an arg...

Yes, you're right: I thought that when filter is undefined causes problem with
the function, but works without problem, just tested.

Thanks,
--
Riccardo Padovani
www.rpadovani.com

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:179
http://91.189.93.70:8080/job/reminders-app-ci/456/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1006
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1006/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/152

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

yep, fine with that :)

review: Approve

[David Planella (dpm)]

Top-approving after discussion on a hangout

review: Approve

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2014-06-04 12:52:55 +0000
+++ src/app/qml/ui/NotesPage.qml	2014-07-14 12:23:43 +0000
@@ -45,7 +45,7 @@
                 text: i18n.tr("Add note")
                 iconName: "add"
                 onTriggered: {
-                    NotesStore.createNote("Untitled");
+                    NotesStore.createNote("Untitled", filter);
                 }   
             }
         }