Workflow Checks

Signed-off-by: Rishi Garg <rishigarg2503@gmail.com>

Author: Rishi-garg03

vulnerabilities/templates/includes/pagination.html

@@ -12,52 +12,29 @@
             </select>
         </div>
     </div>
-<<<<<<< Updated upstream
 
     {% if page_obj.paginator.num_pages > 1 %}
     <nav class="pagination is-centered" role="navigation" aria-label="pagination">
         {% if page_obj.has_previous %}
             <a href="?page={{ page_obj.previous_page_number }}&search={{ search|urlencode }}&page_size={{ current_page_size }}" 
-=======
-  
-    {% if page_obj.paginator.num_pages > 1 %}
-    <nav class="pagination is-centered" role="navigation" aria-label="pagination">
-        {% if page_obj.has_previous %}
-            <a href="{{ base_url }}&page={{ page_obj.previous_page_number }}" 
->>>>>>> Stashed changes
                class="pagination-previous">Previous</a>
         {% else %}
             <button class="pagination-previous" disabled>Previous</button>
         {% endif %}
-<<<<<<< Updated upstream
 
         {% if page_obj.has_next %}
             <a href="?page={{ page_obj.next_page_number }}&search={{ search|urlencode }}&page_size={{ current_page_size }}" 
-=======
-  
-        {% if page_obj.has_next %}
-            <a href="{{ base_url }}&page={{ page_obj.next_page_number }}" 
->>>>>>> Stashed changes
                class="pagination-next">Next</a>
         {% else %}
             <button class="pagination-next" disabled>Next</button>
         {% endif %}
-<<<<<<< Updated upstream
-
-=======
-  
->>>>>>> Stashed changes
         <ul class="pagination-list">
             {% for page_num in page_range %}
                 {% if page_num == '...' %}
                     <li><span class="pagination-ellipsis">&hellip;</span></li>
                 {% else %}
                     <li>
-<<<<<<< Updated upstream
                         <a href="?page={{ page_num }}&search={{ search|urlencode }}&page_size={{ current_page_size }}" 
-=======
-                        <a href="{{ base_url }}&page={{ page_num }}" 
->>>>>>> Stashed changes
                            class="pagination-link {% if page_num == page_obj.number %}is-current{% endif %}"
                            aria-label="Go to page {{ page_num }}"
                            {% if page_num == page_obj.number %}aria-current="page"{% endif %}>
@@ -69,7 +46,6 @@
         </ul>
     </nav>
     {% endif %}
-<<<<<<< Updated upstream
 </div>
 
 <style>
@@ -98,26 +74,3 @@
     window.location.href = newUrl;
 }
 </script>
-=======
-  </div>
-  
-  <style>
-  .select.is-disabled {
-    opacity: 0.7;
-    cursor: not-allowed;
-  }
-  .select.is-disabled select {
-    cursor: not-allowed;
-  }
-  </style>
-  
-  <script>
-  function handlePageSizeChange(value) {
-    const url = new URL(window.location.href);
-    const params = new URLSearchParams(url.search);
-    params.set('page_size', value);
-    params.delete('page'); 
-    window.location.href = `${url.pathname}?${params.toString()}`;
-  }
-  </script>
->>>>>>> Stashed changes

vulnerabilities/views.py

@@ -65,13 +65,10 @@ def get_purl_version_class(purl: models.Package):
 
 
 class PackageSearch(PaginatedListViewMixin, ListView):
-<<<<<<< Updated upstream
     """
-    View for searching and displaying packages with pagination.
+    View for searching & displaying packages with pagination.
     """
 
-=======
->>>>>>> Stashed changes
     model = models.Package
     template_name = "packages.html"
     ordering = ["type", "namespace", "name", "version"]
@@ -92,13 +89,10 @@ def get_queryset(self, query=None):
 
 
 class VulnerabilitySearch(PaginatedListViewMixin, ListView):
-<<<<<<< Updated upstream
     """
     View for searching and displaying vulnerabilities with pagination.
     """
 
-=======
->>>>>>> Stashed changes
     model = models.Vulnerability
     template_name = "vulnerabilities.html"
     ordering = ["vulnerability_id"]