Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
LemonLDAP NG
lemonldap-ng
Commits
39b8e96f
Commit
39b8e96f
authored
Dec 30, 2018
by
Christophe Maudoux
🐛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve Manager messages display
parent
54114a4a
Pipeline
#3831
passed with stages
in 10 minutes and 44 seconds
Changes
4
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
31 additions
and
14 deletions
+31
-14
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
+11
-6
lemonldap-ng-manager/site/coffee/manager.coffee
lemonldap-ng-manager/site/coffee/manager.coffee
+8
-3
lemonldap-ng-manager/site/htdocs/static/js/manager.js
lemonldap-ng-manager/site/htdocs/static/js/manager.js
+11
-4
lemonldap-ng-manager/site/htdocs/static/js/manager.min.js
lemonldap-ng-manager/site/htdocs/static/js/manager.min.js
+1
-1
No files found.
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf.pm
View file @
39b8e96f
...
...
@@ -232,13 +232,18 @@ sub newConf {
# "message" fields: note that words enclosed by "__" (__word__) will be
# translated
$res
->
{
message
}
=
$parser
->
{
message
};
foreach
my
$t
(
qw(errors warnings changes)
)
{
$res
->
{
details
}
->
{
'
__
'
.
$t
.
'
__
'
}
=
$parser
->
$t
if
(
@
{
$parser
->
$t
}
);
$res
->
{
details
}
->
{'
__errors__
'}
=
$parser
->
{
errors
}
if
(
@
{
$parser
->
{
errors
}
}
);
unless
(
@
{
$parser
->
{
errors
}
}
)
{
$res
->
{
details
}
->
{'
__needConfirmation__
'}
=
$parser
->
{
needConfirmation
}
if
(
@
{
$parser
->
{
needConfirmation
}
}
&&
!
$req
->
params
('
force
')
);
$res
->
{
message
}
=
$parser
->
{
message
};
foreach
my
$t
(
qw(warnings changes)
)
{
$res
->
{
details
}
->
{
'
__
'
.
$t
.
'
__
'
}
=
$parser
->
$t
if
(
@
{
$parser
->
$t
}
);
}
}
$res
->
{
details
}
->
{'
__needConfirmation__
'}
=
$parser
->
{
needConfirmation
}
if
(
@
{
$parser
->
{
needConfirmation
}
}
&&
!
$req
->
params
('
force
')
);
if
(
$res
->
{
result
}
)
{
if
(
$self
->
{
demoMode
}
)
{
$res
->
{
message
}
=
'
__demoModeOn__
';
...
...
lemonldap-ng-manager/site/coffee/manager.coffee
View file @
39b8e96f
...
...
@@ -148,9 +148,14 @@ llapp.controller 'TreeCtrl', [
$scope
.
message
.
message
=
data
.
message
if
data
.
message
if
data
.
details
for
m
of
data
.
details
when
m
!=
'__changes__'
$scope
.
message
.
items
.
push
message
:
m
items
:
data
.
details
[
m
]
if
m
==
'__needConfirmation__'
$scope
.
message
.
items
.
unshift
message
:
m
items
:
data
.
details
[
m
]
else
$scope
.
message
.
items
.
push
message
:
m
items
:
data
.
details
[
m
]
$scope
.
waiting
=
false
if
data
.
result
==
1
# Force reloading page
...
...
lemonldap-ng-manager/site/htdocs/static/js/manager.js
View file @
39b8e96f
...
...
@@ -179,10 +179,17 @@ This file contains:
if
(
data
.
details
)
{
for
(
m
in
data
.
details
)
{
if
(
m
!==
'
__changes__
'
)
{
$scope
.
message
.
items
.
push
({
message
:
m
,
items
:
data
.
details
[
m
]
});
if
(
m
===
'
__needConfirmation__
'
)
{
$scope
.
message
.
items
.
unshift
({
message
:
m
,
items
:
data
.
details
[
m
]
});
}
else
{
$scope
.
message
.
items
.
push
({
message
:
m
,
items
:
data
.
details
[
m
]
});
}
}
}
}
...
...
lemonldap-ng-manager/site/htdocs/static/js/manager.min.js
View file @
39b8e96f
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
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