Merge lp:~mardy/ubuntu-system-settings-online-accounts/single-prompt-1552762 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

ProviderRequest: fix single account handling in authorization page

The canCreateAccount() function was being incorrectly used as a property in one part of the code. Given that the function is indeed suitable for being turned into a property, we use it as such.

ProviderRequest: fix single account handling in authorization page

The canCreateAccount() function was being incorrectly used as a property in one part of the code. Given that the function is indeed suitable for being turned into a property, we use it as such.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/285/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/996/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/73/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/73/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/996/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/285/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'online-accounts-ui/qml/ProviderRequest.qml'
--- online-accounts-ui/qml/ProviderRequest.qml	2015-11-02 07:28:44 +0000
+++ online-accounts-ui/qml/ProviderRequest.qml	2016-03-04 09:51:13 +0000
@@ -38,7 +38,7 @@
 
     Component.onCompleted: {
         i18n.domain = "ubuntu-system-settings-online-accounts"
-        if (accessModel.count === 0 && !accessModel.canCreateAccounts()) {
+        if (accessModel.count === 0 && !accessModel.canCreateAccounts) {
             /* No accounts to authorize */
             denied()
             return
@@ -63,7 +63,7 @@
                 id: loader
                 anchors.fill: parent
                 active: false
-                sourceComponent: ((accessModel.count == 0 && accessModel.canCreateAccounts()) ||
+                sourceComponent: ((accessModel.count == 0 && accessModel.canCreateAccounts) ||
                                   applicationInfo.id === "system-settings") ?
                     accountCreationPage : authorizationPage
                 onLoaded: {
@@ -96,10 +96,7 @@
         accountModel: accountsModel
         applicationId: applicationInfo.id
 
-        function canCreateAccounts() {
-            if (!providerInfo.isSingleAccount) return true
-            return accountsModel.count === 0
-        }
+        property bool canCreateAccounts: !providerInfo.isSingleAccount || accountsModel.count === 0
     }
 
     Component {