diff --git a/app/frontend/src/javascript/controllers/admin/members.js b/app/frontend/src/javascript/controllers/admin/members.js index 9cc5e6adc..860cb71aa 100644 --- a/app/frontend/src/javascript/controllers/admin/members.js +++ b/app/frontend/src/javascript/controllers/admin/members.js @@ -165,9 +165,6 @@ Application.Controllers.controller('AdminMembersController', ['$scope', '$sce', if ($scope.enableUserValidationRequired) { $scope.member.memberFilters.push('not_validated'); } - // should we display the username in the list? - $scope.displayUsername = (settingsPromise.show_username_in_admin_list === 'true'); - // Admins ordering/sorting. Default: not sorted $scope.orderAdmin = null; diff --git a/app/frontend/src/javascript/models/setting.ts b/app/frontend/src/javascript/models/setting.ts index ae114d96c..926c51d1a 100644 --- a/app/frontend/src/javascript/models/setting.ts +++ b/app/frontend/src/javascript/models/setting.ts @@ -219,8 +219,7 @@ export const registrationSettings = [ ] as const; export const adminSettings = [ - 'feature_tour_display', - 'show_username_in_admin_list' + 'feature_tour_display' ] as const; export const pricingSettings = [ diff --git a/app/frontend/src/javascript/router.js b/app/frontend/src/javascript/router.js index 2005f7bb2..74d83f59e 100644 --- a/app/frontend/src/javascript/router.js +++ b/app/frontend/src/javascript/router.js @@ -1037,7 +1037,7 @@ angular.module('application.router', ['ui.router']) groupsPromise: ['Group', function (Group) { return Group.query().$promise; }], tagsPromise: ['Tag', function (Tag) { return Tag.query().$promise; }], authProvidersPromise: ['AuthProvider', function (AuthProvider) { return AuthProvider.query().$promise; }], - settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['feature_tour_display', 'user_validation_required', 'show_username_in_admin_list']" }).$promise; }] + settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['feature_tour_display', 'user_validation_required']" }).$promise; }] } }) .state('app.admin.members_new', { @@ -1198,7 +1198,7 @@ angular.module('application.router', ['ui.router']) "'link_name', 'home_content', 'home_css', 'phone_required', 'upcoming_events_shown', 'public_agenda_module'," + "'renew_pack_threshold', 'pack_only_for_subscription', 'overlapping_categories', 'public_registrations'," + "'extended_prices_in_same_day', 'recaptcha_site_key', 'recaptcha_secret_key', 'user_validation_required', " + - "'user_validation_required_list', 'machines_module', 'user_change_group', 'show_username_in_admin_list', " + + "'user_validation_required_list', 'machines_module', 'user_change_group', " + "'store_module', 'machine_reservation_deadline', 'training_reservation_deadline', 'event_reservation_deadline', " + "'space_reservation_deadline', 'reservation_context_feature']" }).$promise; diff --git a/app/frontend/templates/admin/settings/compte.html b/app/frontend/templates/admin/settings/compte.html index 241196c69..44f0f14a9 100644 --- a/app/frontend/templates/admin/settings/compte.html +++ b/app/frontend/templates/admin/settings/compte.html @@ -105,28 +105,6 @@ -
-
- {{ 'app.admin.settings.accounts_management' }} -
-
-
-

{{ 'app.admin.settings.members_list' }}

-

- {{ 'app.admin.settings.members_list_info' }} -

-
- - -
-
-
-
-
{{ 'app.admin.settings.account.customize_account_settings' }} diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index c82f0f62c..da4c92808 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -166,7 +166,6 @@ module SettingsHelper user_change_group user_validation_required user_validation_required_list - show_username_in_admin_list family_account child_validation_required store_module diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml index 7f3efc37c..67341f678 100644 --- a/config/locales/app.admin.en.yml +++ b/config/locales/app.admin.en.yml @@ -1859,7 +1859,6 @@ en: extended_prices_info_html: "Spaces can have different prices depending on the cumulated duration of the booking. You can choose if this apply to all bookings or only to those starting within the same day." extended_prices_in_same_day: "Extended prices in the same day" public_registrations: "Public registrations" - show_username_in_admin_list: "Show the username in the list" projects_list_member_filter_presence: "Presence of member filter on projects list" projects_list_date_filters_presence: "Presence of date filters on projects list" project_categories_filter_placeholder: "Placeholder for categories filter in project gallery" diff --git a/config/locales/en.yml b/config/locales/en.yml index 625dcfff9..cc3437fe5 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -721,7 +721,6 @@ en: flickr: "flickr" machines_module: "Machines module" user_change_group: "Allow users to change their group" - show_username_in_admin_list: "Show the username in the admin's members list" store_module: "Store module" store_withdrawal_instructions: "Withdrawal instructions" store_hidden: "Store hidden to the public" diff --git a/db/seeds/settings.rb b/db/seeds/settings.rb index 7962b9194..fcfb09328 100644 --- a/db/seeds/settings.rb +++ b/db/seeds/settings.rb @@ -686,8 +686,6 @@ end Setting.set('extended_prices_in_same_day', false) unless Setting.find_by(name: 'extended_prices_in_same_day').try(:value) -Setting.set('show_username_in_admin_list', false) unless Setting.find_by(name: 'show_username_in_admin_list').try(:value) - Setting.set('store_module', false) unless Setting.find_by(name: 'store_module').try(:value) Setting.set('store_hidden', true) unless Setting.find_by(name: 'store_hidden').try(:value) diff --git a/test/frontend/__fixtures__/settings.ts b/test/frontend/__fixtures__/settings.ts index c43dcf0be..407218cfa 100644 --- a/test/frontend/__fixtures__/settings.ts +++ b/test/frontend/__fixtures__/settings.ts @@ -508,12 +508,6 @@ export const settings: Array = [ last_update: '2022-11-28T16:01:00+0200', localized: 'Adresse requise' }, - { - name: 'show_username_in_admin_list', - value: 'false', - last_update: '2022-11-21T15:20:03+0100', - localized: "Afficher le nom d'utilisateur dans la liste des membres de l'administrateur" - }, { name: 'store_module', value: 'true',