Merge pull request #5125 from elastic/revert-5093-issues/4458

Revert "Allow 'visualize' button on discover fields to open in a new …
This commit is contained in:
Matt Bargar 2015-10-15 17:28:15 -07:00
commit 6052985cd9
3 changed files with 7 additions and 10 deletions

View file

@ -1,7 +1,6 @@
define(function (require) {
var app = require('ui/modules').get('apps/discover');
require('ui/directives/css_truncate');
require('ui/directives/field_name');
require('ui/filters/unique');
@ -9,7 +8,6 @@ define(function (require) {
app.directive('discFieldChooser', function ($location, globalState, config, $route, Private) {
var _ = require('lodash');
var $ = require('jquery');
var rison = require('ui/utils/rison');
var fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator');
var FieldList = Private(require('ui/index_patterns/_field_list'));
@ -153,7 +151,7 @@ define(function (require) {
$scope.indexPattern.popularizeField(fieldName, 1);
};
$scope.vizLocation = function (field) {
$scope.runAgg = function (field) {
var agg = {};
var isGeoPoint = field.type === 'geo_point';
var type = isGeoPoint ? 'tile_map' : 'histogram';
@ -190,7 +188,7 @@ define(function (require) {
};
}
return '#/visualize/create?' + $.param(_.assign($location.search(), {
$location.path('/visualize/create').search({
indexPattern: $scope.state.index,
type: type,
_a: rison.encode({
@ -204,7 +202,7 @@ define(function (require) {
]
}
})
}));
});
};
$scope.details = function (field, recompute) {

View file

@ -35,14 +35,14 @@
</div>
</div>
<a ng-show="field.indexed || field.scripted"
ng-href="{{vizLocation(field)}}"
<div ng-show="field.indexed || field.scripted"
ng-click="runAgg(field)"
class="sidebar-item-button primary">
Visualize
<span class="discover-field-vis-warning" ng-show="warnings.length" tooltip="{{warnings.join(' ')}}">
( {{warnings.length}} <ng-pluralize count="warnings.length" when="{'1':'warning', 'other':'warnings'}"></ng-pluralize> <i aria-hidden="true" class="fa fa-warning"></i> )
</span>
</a>
</div>
<div ng-show="!field.indexed && !field.scripted"
disabled="disabled"

View file

@ -31,7 +31,7 @@
border-top-color: @sidebar-border;
font-size: @sidebar-item-font-size;
a:not(.sidebar-item-button) {
a {
color: @sidebar-item-color;
&:hover {
@ -73,7 +73,6 @@
&-button {
font-size: inherit;
display: block;
&[disabled] {
opacity: 0.65;