From c2f638934eb7610a3db091227c127090da07487c Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Mon, 12 Dec 2016 11:18:24 +0100
Subject: [PATCH] added info notice about operation's time of admin delete

---
 app/assets/javascripts/controllers/admin/members.coffee.erb | 6 +++---
 app/assets/templates/shared/confirm_modal.html.erb          | 2 +-
 config/locales/app.admin.en.yml                             | 1 +
 config/locales/app.admin.fr.yml                             | 1 +
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/controllers/admin/members.coffee.erb b/app/assets/javascripts/controllers/admin/members.coffee.erb
index 9c37206d8..55d79c0ec 100644
--- a/app/assets/javascripts/controllers/admin/members.coffee.erb
+++ b/app/assets/javascripts/controllers/admin/members.coffee.erb
@@ -105,8 +105,8 @@ class MembersController
 ##
 # Controller used in the members/groups management page
 ##
-Application.Controllers.controller "AdminMembersController", ["$scope", 'membersPromise', 'adminsPromise', 'growl', 'Admin', 'dialogs', '_t', 'Member', 'Export'
-, ($scope, membersPromise, adminsPromise, growl, Admin, dialogs, _t, Member, Export) ->
+Application.Controllers.controller "AdminMembersController", ["$scope","$sce", 'membersPromise', 'adminsPromise', 'growl', 'Admin', 'dialogs', '_t', 'Member', 'Export'
+, ($scope, $sce, membersPromise, adminsPromise, growl, Admin, dialogs, _t, Member, Export) ->
 
 
 
@@ -177,7 +177,7 @@ Application.Controllers.controller "AdminMembersController", ["$scope", 'members
       resolve:
         object: ->
           title: _t('confirmation_required')
-          msg: _t('do_you_really_want_to_delete_this_administrator_this_cannot_be_undone')
+          msg: $sce.trustAsHtml(_t('do_you_really_want_to_delete_this_administrator_this_cannot_be_undone') + '<br/><br/>' +_t('this_may_take_a_while_please_wait'))
     , -> # cancel confirmed
       Admin.delete id: admin.id, ->
         admins.splice(findAdminIdxById(admins, admin.id), 1)
diff --git a/app/assets/templates/shared/confirm_modal.html.erb b/app/assets/templates/shared/confirm_modal.html.erb
index 250bb78c1..b32db0943 100644
--- a/app/assets/templates/shared/confirm_modal.html.erb
+++ b/app/assets/templates/shared/confirm_modal.html.erb
@@ -3,7 +3,7 @@
   <h1>{{object.title}}</h1>
 </div>
 <div class="modal-body">
-  <p>{{object.msg}}</p>
+  <p ng-bind-html="object.msg"></p>
 </div>
 <div class="modal-footer">
   <button class="btn btn-info" ng-click="ok()" translate>{{ 'confirm' }}</button>
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml
index bb0d52ad7..53237b8c3 100644
--- a/config/locales/app.admin.en.yml
+++ b/config/locales/app.admin.en.yml
@@ -336,6 +336,7 @@ en:
         groups: "Groups"
         authentication: "Authentication"
         do_you_really_want_to_delete_this_administrator_this_cannot_be_undone: "Do you really want to delete this administrator? This cannot be undone."
+        this_may_take_a_while_please_wait: "Warning: this may take a while, please be patient."
         administrator_successfully_deleted: "Administrator successfully deleted."
         unable_to_delete_the_administrator: "Unable to delete the administrator."
         add_a_group: "Add a group"
diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml
index 510652ebc..8926a4cb7 100644
--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@@ -336,6 +336,7 @@ fr:
         groups: "Groupes"
         authentication: "Authentification"
         do_you_really_want_to_delete_this_administrator_this_cannot_be_undone: "Êtes-vous sûr de vouloir supprimer cet administrateur ? Cette opération est irréversible."
+        this_may_take_a_while_please_wait: "Attention : ceci peut prendre un certain temps, merci de patienter."
         administrator_successfully_deleted: "L'administrateur a bien été supprimé."
         unable_to_delete_the_administrator: "L'administrateur n'a pas pu être supprimé."
         add_a_group: "Ajouter un groupe"