diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2012-08-27 17:41:28 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2012-08-29 12:00:15 +0200 |
| commit | edbcd28f44fb5c123440c246965166d5947554e6 (patch) | |
| tree | 78720547e7fab7951b306898b3f72a9efcdf566d | |
| parent | 81007ff38578588906737df3082b42fb7f2ee011 (diff) | |
| download | freeipa-edbcd28f44fb5c123440c246965166d5947554e6.tar.gz freeipa-edbcd28f44fb5c123440c246965166d5947554e6.tar.xz freeipa-edbcd28f44fb5c123440c246965166d5947554e6.zip | |
Password policy paging with proper sorting
This patch adds option to disable sorting when paging. It allowed to enable paging in password policy with order of items untouched (they are sorted on server side by priority).
Also fixing issue when paging is disabled and command summary = null. It displayed 'null' in facet footer.
https://fedorahosted.org/freeipa/ticket/2677
| -rw-r--r-- | install/ui/facet.js | 7 | ||||
| -rw-r--r-- | install/ui/policy.js | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/install/ui/facet.js b/install/ui/facet.js index d5b21f323..0de08d3f7 100644 --- a/install/ui/facet.js +++ b/install/ui/facet.js @@ -740,6 +740,7 @@ IPA.table_facet = function(spec, no_init) { that.pagination = spec.pagination === undefined ? true : spec.pagination; that.search_all_entries = spec.search_all_entries; that.search_all_attributes = spec.search_all_attributes; + that.sort_enabled = spec.sort_enabled === undefined ? true : spec.sort_enabled; that.selectable = spec.selectable === undefined ? true : spec.selectable; that.select_changed = IPA.observer(); @@ -833,7 +834,7 @@ IPA.table_facet = function(spec, no_init) { message = message.replace('${counter}', data.result.count); that.table.summary.text(message); } else { - that.table.summary.text(data.result.summary); + that.table.summary.text(data.result.summary || ''); } }; @@ -895,7 +896,9 @@ IPA.table_facet = function(spec, no_init) { that.table.summary.text(summary); // sort map based on primary keys - records_map = records_map.sort(); + if (that.sort_enabled) { + records_map = records_map.sort(); + } // trim map leaving the entries visible in the current page only records_map = records_map.slice(start-1, end); diff --git a/install/ui/policy.js b/install/ui/policy.js index ff932bec4..c109163e4 100644 --- a/install/ui/policy.js +++ b/install/ui/policy.js @@ -33,7 +33,7 @@ IPA.pwpolicy.entity = function(spec) { that.entity_init(); that.builder.search_facet({ - pagination: false, + sort_enabled: false, columns:['cn','cospriority'] }). details_facet({ |