+
-
\ No newline at end of file
+
diff --git a/client/app/pages/users/list.js b/client/app/pages/users/list.js
index ebf449a269..9618a0e04c 100644
--- a/client/app/pages/users/list.js
+++ b/client/app/pages/users/list.js
@@ -3,9 +3,7 @@ import settingsMenu from '@/lib/settings-menu';
import { Paginator } from '@/lib/pagination';
import template from './list.html';
-function UsersCtrl(currentUser, Policy, Events, User) {
- Events.record('view', 'page', 'users');
-
+function UsersCtrl(currentUser, Policy, User) {
this.currentUser = currentUser;
this.policy = Policy;
this.users = new Paginator([], { itemsPerPage: 20 });
diff --git a/client/app/pages/users/show.js b/client/app/pages/users/show.js
index aec7abe39f..e6f17be3af 100644
--- a/client/app/pages/users/show.js
+++ b/client/app/pages/users/show.js
@@ -6,7 +6,7 @@ import './settings.less';
function UserCtrl(
$scope, $routeParams, $http, $location, toastr,
- clientConfig, currentUser, Events, User,
+ clientConfig, currentUser, User,
) {
$scope.userId = $routeParams.userId;
$scope.currentUser = currentUser;
@@ -16,7 +16,6 @@ function UserCtrl(
$scope.userId = currentUser.id;
}
- Events.record('view', 'user', $scope.userId);
$scope.canEdit = currentUser.hasPermission('admin') || currentUser.id === parseInt($scope.userId, 10);
$scope.showSettings = false;
$scope.showPasswordSettings = false;
diff --git a/client/app/services/query-result.js b/client/app/services/query-result.js
index 0f2281223c..a6bff2acb7 100644
--- a/client/app/services/query-result.js
+++ b/client/app/services/query-result.js
@@ -54,6 +54,7 @@ function addPointToSeries(point, seriesCollection, seriesName) {
function QueryResultService($resource, $timeout, $q) {
const QueryResultResource = $resource('api/query_results/:id', { id: '@id' }, { post: { method: 'POST' } });
+ const QueryResultSetResource = $resource('api/queries/:id/resultset', { id: '@id' });
const Job = $resource('api/jobs/:id', { id: '@id' });
const statuses = {
1: 'waiting',
@@ -421,6 +422,15 @@ function QueryResultService($resource, $timeout, $q) {
return queryResult;
}
+ static getResultSet(queryId) {
+ const queryResult = new QueryResult();
+
+ QueryResultSetResource.get({ id: queryId }, (response) => {
+ queryResult.update(response);
+ });
+
+ return queryResult;
+ }
loadResult(tryCount) {
QueryResultResource.get(
{ id: this.job.query_result_id },
diff --git a/client/app/services/query.js b/client/app/services/query.js
index ac9c97b719..b446e80727 100644
--- a/client/app/services/query.js
+++ b/client/app/services/query.js
@@ -112,12 +112,14 @@ class Parameters {
});
const parameterExists = p => includes(parameterNames, p.name);
- this.query.options.parameters = this.query.options.parameters.filter(parameterExists).map(p => new Parameter(p));
+ this.query.options.parameters = this.query.options.parameters
+ .filter(parameterExists)
+ .map(p => new Parameter(Object.assign({ queryId: this.query.id }, p)));
}
initFromQueryString(queryString) {
this.get().forEach((param) => {
- const queryStringName = `p_${param.name}`;
+ const queryStringName = `p_${param.name}_${this.query.id}`;
if (has(queryString, queryStringName)) {
param.value = queryString[queryStringName];
}
@@ -320,7 +322,11 @@ function QueryResource($resource, $http, $q, $location, currentUser, QueryResult
this.latest_query_data_id = null;
}
- if (this.latest_query_data && maxAge !== 0) {
+ if (this.schedule_resultset_size) {
+ if (!this.queryResult) {
+ this.queryResult = QueryResult.getResultSet(this.id);
+ }
+ } else if (this.latest_query_data && maxAge !== 0) {
if (!this.queryResult) {
this.queryResult = new QueryResult({
query_result: this.latest_query_data,
@@ -357,7 +363,7 @@ function QueryResource($resource, $http, $q, $location, currentUser, QueryResult
params += '&';
}
- params += `p_${encodeURIComponent(name)}=${encodeURIComponent(value)}`;
+ params += `p_${encodeURIComponent(name)}_${this.id}=${encodeURIComponent(value)}`;
});
}
diff --git a/client/app/visualizations/chart/chart-editor.html b/client/app/visualizations/chart/chart-editor.html
index 202b92f0a9..a98937e123 100644
--- a/client/app/visualizations/chart/chart-editor.html
+++ b/client/app/visualizations/chart/chart-editor.html
@@ -9,11 +9,14 @@
Y Axis
-
+
Series
Data Labels
+
+ Colors
@@ -193,6 +196,12 @@
Show Labels
+
+
+
+
+ How many characters should X Axis Labels be truncated at in the legend?
+