Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
third-party
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cooperatic-foodcoops
third-party
Commits
523a4803
Commit
523a4803
authored
Nov 03, 2022
by
François C.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix #3859 bug (shift template listener if weeks filter triggered
parent
c984b632
Pipeline
#2481
passed with stage
in 1 minute 24 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
common.js
outils/static/js/common.js
+5
-2
base.html
templates/base.html
+1
-1
inscriptions.html
templates/members/inscriptions.html
+1
-0
No files found.
outils/static/js/common.js
View file @
523a4803
...
@@ -21,6 +21,7 @@ var volant = null;
...
@@ -21,6 +21,7 @@ var volant = null;
function
get_displayed_weeks
()
{
function
get_displayed_weeks
()
{
displayed_weeks
=
[];
displayed_weeks
=
[];
$
(
'#week_types'
).
find
(
'.selected_weeks :checked'
).
each
(
function
()
{
$
(
'#week_types'
).
find
(
'.selected_weeks :checked'
).
each
(
function
()
{
...
@@ -227,6 +228,8 @@ function draw_shift_templates(params) {
...
@@ -227,6 +228,8 @@ function draw_shift_templates(params) {
});
});
draw_table
(
begin_hours
,
function
()
{
draw_table
(
begin_hours
,
function
()
{
const
is_inscription_page
=
$
(
'body'
).
hasClass
(
'inscriptions'
);
$
.
each
(
shift_templates
,
function
(
i
,
e
)
{
$
.
each
(
shift_templates
,
function
(
i
,
e
)
{
if
(
e
.
data
)
{
if
(
e
.
data
)
{
var
keep_it
=
false
;
var
keep_it
=
false
;
...
@@ -294,7 +297,7 @@ function draw_shift_templates(params) {
...
@@ -294,7 +297,7 @@ function draw_shift_templates(params) {
});
});
if
(
type
==
1
)
{
if
(
type
==
1
)
{
if
(
!
params
||
(
typeof
params
.
shift_listener
!==
"undefined"
&&
params
.
shift_listener
==
true
)){
if
(
!
params
||
(
typeof
params
.
shift_listener
!==
"undefined"
&&
params
.
shift_listener
==
true
)
||
is_inscription_page
==
true
){
shift_table
.
find
(
'.shift'
).
on
(
"click"
,
single_shift_click
);
shift_table
.
find
(
'.shift'
).
on
(
"click"
,
single_shift_click
);
}
}
}
}
...
@@ -320,7 +323,7 @@ function draw_shift_templates(params) {
...
@@ -320,7 +323,7 @@ function draw_shift_templates(params) {
}
}
}
}
if
(
!
params
||
(
typeof
params
.
shift_listener
!==
"undefined"
&&
params
.
shift_listener
==
true
)){
if
(
!
params
||
(
typeof
params
.
shift_listener
!==
"undefined"
&&
params
.
shift_listener
==
true
)
||
is_inscription_page
==
true
){
shift_table
.
find
(
'.shift'
).
on
(
"click"
,
select_shift_among_compact
);
shift_table
.
find
(
'.shift'
).
on
(
"click"
,
select_shift_among_compact
);
}
}
}
}
...
...
templates/base.html
View file @
523a4803
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
<script
src=
"{% static "
js
/
modernizr-custom
.
min
.
js
"
%}"
></script>
<script
src=
"{% static "
js
/
modernizr-custom
.
min
.
js
"
%}"
></script>
{% block additionnal_scripts %}{% endblock %}
{% block additionnal_scripts %}{% endblock %}
</head>
</head>
<body>
<body
class=
"{% block body_class %}nospecific{% endblock %}"
>
{% block menu %}{% endblock %}
{% block menu %}{% endblock %}
<!-- The overlay -->
<!-- The overlay -->
<div
id=
"modal"
class=
"overlay"
>
<div
id=
"modal"
class=
"overlay"
>
...
...
templates/members/inscriptions.html
View file @
523a4803
{% extends "members/base.html" %}
{% extends "members/base.html" %}
{% block body_class %}inscriptions{% endblock %}
{% load static %}
{% load static %}
{% block additionnal_css %}
{% block additionnal_css %}
<link
rel=
"stylesheet"
href=
"{% static "
css
/
inscriptions
.
css
"
%}?
v=
1651853225"
>
<link
rel=
"stylesheet"
href=
"{% static "
css
/
inscriptions
.
css
"
%}?
v=
1651853225"
>
...
...
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