github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3605 from spalger/removeBo

Browse source 
remove bo-if
This commit is contained in:
Spencer 2015-04-16 14:09:05 -07:00
commit 048b0a4475
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/kibana/components/doc_viewer/doc_viewer.html
View file

@ -5,16 +5,16 @@
</ul>
<div class="content">
<table class="table table-condensed" ng-show="mode == 'table'" bindonce>
<table class="table table-condensed" ng-show="mode == 'table'">
<tbody>
<tr ng-repeat="field in fields" bindonce>
<tr ng-repeat="field in fields">
<td field-name="field"
field-type="mapping[field].type"
width="1%"
class="doc-viewer-field">
</td>
<td width="1%" class="doc-viewer-buttons" ng-if="filter">
<span bo-if="mapping[field].filterable">
<span ng-if="mapping[field].filterable">
<i ng-click="filter(mapping[field], flattened[field], '+')"
tooltip="Filter for value"
tooltip-append-to-body="1"
@ -24,11 +24,11 @@
tooltip-append-to-body="1"
class="fa fa-search-minus"></i>
</span>
<span bo-if="!mapping[field].filterable" tooltip="Unindexed fields can not be searched">
<span ng-if="!mapping[field].filterable" tooltip="Unindexed fields can not be searched">
<i class="fa fa-search-plus text-muted"></i>
<i class="fa fa-search-minus text-muted"></i>
</span>
<span bo-if="columns">
<span ng-if="columns">
<i ng-click="toggleColumn(field)"
tooltip="Toggle column in table"
tooltip-append-to-body="1"
@ -37,15 +37,15 @@
</td>
<td>
<i bo-if="!mapping[field] && field[0] === '_'"
<i ng-if="!mapping[field] && field[0] === '_'"
tooltip-placement="top"
tooltip="Field names beginning with _ are not supported"
class="fa fa-warning text-color-warning ng-scope doc-viewer-underscore"></i>
<i bo-if="!mapping[field] && field[0] !== '_' && !showArrayInObjectsWarning(doc, field)"
<i ng-if="!mapping[field] && field[0] !== '_' && !showArrayInObjectsWarning(doc, field)"
tooltip-placement="top"
tooltip="No cached mapping for this field. Refresh your mapping from the Settings > Indices page"
class="fa fa-warning text-color-warning ng-scope doc-viewer-no-mapping"></i>
<i bo-if="showArrayInObjectsWarning(doc, field)"
<i ng-if="showArrayInObjectsWarning(doc, field)"
tooltip-placement="top"
tooltip="Objects in arrays are not well supported."
class="fa fa-warning text-color-warning ng-scope doc-viewer-object-array"></i>

4
src/kibana/plugins/settings/sections/indices/_edit.html
View file

@ -45,10 +45,10 @@
<i aria-hidden="true" class="fa-link fa"></i>
</a>
</p>
<div bo-if="indexPattern.timeFieldName && indexPattern.intervalName" class="alert alert-info">
<div ng-if="indexPattern.timeFieldName && indexPattern.intervalName" class="alert alert-info">
This index uses a <strong>Time-based index pattern</strong> which repeats <span bo-text="indexPattern.getInterval().display"></span>
</div>
<div bo-if="conflictFields.length" class="alert alert-warning">
<div ng-if="conflictFields.length" class="alert alert-warning">
<strong>Mapping conflict!</strong> {{conflictFields.length > 1 ? conflictFields.length : 'A'}} field{{conflictFields.length > 1 ? 's' : ''}} {{conflictFields.length > 1 ? 'are' : 'is'}} defined as several types (string, integer, etc) across the indices that match this pattern. You may still be able to use these conflict fields in parts of Kibana, but they will be unavailable for functions that require Kibana to know their type. Correcting this issue will require reindexing your data.
</div>
</div>

6
src/kibana/plugins/settings/sections/indices/_edit.js
View file

@ -38,7 +38,9 @@ define(function (require) {
if (!tab) $scope.changeTab($scope.fieldTypes[0]);
});
$scope.conflictFields = _.filter($scope.indexPattern.fields, {type: 'conflict'});
$scope.$watchCollection('indexPattern.fields', function () {
$scope.conflictFields = _.filter($scope.indexPattern.fields, {type: 'conflict'});
});
$scope.refreshFields = function () {
$scope.indexPattern.refreshFields();
@ -73,4 +75,4 @@ define(function (require) {
return $scope.indexPattern.save();
};
});
});
});

2
src/kibana/plugins/settings/sections/indices/index.html
View file

@ -4,7 +4,7 @@
<h5>
Index Patterns&nbsp;
<a
bo-if="edittingId"
ng-if="edittingId"
href="#/settings/indices"
class="btn btn-primary btn-xs"
aria-label="Add New">