rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-21 15:54:22 +01:00
Code Issues Releases Activity

added info notice about operation's time of admin delete

Browse Source
This commit is contained in:
Sylvain 2016-12-12 11:18:24 +01:00
parent db8cf69771
commit c2f638934e
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/controllers/admin/members.coffee.erb
View File

@ -105,8 +105,8 @@ class MembersController
## ##
# Controller used in the members/groups management page # Controller used in the members/groups management page
## ##
Application.Controllers.controller "AdminMembersController", ["$scope", 'membersPromise', 'adminsPromise', 'growl', 'Admin', 'dialogs', '_t', 'Member', 'Export' Application.Controllers.controller "AdminMembersController", ["$scope","$sce", 'membersPromise', 'adminsPromise', 'growl', 'Admin', 'dialogs', '_t', 'Member', 'Export'
, ($scope, 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: resolve:
object: -> object: ->
title: _t('confirmation_required') 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 , -> # cancel confirmed
Admin.delete id: admin.id, -> Admin.delete id: admin.id, ->
admins.splice(findAdminIdxById(admins, admin.id), 1) admins.splice(findAdminIdxById(admins, admin.id), 1)

2
app/assets/templates/shared/confirm_modal.html.erb
View File

@ -3,7 +3,7 @@
<h1>{{object.title}}</h1> <h1>{{object.title}}</h1>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>{{object.msg}}</p> <p ng-bind-html="object.msg"></p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-info" ng-click="ok()" translate>{{ 'confirm' }}</button> <button class="btn btn-info" ng-click="ok()" translate>{{ 'confirm' }}</button>

1
config/locales/app.admin.en.yml
View File

@ -336,6 +336,7 @@ en:
groups: "Groups" groups: "Groups"
authentication: "Authentication" 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." 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." administrator_successfully_deleted: "Administrator successfully deleted."
unable_to_delete_the_administrator: "Unable to delete the administrator." unable_to_delete_the_administrator: "Unable to delete the administrator."
add_a_group: "Add a group" add_a_group: "Add a group"

1
config/locales/app.admin.fr.yml
View File

@ -336,6 +336,7 @@ fr:
groups: "Groupes" groups: "Groupes"
authentication: "Authentification" 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." 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é." administrator_successfully_deleted: "L'administrateur a bien été supprimé."
unable_to_delete_the_administrator: "L'administrateur n'a pas pu être supprimé." unable_to_delete_the_administrator: "L'administrateur n'a pas pu être supprimé."
add_a_group: "Ajouter un groupe" add_a_group: "Ajouter un groupe"