@@ -25,7 +25,7 @@ AbstractButton {
2525
2626 property bool showList: false
2727
28− readonly property var currentDepartment: scope && scope.hasDepartments ? scope.getDepartment(scope.currentDepartmentId) : null
28+ readonly property var currentDepartment: scope && scope.hasNavigation ? scope.getNavigation(scope.currentNavigationId) : null
2929
3030 property alias windowWidth: blackRect.width
3131 property alias windowHeight: blackRect.height
@@ -102,8 +102,8 @@ AbstractButton {
102102 model: ListModel {
103103 id: departmentModel
104104 // We have two roles
105− // departmentId: the department id of the department the list represents
106− // nullifyDepartment: overrides departmentId to be null
105+ // navigationId: the department id of the department the list represents
106+ // nullifyDepartment: overrides navigationId to be null
107107 // This is used to "clear" the delegate when going "right" on the tree
108108 }
109109 anchors {
@@ -138,31 +138,31 @@ AbstractButton {
138138 }
139139 }
140140 height: desiredHeight
141− department: (nullifyDepartment || !scope) ? null : scope.getDepartment(departmentId)
141+ department: (nullifyDepartment || !scope) ? null : scope.getNavigation(navigationId)
142142 currentDepartment: root.currentDepartment
143143 onEnterDepartment: {
144− scope.loadDepartment(newDepartmentId);
144+ scope.performQuery(departmentQuery);
145145 // We only need to add a new item to the model
146146 // if we have children, otherwise just load it
147147 if (hasChildren) {
148148 isGoingBack = false;
149− departmentModel.append({"departmentId": newDepartmentId, "nullifyDepartment": false});
149+ departmentModel.append({"navigationId": newNavigationId, "nullifyDepartment": false});
150150 departmentListView.currentIndex++;
151151 } else {
152152 showList = false;
153153 }
154154 }
155155 onGoBackToParentClicked: {
156− scope.loadDepartment(department.parentDepartmentId);
156+ scope.performQuery(department.parentQuery);
157157 isGoingBack = true;
158158 departmentModel.setProperty(departmentListView.currentIndex - 1, "nullifyDepartment", false);
159159 departmentListView.currentIndex--;
160160 }
161161 onAllDepartmentClicked: {
162162 showList = false;
163− if (root.currentDepartment.parentDepartmentId == department.departmentId) {
163+ if (root.currentDepartment.parentNavigationId == department.navigationId) {
164164 // For leaves we have to go to the parent too
165− scope.loadDepartment(root.currentDepartment.parentDepartmentId);
165+ scope.performQuery(root.currentDepartment.parentQuery);
166166 }
167167 }
168168 }
@@ -185,16 +185,16 @@ AbstractButton {
185185
186186 onScopeChanged: {
187187 departmentModel.clear();
188− if (scope && scope.hasDepartments) {
189− departmentModel.append({"departmentId": scope.currentDepartmentId, "nullifyDepartment": false});
188+ if (scope && scope.hasNavigation) {
189+ departmentModel.append({"navigationId": scope.currentNavigationId, "nullifyDepartment": false});
190190 }
191191 }
192192
193193 Connections {
194194 target: scope
195− onHasDepartmentsChanged: {
196− if (scope.hasDepartments) {
197− departmentModel.append({"departmentId": scope.currentDepartmentId, "nullifyDepartment": false});
195+ onHasNavigationChanged: {
196+ if (scope.hasNavigation) {
197+ departmentModel.append({"navigationId": scope.currentNavigationId, "nullifyDepartment": false});
198198 } else {
199199 departmentModel.clear();
200200 }