[settings/indices] added field format name

This commit is contained in:
Spencer Alger 2015-04-30 11:39:20 -07:00
parent fa41afceb2
commit eed15bb31b
2 changed files with 14 additions and 9 deletions

View file

@ -20,6 +20,7 @@ define(function (require) {
$scope.columns = [
{ title: 'name' },
{ title: 'type' },
{ title: 'format' },
{ title: 'analyzed', info: 'Analyzed fields may require extra memory to visualize' },
{ title: 'indexed', info: 'Fields that are not indexed are unavailable for search' },
{ title: 'controls', sortable: false }
@ -29,7 +30,7 @@ define(function (require) {
// clear and destroy row scopes
_.invoke(rowScopes.splice(0), '$destroy');
$scope.rows = $scope.indexPattern.getFields().map(function (field) {
$scope.rows = $scope.indexPattern.fields.map(function (field) {
var childScope = _.assign($scope.$new(), { field: field });
rowScopes.push(childScope);
@ -44,6 +45,7 @@ define(function (require) {
scope: childScope,
value: field.type
},
_.get($scope.indexPattern, ['fieldFormatMap', field.name, 'type', 'title']),
{
markup: field.analyzed ? yesTemplate : noTemplate,
value: field.analyzed

View file

@ -13,7 +13,7 @@ define(function (require) {
restrict: 'E',
template: require('text!plugins/settings/sections/indices/_scripted_fields.html'),
scope: true,
link: function ($scope, $el, attr) {
link: function ($scope) {
var dateScripts = require('plugins/settings/sections/indices/_date_scripts');
var fieldCreatorPath = '/settings/indices/{{ indexPattern }}/scriptedField';
@ -23,6 +23,7 @@ define(function (require) {
$scope.columns = [
{ title: 'name' },
{ title: 'script' },
{ title: 'format' },
{ title: 'controls', sortable: false }
];
@ -32,16 +33,18 @@ define(function (require) {
$scope.rows = $scope.indexPattern.getFields('scripted').map(function (field) {
var rowScope = $scope.$new();
var columns = [field.name, field.script];
rowScope.field = field;
rowScopes.push(rowScope);
columns.push({
markup: controlsHtml,
scope: rowScope
});
return columns;
return [
field.name,
field.script,
_.get($scope.indexPattern, ['fieldFormatMap', field.name, 'type', 'title']),
{
markup: controlsHtml,
scope: rowScope
}
];
});
});