Pārlūkot izejas kodu

Add the 'my current stories' shortcut

omassot 6 gadi atpakaļ
vecāks
revīzija
4b9d3cce67
3 mainītis faili ar 11 papildinājumiem un 9 dzēšanām
  1. 2 1
      main/templates/_layout.html
  2. 1 0
      main/urls.py
  3. 8 8
      main/views.py

+ 2 - 1
main/templates/_layout.html

@@ -113,7 +113,8 @@
 	        			</a>
 	        		
 						<div id="stories-dropdown" class="dropdown-content">
-							<a href="{% url 'story_index' %}?assignee={{ request.user.id }}">Mes Stories</a>
+							<a href="{% url 'story_index_own_cur' %}">Mes stories en cours</a>
+							<a href="{% url 'story_index' %}?assignee={{ request.user.id }}">Toutes mes stories</a>
 							<a href="{% url 'story_index_cur' %}">Sprint en cours</a>
 							<a href="{% url 'story_index_prev' %}">Sprint précédent</a>
 							<a href="{% url 'story_index_next' %}">Sprint suivant</a>

+ 1 - 0
main/urls.py

@@ -22,6 +22,7 @@ urlpatterns = [
     path('sprintnew/', views.sprint_new, name='sprint_new'),
     path('stories/', views.story_index, name='story_index'),
     path('stories/<int:story_id>', views.story_details, name='story_details'),
+    path('stories/owncur/', views.story_index_own_cur, name='story_index_own_cur'),
     path('stories/cur/', views.story_index_cur, name='story_index_cur'),
     path('stories/prev/', views.story_index_prev, name='story_index_prev'),
     path('stories/next/', views.story_index_next, name='story_index_next'),

+ 8 - 8
main/views.py

@@ -165,15 +165,20 @@ def story_index(request):
                                                 'users': users, 
                                                 'pages': range(1, paginator.num_pages + 1)})
               
+@login_required                                  
+def story_index_own_cur(request):
+    current_sprint = Sprint.current()
+    if not current_sprint:
+        messages.error(request, "Aucun sprint en cours")
+        return redirect("story_index")
+    return redirect("{}?sprint={}&assignee={}".format(reverse('story_index'), current_sprint.id, request.user.id))
+              
 @login_required                                  
 def story_index_cur(request):
     current_sprint = Sprint.current()
     if not current_sprint:
         messages.error(request, "Aucun sprint en cours")
         return redirect("story_index")
-    
-#     request.GET['sprint'] = current_sprint.id
-#     return redirect('story_index', sprint_id=current_sprint.id)      
     return redirect("{}?sprint={}".format(reverse('story_index'), current_sprint.id))
               
 @login_required                                  
@@ -182,8 +187,6 @@ def story_index_prev(request):
     if not previous_sprint:
         messages.error(request, "Le sprint précédent n'existe pas")
         return redirect("story_index")
-    
-#     request.GET['sprint'] = previous_sprint.id
     return redirect("{}?sprint={}".format(reverse('story_index'), previous_sprint.id))
 
 @login_required                                  
@@ -192,9 +195,6 @@ def story_index_next(request):
     if not next_sprint:
         messages.error(request, "Le sprint suivant n'a pas encore été créé")
         return redirect("story_index")
-    
-#     request.GET['sprint'] = next_sprint.id
-#     return redirect('story_index', sprint_id=next_sprint.id)             
     return redirect("{}?sprint={}".format(reverse('story_index'), next_sprint.id))                    
                                                 
 @login_required