jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2026-05-13 06:00:53 -04:00
Code Issues Projects Releases Wiki Activity

[#138] simplify saveQuery, drop $route dependency

Browse Source
This commit is contained in:
Amir Nissim
2014-03-24 15:28:05 +02:00
parent 028a3e9d62
commit 5ce4fcb974
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rd_ui/app/scripts/controllers/query_view.js
View File

@@ -19,35 +19,35 @@
$scope.queryExecuting = lock;
};
$scope.saveQuery = function(duplicate, oldId) {
if (!oldId) {
oldId = $scope.query.id;
$scope.saveQuery = function(duplicate) {
var
successMessage = "Query saved",
oldId = $scope.query.id;
if (duplicate) {
successMessage = "Query forked";
$scope.query.id = null;
$scope.query.ttl = -1;
}
delete $scope.query.latest_query_data;
$scope.query.$save(function(savedQuery) {
$scope.isDirty = false;
if (duplicate) {
growl.addSuccessMessage("Query forked");
} else {
growl.addSuccessMessage("Query saved");
if (oldId != savedQuery.id) {
// redirect to new/duplicated query page
$location.url('/queries/' + savedQuery.id + '/source#' + $location.hash()).replace();
}
if (oldId != savedQuery.id) {
$location.url($location.url().replace(oldId, savedQuery.id)).replace();
}
growl.addSuccessMessage(successMessage);
}, function(httpResponse) {
growl.addErrorMessage("Query could not be saved");
});
};
$scope.duplicateQuery = function() {
var oldId = $scope.query.id;
$scope.query.id = null;
$scope.query.ttl = -1;
$scope.saveQuery(true, oldId);
$scope.saveQuery(true);
};
$scope.executeQuery = function() {