← Back to branch summary

~zyga/checkbox/sa-api-changes

« back to all changes in this revision

Viewing changes to checkbox-touch/checkbox-touch.qml

"automatic merge of lp:~kissiel/checkbox/fix-1493467-uncategorized-skipped/ by tarmac [r=sylvain-pineau][bug=1493467][author=kissiel]"

Show diffs side-by-side

added added

removed removed

Lines of Context:
checkbox-touch/checkbox-touch.qml
317
317
 
318
318
        function setup(continuation) {
319
319
            app.getCategories(function(response) {
320
 
                var category_info_list = response.category_info_list;
321
 
                model.clear();
322
 
                for (var i=0; i<category_info_list.length; i++) {
323
 
                    var category_info = category_info_list[i]; 
324
 
                    model.append(category_info);
 
320
                var uncategorised_id = "2013.com.canonical.plainbox::uncategorised"
 
321
                if (response.category_info_list.length === 1 &&
 
322
                    response.category_info_list[0].mod_id == uncategorised_id) {
 
323
                    selectionDone(uncategorised_id);
 
324
                } else {
 
325
                    var category_info_list = response.category_info_list;
 
326
                    model.clear();
 
327
                    for (var i=0; i<category_info_list.length; i++) {
 
328
                        var category_info = category_info_list[i];
 
329
                        model.append(category_info);
 
330
                    }
 
331
                    modelUpdated();
 
332
                    pageStack.push(categorySelectionPage);
325
333
                }
326
 
                modelUpdated();
327
 
                pageStack.push(categorySelectionPage);
328
334
                // if called from welcome page, no continuation is given
329
335
                if (continuation) continuation();
330
336
            });