Merge lp:~stolowski/unity-scope-click/sort-departments into lp:unity-scope-click/devel

[Paweł Stołowski]

Sort departments alphabetically.

Sort departments alphabetically.

[lp:~stolowski/unity-scope-click/sort-departments]

403. By Paweł Stołowski on 2014-08-08

Use locale-sensitive sort.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/258/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/232
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/232/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/232

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/258/rebuild

review: Approve (continuous-integration)

[lp:~stolowski/unity-scope-click/sort-departments]

404. By Paweł Stołowski on 2014-08-12

Merged no-empty-departments.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/263/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/238/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/237
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/237

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/263/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

review: Needs Fixing

[lp:~stolowski/unity-scope-click/sort-departments]

405. By Paweł Stołowski on 2014-08-18

Removed commented line.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/271/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/245
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/245

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/271/rebuild

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'scope/clickapps/apps-query.cpp'
--- scope/clickapps/apps-query.cpp	2014-08-18 13:44:42 +0000
+++ scope/clickapps/apps-query.cpp	2014-08-18 13:44:43 +0000
@@ -40,6 +40,7 @@
 #include <unity/scopes/Department.h>
 
 #include <vector>
+#include <locale>
 
 #include <click/click-i18n.h>
 #include "apps-query.h"
@@ -317,6 +318,8 @@
         auto name = current_dep_id == "" ? all_dept_name : impl->depts_db->get_department_name(current_dep_id, locales);
         unity::scopes::Department::SPtr current = unity::scopes::Department::create(current_dep_id, query(), name);
 
+        unity::scopes::DepartmentList children;
+
         // attach subdepartments to it
         for (auto const& subdep: impl->depts_db->get_children_departments(current_dep_id))
         {
@@ -356,7 +359,7 @@
                     name = impl->depts_db->get_department_name(subdep.id, locales);
                     unity::scopes::Department::SPtr dep = unity::scopes::Department::create(subdep.id, query(), name);
                     dep->set_has_subdepartments(subdep.has_children);
-                    current->add_subdepartment(dep);
+                    children.push_back(dep);
                 }
                 catch (const std::exception &e)
                 {
@@ -365,6 +368,15 @@
             }
         }
 
+        if (children.size() > 0)
+        {
+            const std::locale loc("");
+            children.sort([&loc](const unity::scopes::Department::SCPtr &d1, const unity::scopes::Department::SCPtr &d2) -> bool {
+                    return loc(d1->label(), d2->label()) > 0;
+                });
+            current->set_subdepartments(children);
+        }
+
         // if current is not the top, then gets its parent
         if (current_dep_id != "")
         {

=== modified file 'scope/clickstore/store-query.cpp'
--- scope/clickstore/store-query.cpp	2014-08-01 05:12:28 +0000
+++ scope/clickstore/store-query.cpp	2014-08-18 13:44:43 +0000
@@ -48,6 +48,7 @@
 #include<set>
 #include<sstream>
 #include <cassert>
+#include <locale>
 
 #include <QLocale>
 
@@ -215,6 +216,11 @@
         departments.push_back(department);
     }
 
+    const std::locale loc("");
+    departments.sort([&loc](const unity::scopes::Department::SCPtr &d1, const unity::scopes::Department::SCPtr &d2) -> bool {
+            return loc(d1->label(), d2->label()) > 0;
+            });
+
     if (current_dep_id != "")
     {
         auto curr_dpt = impl->department_lookup.get_department_info(current_dep_id);

=== modified file 'scope/tests/test_apps_query.cpp'
--- scope/tests/test_apps_query.cpp	2014-08-18 13:44:42 +0000
+++ scope/tests/test_apps_query.cpp	2014-08-18 13:44:43 +0000
@@ -242,9 +242,9 @@
         EXPECT_CALL(*depts_db, is_descendant_of_department(_, _)).Times(AnyNumber());
         EXPECT_CALL(*depts_db, get_children_departments("")).WillOnce(Return(
                     std::list<click::DepartmentsDb::DepartmentInfo>({
-                        {"games", true},
                         {"video", true},
-                        {"books", true}
+                        {"books", true},
+                        {"games", true}
                     }))
                 );