mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-20 14:54:15 +01:00
(bug) fix minor eslint issues + rebasing issue
This commit is contained in:
parent
51960782ee
commit
fc2169980f
@ -30,6 +30,7 @@ export const Oauth2Form = <TFieldValues extends FieldValues>({ register, strateg
|
||||
return (
|
||||
<div className="oauth2-form">
|
||||
<hr/>
|
||||
<FabOutputCopy text={buildCallbackUrl()} label={t('app.admin.authentication.oauth2_form.authorization_callback_url')} />
|
||||
<FormInput id="providable_attributes.base_url"
|
||||
register={register}
|
||||
placeholder="https://sso.example.net..."
|
||||
|
@ -1197,7 +1197,7 @@ Application.Controllers.controller('AvoirModalController', ['$scope', '$uibModal
|
||||
{ name: _t('app.admin.invoices.none'), value: 'none' },
|
||||
{ name: _t('app.admin.invoices.by_cash'), value: 'cash' },
|
||||
{ name: _t('app.admin.invoices.by_cheque'), value: 'cheque' },
|
||||
{ name: _t('app.admin.invoices.by_transfer'), value: 'transfer' },
|
||||
{ name: _t('app.admin.invoices.by_transfer'), value: 'transfer' }
|
||||
];
|
||||
|
||||
if (Fablab.walletModule) {
|
||||
|
@ -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; }]
|
||||
}
|
||||
})
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user