Skip to content

Commit

Permalink
Merge pull request #3565 from rashidkpc/fix/saved_object_editor_list
Browse files Browse the repository at this point in the history
Show "of #" in saved object editor list.
  • Loading branch information
lukasolson committed Apr 9, 2015
2 parents b3a9a1f + b5675c6 commit 51cb21d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
8 changes: 6 additions & 2 deletions src/kibana/plugins/settings/sections/objects/_objects.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,19 @@
<kbn-settings-objects class="container">
<h2>Edit Saved Objects</h2>
<p>
From here you can delete saved objects, such as saved searches. You can also edit the raw data of saved objects. Typically objects are only modified via their associated application, which is probably what you should use instead of this screen.
From here you can delete saved objects, such as saved searches. You can also edit the raw data of saved objects. Typically objects are only modified via their associated application, which is probably what you should use instead of this screen. Each tab is limited to 100 results. You can use the filter to find objects not in the default list.
</p>
<form role="form">
<input aria-label="Filter" ng-model="advancedFilter" class="form-control span12" type="text" placeholder="Filter"/>
</form>

<ul class="nav nav-tabs">
<li class="kbn-settings-tab" ng-class="{ active: state.tab === service.title }" ng-repeat="service in services">
<a title="{{ service.title }}" ng-click="changeTab(service)">{{ service.title }} <small>({{service.data.length}})</small></a>
<a title="{{ service.title }}" ng-click="changeTab(service)">{{ service.title }}
<small>
({{service.data.length}}<span ng-show="service.total > service.data.length"> of {{service.total}}</span>)
</small>
</a>
</li>
</ul>
<div class="tab-content">
Expand Down
2 changes: 1 addition & 1 deletion src/kibana/plugins/settings/sections/objects/_objects.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ define(function (require) {
var services = registry.all().map(function (obj) {
var service = $injector.get(obj.service);
return service.find(filter).then(function (data) {
return { service: obj.service, title: obj.title, data: data.hits };
return { service: obj.service, title: obj.title, data: data.hits, total: data.total };
});
});
$q.all(services).then(function (data) {
Expand Down
2 changes: 1 addition & 1 deletion src/kibana/plugins/settings/styles/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ kbn-settings-objects-view {
text-transform: capitalize;
}

li.kbn-settings-tab {
li.kbn-settings-tab:first-letter {
text-transform: capitalize;
}

Expand Down

0 comments on commit 51cb21d

Please sign in to comment.