factorisation ajax et standard

main/templates/sprint_end.html

@@ -93,7 +93,7 @@
 				
 	            $.ajax({
 	                type: "POST",
-	                url: "/stories/axclose/" + story_id + "/",
+	                url: "/stories/close/" + story_id + "/",
 	                data: '{story_id:' + story_id + '}',
 	                contentType: "application/json; charset=utf-8",
 	                dataType: "json",
@@ -122,7 +122,7 @@
 				
 	            $.ajax({
 	                type: "POST",
-	                url: "/stories/axreaffect/" + story_id + "/",
+	                url: "/stories/reaffect/" + story_id + "/",
 	                data: '{story_id:' + story_id + '}',
 	                contentType: "application/json; charset=utf-8",
 	                dataType: "json",

main/urls.py

@@ -23,8 +23,7 @@ urlpatterns = [
     path('stories/delete/<int:story_id>/', views.story_delete, name='story_delete'),
     path('stories/close/<int:story_id>/', views.story_close, name='story_close'),
     path('stories/reopen/<int:story_id>/', views.story_reopen, name='story_reopen'),
-    path('stories/axclose/<int:story_id>/', views.story_close_ajax, name='story_close_ajax'),
-    path('stories/axreaffect/<int:story_id>/', views.story_reaffect_ajax, name='story_reaffect_ajax'),
+    path('stories/reaffect/<int:story_id>/', views.story_reaffect, name='story_reaffect_ajax'),
     path('epics/<int:epic_id>', views.epic_details, name='epic_details'),
     path('epics/create/', views.epic_create, name='epic_create'),
     path('epics/edit/<int:epic_id>/', views.epic_edit, name='epic_edit'),

main/views.py

@@ -160,24 +160,25 @@ def story_delete(request, story_id):
         return render(request, 'deletion.html', {'object': story})
 
 @login_required
-def story_close(_, story_id):
+def story_close(request, story_id):
     story = get_object_or_404(Story, id=story_id)
     story.close()
-    return redirect('epic_details', story.epic.id)
-
-def story_close_ajax(_, story_id):
-    story = get_object_or_404(Story, id=story_id)
-    story.close()
-    return HttpResponse(story.to_json())
+    if request.is_ajax():
+        return HttpResponse(story.to_json())
+    else:
+        return redirect('epic_details', story.epic.id)
 
 @login_required
-def story_reaffect_ajax(_, story_id):
+def story_reaffect(request, story_id):
     story = get_object_or_404(Story, id=story_id)
     next_sprint = Sprint.next()
     story.sprints.add(next_sprint)
     story.save()
-    return HttpResponse(story.to_json())
-
+    if request.is_ajax():
+        return HttpResponse(story.to_json())
+    else:
+        return redirect('story_details', story.id)
+    
 @login_required
 def story_reopen(_, story_id):
     story = get_object_or_404(Story, id=story_id)
@@ -361,6 +362,14 @@ def search(request):
         results = paginator.get_page(page)
         
         return render(request, 'search_results.html', {'results': results, 'pages': range(1, paginator.num_pages + 1)})
-    
-    
+
+@login_required
+def notif_seen(request):
+    pass
+
+@login_required
+def all_notif_seen(request):
+    pass
+
+