From 804c1ad2536a14813c9f09138058264ccbdd023f Mon Sep 17 00:00:00 2001
From: Arik Fraimovich <arik@arikfr.com>
Date: Sun, 20 Nov 2016 13:51:01 +0200
Subject: [PATCH] Backport changes made after creating this pull request

---
 frontend/app/pages/dashboards/add-widget-dialog.js | 1 +
 frontend/app/pages/dashboards/widget.js            | 1 +
 frontend/app/pages/queries/query-results-link.js   | 2 +-
 frontend/app/pages/users/show.js                   | 7 ++++---
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/frontend/app/pages/dashboards/add-widget-dialog.js b/frontend/app/pages/dashboards/add-widget-dialog.js
index 10005234be..9fab031a16 100644
--- a/frontend/app/pages/dashboards/add-widget-dialog.js
+++ b/frontend/app/pages/dashboards/add-widget-dialog.js
@@ -76,6 +76,7 @@ const AddWidgetDialog = {
       widget.$save().then((response) => {
         // update dashboard layout
         this.dashboard.layout = response.layout;
+        this.dashboard.version = response.version;
         const newWidget = new Widget(response.widget);
         if (response.new_row) {
           this.dashboard.widgets.push([newWidget]);
diff --git a/frontend/app/pages/dashboards/widget.js b/frontend/app/pages/dashboards/widget.js
index 46ddb836f9..3a871f3556 100644
--- a/frontend/app/pages/dashboards/widget.js
+++ b/frontend/app/pages/dashboards/widget.js
@@ -50,6 +50,7 @@ function DashboardWidgetCtrl($location, $uibModal, $window, Events, currentUser)
       this.dashboard.widgets = this.dashboard.widgets.filter(row => row.length > 0);
 
       this.dashboard.layout = response.layout;
+      this.dashboard.version = response.version;
     });
   };
 
diff --git a/frontend/app/pages/queries/query-results-link.js b/frontend/app/pages/queries/query-results-link.js
index 58b946bda8..b9a0613457 100644
--- a/frontend/app/pages/queries/query-results-link.js
+++ b/frontend/app/pages/queries/query-results-link.js
@@ -13,7 +13,7 @@ function queryResultLink() {
         if (scope.queryResult.getId() == null) {
           element.attr('href', '');
         } else {
-          element.attr('href', `api/queries/${scope.query.id}/results/${scope.queryResult.getId()}.${fileType}`);
+          element.attr('href', `api/queries/${scope.query.id}/results/${scope.queryResult.getId()}.${fileType}${scope.embed ? `?api_key=${scope.apiKey}` : ''}`);
           element.attr('download', `${scope.query.name.replace(' ', '_') + moment(scope.queryResult.getUpdatedAt()).format('_YYYY_MM_DD')}.${fileType}`);
         }
       });
diff --git a/frontend/app/pages/users/show.js b/frontend/app/pages/users/show.js
index 1bf5119a73..a071d490cd 100644
--- a/frontend/app/pages/users/show.js
+++ b/frontend/app/pages/users/show.js
@@ -1,11 +1,12 @@
 import { each } from 'underscore';
 import template from './show.html';
 
-function UserCtrl($scope, $routeParams, $http, $location, toastr, currentUser, Events, User) {
+function UserCtrl($scope, $routeParams, $http, $location, toastr, clientConfig, currentUser, Events, User) {
   // $scope.$parent.pageTitle = 'Users';
 
   $scope.userId = $routeParams.userId;
   $scope.currentUser = currentUser;
+  $scope.clientConfig = clientConfig;
 
   if ($scope.userId === 'me') {
     $scope.userId = currentUser.id;
@@ -100,9 +101,9 @@ function UserCtrl($scope, $routeParams, $http, $location, toastr, currentUser, E
 
   $scope.sendPasswordReset = () => {
     $scope.disablePasswordResetButton = true;
-    $http.post(`api/users/${$scope.user.id}/reset_password`).success(() => {
+    $http.post(`api/users/${$scope.user.id}/reset_password`).success((data) => {
       $scope.disablePasswordResetButton = false;
-      toastr.success('The user should receive a link to reset his password by email soon.');
+      $scope.passwordResetLink = data.reset_link;
     });
   };
 }