mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2024-11-28 09:24:24 +01:00
Merge branch 'cleanup' into 'dev'
(quality) Cleanup unused feature See merge request projets/fab-manager!20
This commit is contained in:
commit
33a2da6275
@ -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;
|
||||
|
||||
|
@ -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 = [
|
||||
|
@ -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;
|
||||
|
@ -105,28 +105,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel panel-default m-t-md">
|
||||
<div class="panel-heading">
|
||||
<span class="font-sbold" translate>{{ 'app.admin.settings.accounts_management' }}</span>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="row">
|
||||
<h3 class="m-l" translate>{{ 'app.admin.settings.members_list' }}</h3>
|
||||
<p class="alert alert-warning m-h-md" translate>
|
||||
{{ 'app.admin.settings.members_list_info' }}
|
||||
</p>
|
||||
<div class="col-md-10 col-md-offset-1">
|
||||
<boolean-setting name="'show_username_in_admin_list'"
|
||||
settings="allSettings"
|
||||
label="'app.admin.settings.show_username_in_admin_list' | translate"
|
||||
on-success="onSuccess"
|
||||
on-error="onError">
|
||||
</boolean-setting>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel panel-default m-t-md">
|
||||
<div class="panel-heading">
|
||||
<span class="font-sbold" translate>{{ 'app.admin.settings.account.customize_account_settings' }}</span>
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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)
|
||||
|
@ -508,12 +508,6 @@ export const settings: Array<Setting> = [
|
||||
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',
|
||||
|
Loading…
Reference in New Issue
Block a user