Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Fiat Tux
Hat softwares
Lutim
Commits
a7bb73b1
Commit
a7bb73b1
authored
Mar 19, 2018
by
Luc Didry
Browse files
Merge branch 'development' into 'development'
suite de luc/lutim!26 See merge request luc/lutim!33
parents
bb097294
dc371daf
Pipeline
#43329
passed with stages
in 5 minutes and 53 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
themes/default/templates/partial/for_my_delay.html.ep
View file @
a7bb73b1
% # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
% my @delays = split(',', $self->config('proposed_delays'));
% for my $delay (@delays) {
% my $text = (
$delay == 7 || $delay == 30) ? l('%1 days',
$delay
)
:
$d->{'delay_'.
$delay
}
;
% my $text = (
defined($d->{'delay_'.$delay})) ? $d->{'delay_'.
$delay
}
:
l('%1 days',
$delay
)
;
% if (config('max_delay')) {
% if ($delay) {
% if ($delay
<
config
('
max_delay
'))
{
...
...
themes/default/templates/partial/lutim.js.ep
View file @
a7bb73b1
...
...
@@ -139,7 +139,7 @@ function buildMessage(success, msg) {
'
<select id="day-
'
,
msg
.
real_short
,
'
" name="delete-day" class="form-control">
'
,
%
my
@
delays
=
split
(
'
,
'
,
$self
->
config
(
'
proposed_delays
'
));
%
for
my
$delay
(@
delays
)
{
%
my
$text
=
(
$delay
==
7
||
$delay
==
30
)
?
l
(
'
%1 days
'
,
$delay
)
:
$d
->
{
'
delay_
'
.
$delay
}
;
%
my
$text
=
(
defined
(
$d
->
{
'
delay_
'
.
$delay
}))
?
$d
->
{
'
delay_
'
.
$delay
}
:
l
(
'
%1 days
'
,
$delay
)
;
%
if
(
config
(
'
max_delay
'
))
{
%
if
(
$delay
)
{
%
if
(
$delay
<
config
(
'
max_delay
'
))
{
...
...
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