Merge lp:~kissiel/checkbox/fix-1493467-uncategorized-skipped into lp:checkbox

[Maciej Kisielewski]

This MR makes the categorySelectionScreen detect having only one item listed
and that being id: "2013.com.canonical.plainbox::uncategorised". As a result it
will call trigger selectionDone signal, as would normal (manual) selection.

8b76c60 checkbox-touch: skip category selection if only uncategorized tests present

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

=== modified file 'checkbox-touch/checkbox-touch.qml'
--- checkbox-touch/checkbox-touch.qml	2015-10-14 21:48:15 +0000
+++ checkbox-touch/checkbox-touch.qml	2015-10-21 21:24:37 +0000
@@ -318,14 +318,20 @@
 
         function setup(continuation) {
             app.getCategories(function(response) {
-                var category_info_list = response.category_info_list;
-                model.clear();
-                for (var i=0; i<category_info_list.length; i++) {
-                    var category_info = category_info_list[i]; 
-                    model.append(category_info);
+                var uncategorised_id = "2013.com.canonical.plainbox::uncategorised"
+                if (response.category_info_list.length === 1 &&
+                    response.category_info_list[0].mod_id == uncategorised_id) {
+                    selectionDone(uncategorised_id);
+                } else {
+                    var category_info_list = response.category_info_list;
+                    model.clear();
+                    for (var i=0; i<category_info_list.length; i++) {
+                        var category_info = category_info_list[i];
+                        model.append(category_info);
+                    }
+                    modelUpdated();
+                    pageStack.push(categorySelectionPage);
                 }
-                modelUpdated();
-                pageStack.push(categorySelectionPage);
                 // if called from welcome page, no continuation is given
                 if (continuation) continuation();
             });