From 96a0d0aefa0005211d35f2c2af43731e1fa2384e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Sep 2014 16:38:01 +0200 Subject: [PATCH 01/24] fixed changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d6c63ee023..2301c2b35a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# 1.8.0 (2014-09-12) +# 1.8.0 (unreleased) **Fixes** - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource From 92bec31ccb158a5edd234e302adae2262cb46ff1 Mon Sep 17 00:00:00 2001 From: starshayayord Date: Mon, 15 Sep 2014 18:51:58 +0600 Subject: [PATCH 02/24] Update index.html disable google translate plugin --- src/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.html b/src/index.html index 63e837abfcd..d47f9df9196 100644 --- a/src/index.html +++ b/src/index.html @@ -5,6 +5,7 @@ + Grafana From 32a41a8422b8b5c4381efd0aacbe989e747b4d8c Mon Sep 17 00:00:00 2001 From: Lorenzo Pierfederici Date: Mon, 15 Sep 2014 18:12:20 -0700 Subject: [PATCH 03/24] add override options to allow multiple stacks --- src/app/panels/graph/seriesOverridesCtrl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/panels/graph/seriesOverridesCtrl.js b/src/app/panels/graph/seriesOverridesCtrl.js index 4f54c6d0e6f..1b6b1dfc144 100644 --- a/src/app/panels/graph/seriesOverridesCtrl.js +++ b/src/app/panels/graph/seriesOverridesCtrl.js @@ -70,7 +70,7 @@ define([ $scope.addOverrideOption('Staircase line', 'steppedLine', [true, false]); $scope.addOverrideOption('Points', 'points', [true, false]); $scope.addOverrideOption('Points Radius', 'pointradius', [1,2,3,4,5]); - $scope.addOverrideOption('Stack', 'stack', [true, false]); + $scope.addOverrideOption('Stack', 'stack', [true, false, 2, 3, 4, 5]); $scope.addOverrideOption('Y-axis', 'yaxis', [1, 2]); $scope.addOverrideOption('Z-index', 'zindex', [-1,-2,-3,0,1,2,3]); $scope.updateCurrentOverrides(); From ff91430fcc9e539671cde35e27a04101a8b202bb Mon Sep 17 00:00:00 2001 From: Torkel Odegaard Date: Tue, 16 Sep 2014 08:01:18 +0200 Subject: [PATCH 04/24] added favicons --- src/app/partials/dashboard_topnav.html | 2 +- src/img/fav16.png | Bin 0 -> 639 bytes src/img/fav32.png | Bin 0 -> 1344 bytes src/index.html | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 src/img/fav16.png create mode 100644 src/img/fav32.png diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index 15ea694058c..689b8374b1c 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -1,7 +1,7 @@
- {{dashboard.title}} + {{dashboard.title}}
diff --git a/src/app/routes/p_login.js b/src/app/routes/p_login.js index bdab6d02e18..42b33e045f4 100644 --- a/src/app/routes/p_login.js +++ b/src/app/routes/p_login.js @@ -21,11 +21,9 @@ function (angular) { module.controller('RegisterCtrl', function($scope, $http, $location, $routeParams) { $scope.loginModel = {}; + $scope.grafana.sidemenu = false; $scope.init = function() { - if ($routeParams.logout) { - $scope.logout(); - } }; $scope.register = function() { From a0ab9113fc11815630856154e99aaeaf4b4207ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 17 Sep 2014 15:39:45 +0200 Subject: [PATCH 15/24] Graph: added percent y-axis format, Closes #818 --- CHANGELOG.md | 1 + src/app/components/kbn.js | 4 ++++ src/app/panels/graph/axisEditor.html | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1909b01c7bc..7b525a62999 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ **Fixes** - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource - [Issue #795](https://github.com/grafana/grafana/issues/795). Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode +- [Issue #818](https://github.com/grafana/grafana/issues/818). Graph: Added percent y-axis format # 1.8.0-RC1 (2014-09-12) diff --git a/src/app/components/kbn.js b/src/app/components/kbn.js index cefcb42d289..374d2f561b8 100644 --- a/src/app/components/kbn.js +++ b/src/app/components/kbn.js @@ -531,6 +531,10 @@ function($, _, moment) { return function(val) { return kbn.nanosFormat(val, decimals); }; + case 'percent': + return function(val, axis) { + return kbn.noneFormat(val, axis ? axis.tickDecimals : null) + ' %'; + }; default: return function(val, axis) { return kbn.noneFormat(val, axis ? axis.tickDecimals : null); diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html index 6800ee832b9..9380cb99327 100644 --- a/src/app/panels/graph/axisEditor.html +++ b/src/app/panels/graph/axisEditor.html @@ -4,7 +4,7 @@
Left Y Axis
- +
@@ -23,7 +23,7 @@
Right Y Axis
- +
From 88ea524f44415b190d679de31aef2f4920559312 Mon Sep 17 00:00:00 2001 From: Julien Ozog Date: Wed, 17 Sep 2014 17:12:43 +0200 Subject: [PATCH 16/24] Handle 'group' graphite method --- src/app/services/graphite/gfunc.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/app/services/graphite/gfunc.js b/src/app/services/graphite/gfunc.js index 533bb897283..1acfad8739b 100644 --- a/src/app/services/graphite/gfunc.js +++ b/src/app/services/graphite/gfunc.js @@ -86,6 +86,13 @@ function (_) { category: categories.Calculate, }); + addFuncDef({ + name: 'group', + params: optionalSeriesRefArgs, + defaultParams: ['#A', '#B'], + category: categories.Combine, + }); + addFuncDef({ name: 'sumSeries', shortName: 'sum', From 98b3126e327079909c58792a5f199bda559a0d14 Mon Sep 17 00:00:00 2001 From: Bryan Irvine Date: Wed, 17 Sep 2014 11:04:06 -0700 Subject: [PATCH 17/24] Update playlist.html --- src/app/partials/playlist.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/partials/playlist.html b/src/app/partials/playlist.html index 3b3ba7600c4..1517678e730 100644 --- a/src/app/partials/playlist.html +++ b/src/app/partials/playlist.html @@ -38,7 +38,7 @@
- dashboards available in the playlist are only the once marked as favorites (stored in local browser storage). + dashboards available in the playlist are only the ones marked as favorites (stored in local browser storage). to mark a dashboard as favorite, use save icon in the menu and in the dropdown select mark as favorite

From aa47eeffb2da4cdc8be8f5b1bb5233eeabcd5a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 18 Sep 2014 10:16:25 +0200 Subject: [PATCH 18/24] added default default support --- src/app/routes/p_dashboard.js | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/app/routes/p_dashboard.js b/src/app/routes/p_dashboard.js index 8c4b8d438de..de289de7efd 100644 --- a/src/app/routes/p_dashboard.js +++ b/src/app/routes/p_dashboard.js @@ -1,7 +1,8 @@ define([ 'angular', + 'store', ], -function (angular) { +function (angular, store) { "use strict"; var module = angular.module('grafana.routes'); @@ -25,12 +26,29 @@ function (angular) { }); }); - module.controller('DashFromDBProvider', function($scope, $rootScope, datasourceSrv, $routeParams, alertSrv) { + module.controller('DashFromDBProvider', function( + $scope, $rootScope, datasourceSrv, $routeParams, + alertSrv, $http, $location) { var db = datasourceSrv.getGrafanaDB(); var isTemp = window.location.href.indexOf('dashboard/temp') !== -1; + if (!$routeParams.id) { - $routeParams.id = 'default'; + var savedRoute = store.get('grafanaDashboardDefault'); + + if (!savedRoute) { + $http.get("app/dashboards/default.json?" + new Date().getTime()).then(function(result) { + var dashboard = angular.fromJson(result.data); + $scope.emitAppEvent('setup-dashboard', dashboard); + },function() { + alertSrv.set('Error',"Could not load default dashboard", 'error'); + }); + return; + } + else { + $location.path(savedRoute); + return; + } } db.getDashboard($routeParams.id, isTemp) From e5fd35db343109feec09d339d5d770dd1de1808a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 18 Sep 2014 12:04:03 +0200 Subject: [PATCH 19/24] small progress on adding collaborators --- src/app/controllers/all.js | 2 +- .../{p_grafanaCtrl.js => pro/grafanaCtrl.js} | 0 .../{p_loginCtrl.js => pro/loginCtrl.js} | 0 src/app/partials/pro/account.html | 73 +++++++++++++++++++ src/app/partials/pro/sidemenu.html | 4 +- src/app/routes/p_admin.js | 26 +++++++ src/app/routes/p_login.js | 9 +-- 7 files changed, 104 insertions(+), 10 deletions(-) rename src/app/controllers/{p_grafanaCtrl.js => pro/grafanaCtrl.js} (100%) rename src/app/controllers/{p_loginCtrl.js => pro/loginCtrl.js} (100%) create mode 100644 src/app/partials/pro/account.html diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js index 4ce2a6f5822..f5b943e36c6 100644 --- a/src/app/controllers/all.js +++ b/src/app/controllers/all.js @@ -1,5 +1,5 @@ define([ - './p_grafanaCtrl', + './pro/grafanaCtrl', './dashboardCtrl', './dashboardNavCtrl', './row', diff --git a/src/app/controllers/p_grafanaCtrl.js b/src/app/controllers/pro/grafanaCtrl.js similarity index 100% rename from src/app/controllers/p_grafanaCtrl.js rename to src/app/controllers/pro/grafanaCtrl.js diff --git a/src/app/controllers/p_loginCtrl.js b/src/app/controllers/pro/loginCtrl.js similarity index 100% rename from src/app/controllers/p_loginCtrl.js rename to src/app/controllers/pro/loginCtrl.js diff --git a/src/app/partials/pro/account.html b/src/app/partials/pro/account.html new file mode 100644 index 00000000000..177fd611136 --- /dev/null +++ b/src/app/partials/pro/account.html @@ -0,0 +1,73 @@ +
+
+
+ + + + + Account Settings + +
+
+
+ +
+ +
+
+ + Personal information +
+
+ +
+
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+ +
+ +
+
+ +
+ +
+
+ + Collaborators +
+
+ +
+
+
+
+ + + +
+
+
+
+
+ diff --git a/src/app/partials/pro/sidemenu.html b/src/app/partials/pro/sidemenu.html index dd3c728aa6e..182ee652b84 100644 --- a/src/app/partials/pro/sidemenu.html +++ b/src/app/partials/pro/sidemenu.html @@ -8,7 +8,7 @@
  • Logout
    • - + Dashboards @@ -28,7 +28,7 @@ Global options - + User accounts diff --git a/src/app/routes/p_admin.js b/src/app/routes/p_admin.js index 75bf5b27223..24817efc233 100644 --- a/src/app/routes/p_admin.js +++ b/src/app/routes/p_admin.js @@ -14,8 +14,34 @@ function (angular) { }); }); + module.config(function($routeProvider) { + $routeProvider + .when('/account', { + templateUrl: 'app/partials/pro/account.html', + controller : 'AccountCtrl', + }); + }); + module.controller('AdminCtrl', function() { }); + module.controller('AccountCtrl', function($scope, $http) { + + $scope.collaborator = {}; + + $scope.addCollaborator = function() { + if (!$scope.addCollaboratorForm.$valid) { + return; + } + + $http.post('/api/account/collaborators/add', $scope.collaborator).then(function(results) { + + }, function(err) { + + }); + }; + + }); + }); diff --git a/src/app/routes/p_login.js b/src/app/routes/p_login.js index 42b33e045f4..6a9512262a2 100644 --- a/src/app/routes/p_login.js +++ b/src/app/routes/p_login.js @@ -1,6 +1,6 @@ define([ 'angular', - '../controllers/p_loginCtrl', + '../controllers/pro/loginCtrl', ], function (angular) { "use strict"; @@ -19,13 +19,10 @@ function (angular) { }); }); - module.controller('RegisterCtrl', function($scope, $http, $location, $routeParams) { + module.controller('RegisterCtrl', function($scope, $http, $location) { $scope.loginModel = {}; $scope.grafana.sidemenu = false; - $scope.init = function() { - }; - $scope.register = function() { delete $scope.registerError; @@ -42,8 +39,6 @@ function (angular) { }); }; - $scope.init(); - }); }); From 77b0d36b554d4feaa1a91f49470e5409252e4700 Mon Sep 17 00:00:00 2001 From: Alexey Kirpichnikov Date: Thu, 18 Sep 2014 17:50:59 +0600 Subject: [PATCH 20/24] enable withCredentials in elasticsearch basic auth --- src/app/services/elasticsearch/es-datasource.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js index 80e3c5d0100..4f69df61f17 100644 --- a/src/app/services/elasticsearch/es-datasource.js +++ b/src/app/services/elasticsearch/es-datasource.js @@ -37,6 +37,7 @@ function (angular, _, config, kbn, moment) { }; if (this.basicAuth) { + options.withCredentials = true; options.headers = { "Authorization": "Basic " + this.basicAuth }; From a68a179c1ef6ef66c520261ad732db679a47d9e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Thu, 18 Sep 2014 15:07:49 +0200 Subject: [PATCH 21/24] Small improvements to dashboard alerts, less intrusive, do not push down page anymore, Closes #822 --- src/app/controllers/dashboardNavCtrl.js | 4 +-- src/css/less/bootswatch.light.less | 2 +- src/css/less/overrides.less | 37 +++++++++++++++++++++---- src/index.html | 17 ++++++++---- 4 files changed, 45 insertions(+), 15 deletions(-) diff --git a/src/app/controllers/dashboardNavCtrl.js b/src/app/controllers/dashboardNavCtrl.js index b6813b7ce19..76ef34f8e92 100644 --- a/src/app/controllers/dashboardNavCtrl.js +++ b/src/app/controllers/dashboardNavCtrl.js @@ -78,7 +78,7 @@ function (angular, _, moment, config, store) { var clone = angular.copy($scope.dashboard); $scope.db.saveDashboard(clone) .then(function(result) { - alertSrv.set('Dashboard Saved', 'Dashboard has been saved as "' + result.title + '"','success', 5000); + alertSrv.set('Dashboard Saved', 'Saved as "' + result.title + '"','success', 3000); if (result.url !== $location.path()) { $location.search({}); @@ -88,7 +88,7 @@ function (angular, _, moment, config, store) { $rootScope.$emit('dashboard-saved', $scope.dashboard); }, function(err) { - alertSrv.set('Save failed', err, 'error',5000); + alertSrv.set('Save failed', err, 'error', 5000); }); }; diff --git a/src/css/less/bootswatch.light.less b/src/css/less/bootswatch.light.less index 5675d605cbd..f4f573c58b0 100644 --- a/src/css/less/bootswatch.light.less +++ b/src/css/less/bootswatch.light.less @@ -59,6 +59,7 @@ a.text-success:hover { color: darken(@green, 10%); } } .brand { + padding: 0px 15px; &:hover { color: @navbarLinkColorHover; @@ -461,7 +462,6 @@ legend { // ----------------------------------------------------- .alert { - .border-radius(0); text-shadow: none; &-heading, h1, h2, h3, h4, h5, h6 { diff --git a/src/css/less/overrides.less b/src/css/less/overrides.less index 58e72ef43fa..957a56147dd 100644 --- a/src/css/less/overrides.less +++ b/src/css/less/overrides.less @@ -317,13 +317,38 @@ div.flot-text { color: @textColor !important; } -.dashboard-notice { +.page-alert-list { z-index:8000; - margin-left:0px; - padding:3px 0px 3px 0px; - width:100%; - padding-left:20px; - color: @white; + min-width: 300px; + max-width: 300px; + position: fixed; + right: 20px; + top: 56px; + + .alert { + color: @white; + padding-bottom: 13px; + position: relative; + } + + .alert-close { + position: absolute; + top: -4px; + right: -2px; + width: 19px; + height: 19px; + padding: 0; + background: @grayLighter; + border-radius: 50%; + border: none; + font-size: 1.1rem; + color: @grayDarker; + } + + .alert-title { + font-weight: bold; + padding-bottom: 2px; + } } diff --git a/src/index.html b/src/index.html index 1c99649d8b7..84e7787b83d 100644 --- a/src/index.html +++ b/src/index.html @@ -24,12 +24,17 @@ -
    - - {{alert.title}}
    {{$index + 1}} alert(s)
    -
    +
    +
    + +
    {{alert.title}}
    +
    +
    +
    -
    +
    - + From a97bcc3ca793c7c2bc6d06840f024156ba6e4942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Sep 2014 10:37:28 +0200 Subject: [PATCH 22/24] Elasticsearch: fix for issue when saving dashboard with title equal to slugified url, would cause the backward compatible fix to delete it, Closes #828 --- CHANGELOG.md | 1 + src/app/services/elasticsearch/es-datasource.js | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b525a62999..b7d233c8237 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource - [Issue #795](https://github.com/grafana/grafana/issues/795). Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode - [Issue #818](https://github.com/grafana/grafana/issues/818). Graph: Added percent y-axis format +- [Issue #828](https://github.com/grafana/grafana/issues/828). Elasticsearch: saving new dashboard with title equal to slugified url would cause it to deleted. # 1.8.0-RC1 (2014-09-12) diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js index 4f69df61f17..ab03c614a83 100644 --- a/src/app/services/elasticsearch/es-datasource.js +++ b/src/app/services/elasticsearch/es-datasource.js @@ -169,7 +169,7 @@ function (angular, _, config, kbn, moment) { return this._request('PUT', '/dashboard/' + id, this.index, data) .then(function(results) { - self._removeUnslugifiedDashboard(results, title); + self._removeUnslugifiedDashboard(results, title, id); return { title: title, url: '/dashboard/db/' + id }; }, function() { throw 'Failed to save to elasticsearch'; @@ -177,8 +177,9 @@ function (angular, _, config, kbn, moment) { } }; - ElasticDatasource.prototype._removeUnslugifiedDashboard = function(saveResult, title) { + ElasticDatasource.prototype._removeUnslugifiedDashboard = function(saveResult, title, id) { if (saveResult.statusText !== 'Created') { return; } + if (title === id) { return; } var self = this; this._get('/dashboard/' + title).then(function() { From 563dd898c1761b2aa80f559a6909da9e682119c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Sep 2014 12:16:00 +0200 Subject: [PATCH 23/24] Graph: fix for downscaling y-axis format, never downscale when value is zero, Fixes #826 --- src/app/components/kbn.js | 8 ++++---- src/app/directives/grafanaGraph.js | 5 +++++ src/test/specs/kbn-format-specs.js | 6 ++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/app/components/kbn.js b/src/app/components/kbn.js index 374d2f561b8..7c61b22c83b 100644 --- a/src/app/components/kbn.js +++ b/src/app/components/kbn.js @@ -567,8 +567,8 @@ function($, _, moment) { kbn.msFormat = function(size, decimals) { // Less than 1 milli, downscale to micro - if (Math.abs(size) < 1) { - return kbn.microsFormat(size * 1000,decimals); + if (size !== 0 && Math.abs(size) < 1) { + return kbn.microsFormat(size * 1000, decimals); } else if (Math.abs(size) < 1000) { return size.toFixed(decimals) + " ms"; @@ -595,7 +595,7 @@ function($, _, moment) { kbn.sFormat = function(size, decimals) { // Less than 1 sec, downscale to milli - if (Math.abs(size) < 1) { + if (size !== 0 && Math.abs(size) < 1) { return kbn.msFormat(size * 1000, decimals); } // Less than 10 min, use seconds @@ -624,7 +624,7 @@ function($, _, moment) { kbn.microsFormat = function(size, decimals) { // Less than 1 micro, downscale to nano - if (Math.abs(size) < 1) { + if (size !== 0 && Math.abs(size) < 1) { return kbn.nanosFormat(size * 1000, decimals); } else if (Math.abs(size) < 1000) { diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js index 15f1556aa62..ee6b0fb7dd7 100755 --- a/src/app/directives/grafanaGraph.js +++ b/src/app/directives/grafanaGraph.js @@ -110,6 +110,11 @@ function (angular, $, kbn, moment, _) { // Populate element var options = { + hooks: { + drawSeries: [function() { + console.log('drawSeries', arguments); + }] + }, legend: { show: false }, series: { stackpercent: panel.stack ? panel.percentage : false, diff --git a/src/test/specs/kbn-format-specs.js b/src/test/specs/kbn-format-specs.js index a44475556b0..85807c277ec 100644 --- a/src/test/specs/kbn-format-specs.js +++ b/src/test/specs/kbn-format-specs.js @@ -15,6 +15,12 @@ define([ expect(str).to.be('1.02 hour'); }); + it('should not downscale when value is zero', function() { + var str = kbn.msFormat(0, 2); + expect(str).to.be('0.00 ms'); + }); + + it('should translate 365445 as 6.09 min', function() { var str = kbn.msFormat(365445, 2); expect(str).to.be('6.09 min'); From c65b7d159189f81b0d87ecc5b64be3ffbe332393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Fri, 19 Sep 2014 17:36:52 +0200 Subject: [PATCH 24/24] updated --- src/app/routes/p_admin.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/routes/p_admin.js b/src/app/routes/p_admin.js index 24817efc233..be55872a437 100644 --- a/src/app/routes/p_admin.js +++ b/src/app/routes/p_admin.js @@ -26,7 +26,7 @@ function (angular) { }); - module.controller('AccountCtrl', function($scope, $http) { + module.controller('AccountCtrl', function($scope, $http, alertSrv) { $scope.collaborator = {}; @@ -35,10 +35,16 @@ function (angular) { return; } - $http.post('/api/account/collaborators/add', $scope.collaborator).then(function(results) { - + $http.post('/api/account/collaborators/add', $scope.collaborator).then(function() { + alertSrv.set('Collaborator added', '', 'success', 3000); }, function(err) { - + if (err.data && err.data.status) { + alertSrv.set('Could not add collaborator', err.data.status, 'warning', 10000); + } + else if (err.statusText) { + alertSrv.set('Could not add collaborator', err.data.status, 'warning', 10000); + } + console.log("value", err); }); };