From 7ff46db808be25e96dcee0810ec05bd529096d49 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 13 Jun 2017 19:26:32 +0200 Subject: [PATCH] [bug] confirmation message after admin creation --- .fabmanager-version | 2 +- CHANGELOG.md | 3 +++ Gemfile.lock | 2 +- app/assets/javascripts/controllers/admin/members.coffee.erb | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.fabmanager-version b/.fabmanager-version index 35d16fb1a..93a092fd1 100644 --- a/.fabmanager-version +++ b/.fabmanager-version @@ -1 +1 @@ -2.5.7 +2.5.8-dev diff --git a/CHANGELOG.md b/CHANGELOG.md index bc5b9885b..c22785cb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog Fab Manager +## next release + +- Fix a bug: confirmation message not shown after admin creation - add task `rake fablab:get_incoherent_invoice` allow find the invoices incoherent ## v2.5.7 2017 June 8 diff --git a/Gemfile.lock b/Gemfile.lock index 8a8a07a2e..5e252f9a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -563,4 +563,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.13.1 + 1.13.6 diff --git a/app/assets/javascripts/controllers/admin/members.coffee.erb b/app/assets/javascripts/controllers/admin/members.coffee.erb index 6e0d2f016..79d4ea3fe 100644 --- a/app/assets/javascripts/controllers/admin/members.coffee.erb +++ b/app/assets/javascripts/controllers/admin/members.coffee.erb @@ -555,7 +555,7 @@ Application.Controllers.controller "NewMemberController", ["$scope", "$state", " ## # Controller used in the admin's creation page (admin view) ## -Application.Controllers.controller 'NewAdminController', ['$state', '$scope', 'Admin', 'growl', ($state, $scope, Admin, growl)-> +Application.Controllers.controller 'NewAdminController', ['$state', '$scope', 'Admin', 'growl', '_t', ($state, $scope, Admin, growl, _t)-> ## default admin profile $scope.admin =