Valogeo/loko
Valogeo/loko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(calendar): fix team daily members URL generation to avoid duplicate members path

Browse source
This commit is contained in:
kdeterme 2026-09-11 13:45:42 +02:00
parent d45feb9f6e
commit fdc315788f
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
loko/interventions/static/interventions/calendar/interventions_calendar.js
View file

@ -5328,8 +5328,15 @@ function loadTeamDailyMembersModalData(teamId, dateStr) {
const addSection = document.getElementById('team-daily-add-section'); const addSection = document.getElementById('team-daily-add-section');
const candidateSelect = document.getElementById('team-daily-candidate-select'); const candidateSelect = document.getElementById('team-daily-candidate-select');
const baseUrl = typeof teamDailyMembersBaseUrl !== 'undefined' ? teamDailyMembersBaseUrl : '/interventions/calendar/team/'; let url;
const url = `${baseUrl}${teamId}/members/?date=${encodeURIComponent(dateStr)}`; if (typeof teamDailyMembersUrlPattern !== 'undefined') {
url = teamDailyMembersUrlPattern.replace('/0/', `/${teamId}/`) + `?date=${encodeURIComponent(dateStr)}`;
} else if (typeof teamDailyMembersBaseUrl !== 'undefined') {
const base = teamDailyMembersBaseUrl.replace(/\/members\/?$/, '/');
url = `${base.replace(/\/+$/, '')}/${teamId}/members/?date=${encodeURIComponent(dateStr)}`;
} else {
url = `/interventions/calendar/team/${teamId}/members/?date=${encodeURIComponent(dateStr)}`;
}
fetch(url, { fetch(url, {
headers: { 'X-Requested-With': 'XMLHttpRequest' } headers: { 'X-Requested-With': 'XMLHttpRequest' }

3
loko/interventions/templates/interventions/interventions_calendar.html
View file

@ -843,7 +843,8 @@
const saveCalendarPreferencesUrl = "{% url 'common:save_calendar_preferences' %}"; const saveCalendarPreferencesUrl = "{% url 'common:save_calendar_preferences' %}";
const canViewMemberHistory = {{ can_view_member_history|yesno:"true,false" }}; const canViewMemberHistory = {{ can_view_member_history|yesno:"true,false" }};
const canEditTeams = {{ can_edit_teams|yesno:"true,false" }}; const canEditTeams = {{ can_edit_teams|yesno:"true,false" }};
const teamDailyMembersBaseUrl = "{% url 'interventions:team_daily_members_ajax' 0 %}".replace('/0/', '/'); const teamDailyMembersUrlPattern = "{% url 'interventions:team_daily_members_ajax' 0 %}";
const teamDailyMembersBaseUrl = teamDailyMembersUrlPattern.replace('/0/members/', '/');
const teamPlanningAssignUrl = "{% url 'contracts:team_planning_assign_member_ajax' %}"; const teamPlanningAssignUrl = "{% url 'contracts:team_planning_assign_member_ajax' %}";
</script> </script>
<script src="{% url 'javascript-catalog' %}"></script> <script src="{% url 'javascript-catalog' %}"></script>