Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Maarch
MaarchCourrier
Commits
27456807
Commit
27456807
authored
Oct 29, 2021
by
Hamza HRAMCHI
Browse files
FIX #18428 TIME 0:30 check if m2m password is already exists if xml config file
parent
9d05404a
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/app/configuration/controllers/ConfigurationController.php
View file @
27456807
...
...
@@ -367,9 +367,10 @@ class ConfigurationController
$path
=
$defaultPath
;
}
$xmlConfig
=
ReceiveMessageExchangeController
::
readXmlConfig
();
$communication
=
[];
$login
=
''
;
$password
=
''
;
$password
=
$xmlConfig
[
'm2m_password'
]
??
''
;
if
(
!
empty
(
$body
[
'communications'
][
'login'
]))
{
$login
=
$body
[
'communications'
][
'login'
];
}
...
...
src/frontend/app/administration/parameter/maarchToMaarch/maarch-to-maarch-parameters.component.ts
View file @
27456807
...
...
@@ -367,7 +367,7 @@ export class MaarchToMaarchParametersComponent implements OnInit {
this
.
http
.
put
(
'
../rest/m2m/configuration
'
,
{
configuration
:
this
.
formatConfiguration
()
}).
pipe
(
tap
(()
=>
{
this
.
notify
.
success
(
this
.
translate
.
instant
(
'
lang.dataUpdated
'
));
//
this.passwordAlreadyExists = this.functionsService.empty(this.communications['password'].value)
? false : true
;
this
.
passwordAlreadyExists
=
(
this
.
functionsService
.
empty
(
this
.
communications
[
'
password
'
].
value
)
&&
this
.
passwordAlreadyExists
)
||
(
!
this
.
functionsService
.
empty
(
this
.
communications
[
'
password
'
].
value
))
;
}),
catchError
((
err
:
any
)
=>
{
this
.
notify
.
handleErrors
(
err
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment