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

merge

Browse Source
This commit is contained in:
vincent 2022-04-01 17:48:32 +02:00 committed by Sylvain
parent d301053770
commit 4c6942eba4
5 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/frontend/src/javascript/components/base/rhf-input.tsx
View File

@ -1,5 +1,6 @@
import React, { ReactNode } from 'react';
import { FieldErrors, UseFormRegister, Validate } from 'react-hook-form';
import { FieldValues } from 'react-hook-form/dist/types/fields';
type inputType = string|number|readonly string [];
type ruleTypes = {
@ -9,12 +10,12 @@ type ruleTypes = {
maxLenght?: number,
min?: number,
max?: number,
validate?: Validate<any>;
validate?: Validate<FieldValues>;
};
interface RHFInputProps {
id: string,
register: UseFormRegister<any>,
register: UseFormRegister<FieldValues>,
label?: string,
tooltip?: string,
defaultValue?: inputType,

2
app/frontend/src/javascript/router.js
View File

@ -1014,7 +1014,7 @@ angular.module('application.router', ['ui.router'])
}
},
resolve: {
providerPromise: ['AuthProvider', '$transition$', function (AuthProvider, $transition$) { return AuthProvider.get({ id: $transition$.params().id }).$promise; }]
providerPromise: ['AuthProvider', '$transition$', function (AuthProvider, $transition$) { return AuthProvider.get({ id: $transition$.params().id }).$promise; }],
}
})

1
app/views/api/auth_providers/show.json.jbuilder
View File

@ -17,3 +17,4 @@ if @provider.providable_type == OpenIdConnectProvider.name
:client__token_endpoint, :client__userinfo_endpoint, :client__jwks_uri, :client__end_session_endpoint, :profile_url
end
end

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

@ -1157,6 +1157,9 @@ en:
#edit an authentication provider (SSO)
authentication_edit:
provider: "Provider:"
it_is_required_to_set_the_matching_between_User.uid_and_the_API_to_add_this_provider: "It is required to set the matching between User.uid and the API to add this provider."
provider_successfully_updated: "Provider successfully updated."
an_error_occurred_unable_to_update_the_provider: "An error occurred: unable to update the provider."
#statistics tables
statistics:
statistics: "Statistics"

1
db/schema.rb
View File

@ -512,6 +512,7 @@ ActiveRecord::Schema.define(version: 2022_03_28_145017) do
t.integer "weight"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.text "description"
end
create_table "plans", id: :serial, force: :cascade do |t|