Skip to content

Commit 329d23d

Browse files
Merge pull request #2076 from betagouv/hotfix/redirect-recos
Redirige les liens de l'ancien url de recos
2 parents 010fce5 + 45d30dd commit 329d23d

3 files changed

Lines changed: 15 additions & 0 deletions

File tree

recoco/apps/projects/tests/test_projects.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,7 @@ def test_project_knowledge_allows_empty_questionset(request, client, project):
374374

375375
# actions
376376
@pytest.mark.django_db
377+
@pytest.mark.skip
377378
def test_project_actions_not_available_for_non_switchtender(request, client):
378379
project = Recipe(models.Project, sites=[get_current_site(request)]).make()
379380
url = reverse("projects-project-detail-actions", args=[project.id])
@@ -383,6 +384,7 @@ def test_project_actions_not_available_for_non_switchtender(request, client):
383384

384385

385386
@pytest.mark.django_db
387+
@pytest.mark.skip
386388
def test_project_actions_available_for_owner(request, client, project):
387389
with login(client) as user:
388390
utils.assign_collaborator(user, project)
@@ -392,6 +394,7 @@ def test_project_actions_available_for_owner(request, client, project):
392394

393395

394396
@pytest.mark.django_db
397+
@pytest.mark.skip
395398
def test_project_actions_available_for_switchtender(request, client, project):
396399
site = get_current_site(request)
397400
url = reverse("projects-project-detail-actions", args=[project.id])
@@ -402,6 +405,7 @@ def test_project_actions_available_for_switchtender(request, client, project):
402405

403406

404407
@pytest.mark.django_db
408+
@pytest.mark.skip
405409
def test_project_actions_available_for_restricted_switchtender(
406410
request, client, make_project
407411
):
@@ -420,6 +424,7 @@ def test_project_actions_available_for_restricted_switchtender(
420424

421425

422426
@pytest.mark.django_db
427+
@pytest.mark.skip
423428
def test_project_actions_with_has_ds_resource(request, client, project):
424429
site = get_current_site(request)
425430
resource = Recipe(

recoco/apps/projects/views/detail.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,12 @@ def project_knowledge(request, project_id=None):
205205
def project_actions(request, project_id=None):
206206
"""Action page for given project"""
207207

208+
# we test to remove this part so we keep the code but redirect to new interface
209+
url = (
210+
reverse("projects-project-detail-conversations", args=[project_id]) + "#actions"
211+
)
212+
return redirect(url)
213+
208214
project = get_object_or_404(
209215
models.Project.objects.filter(sites=request.site)
210216
.with_unread_notifications(user_id=request.user.id)

recoco/apps/tasks/views/tasks.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ def visit_task(request, task_id):
164164
if task.resource:
165165
return redirect(reverse("resources-resource-detail", args=[task.resource.pk]))
166166

167+
url = f"{reverse('projects-project-detail-conversations', args=[task.project_id])}#action-{task.pk}"
168+
return redirect(url)
169+
170+
# clean that if we actually remove the action tab in project
167171
return redirect(reverse("projects-project-detail-actions", args=[task.project_id]))
168172

169173

0 commit comments

Comments
 (0)