Skip to content

Commit

Permalink
Allow referenced_list to be orderd by configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
fzaninotto committed Mar 18, 2015
1 parent d02f11c commit 1cf1889
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/javascripts/ng-admin/Crud/repository/RetrieveQueries.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ define(function (require) {
_page: (typeof (page) === 'undefined') ? 1 : parseInt(page, 10),
_perPage: listView.perPage()
};

if (sortField && sortField.split('.')[0] === listView.name()) {
params._sortField = sortField.split('.')[1];
params._sortDir = sortDir;
Expand Down Expand Up @@ -202,6 +201,7 @@ define(function (require) {
referencedLists = view.getReferencedLists(),
calls = [],
referencedList,
referencedView,
filter,
i,
j;
Expand All @@ -210,8 +210,8 @@ define(function (require) {
referencedList = referencedLists[i];
filter = {};
filter[referencedList.targetReferenceField()] = entityId;

calls.push(self.getRawValues(referencedList.getReferencedView(), 1, filter, sortField || referencedList.sortField(), sortDir || referencedList.sortDir()));
referencedView = referencedList.getReferencedView();
calls.push(self.getRawValues(referencedView, 1, filter, sortField || (referencedView.name() + '.' + referencedList.sortField()), sortDir || referencedList.sortDir()));
}

return this.$q.all(calls)
Expand Down

0 comments on commit 1cf1889

Please sign in to comment.