From 274bbaa53ebe0d06ff67266c551540e81b3ae487 Mon Sep 17 00:00:00 2001
From: "Andrew E. Bruno" <aebruno2@buffalo.edu>
Date: Wed, 9 Mar 2022 16:13:09 -0500
Subject: [PATCH] Don't open links in new tab

---
 .../templates/allocation/allocation_invoice_list.html         | 2 +-
 .../core/allocation/templates/allocation/allocation_list.html | 4 ++--
 .../core/project/templates/project/project_review_list.html   | 2 +-
 coldfront/core/resource/templates/resource_list.html          | 2 +-
 coldfront/core/user/templates/user/user_list_allocations.html | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/coldfront/core/allocation/templates/allocation/allocation_invoice_list.html b/coldfront/core/allocation/templates/allocation/allocation_invoice_list.html
index 2eb2a40df..0c12e8052 100644
--- a/coldfront/core/allocation/templates/allocation/allocation_invoice_list.html
+++ b/coldfront/core/allocation/templates/allocation/allocation_invoice_list.html
@@ -25,7 +25,7 @@ <h2>Allocations that require payment</h2>
       <tbody>
         {% for allocation in allocation_list %}
           <tr>
-            <td><a target="_blank" href="{% url 'allocation-invoice-detail' allocation.pk %}">{{allocation.pk}}</td>
+            <td><a href="{% url 'allocation-invoice-detail' allocation.pk %}">{{allocation.pk}}</td>
             <td>{{allocation.get_resources_as_string}}</td>
             <td>{{allocation.status}}</td>
             <td>{{allocation.project.pi.username }}</td>
diff --git a/coldfront/core/allocation/templates/allocation/allocation_list.html b/coldfront/core/allocation/templates/allocation/allocation_list.html
index 51bd7946d..b4e33232b 100644
--- a/coldfront/core/allocation/templates/allocation/allocation_list.html
+++ b/coldfront/core/allocation/templates/allocation/allocation_list.html
@@ -77,8 +77,8 @@ <h2>Allocations</h2>
       <tbody>
         {% for allocation in allocation_list %}
           <tr>
-            <td><a target="_blank" href="/allocation/{{allocation.id}}/">{{ allocation.id }}</a></td>
-            <td class="text-nowrap"><a target="_blank"
+            <td><a href="/allocation/{{allocation.id}}/">{{ allocation.id }}</a></td>
+            <td class="text-nowrap"><a 
                 href="/project/{{allocation.project.id}}/">{{ allocation.project.title|truncatechars:50 }}</a></td>
             <td class="text-nowrap">{{allocation.project.pi.first_name}} {{allocation.project.pi.last_name}}
               ({{allocation.project.pi.username}})</td>
diff --git a/coldfront/core/project/templates/project/project_review_list.html b/coldfront/core/project/templates/project/project_review_list.html
index 31ebbc478..ed52d92ee 100644
--- a/coldfront/core/project/templates/project/project_review_list.html
+++ b/coldfront/core/project/templates/project/project_review_list.html
@@ -29,7 +29,7 @@ <h2>Pending Project Reviews</h2>
       <tbody>
         {% for project_review in project_review_list %}
           <tr>
-            <td><a target="_blank" href="{% url 'project-detail' project_review.project.pk %}">{{project_review.project.title|truncatechars:50}}</a></td>
+            <td><a href="{% url 'project-detail' project_review.project.pk %}">{{project_review.project.title|truncatechars:50}}</a></td>
             <td >{{ project_review.created|date:"M. d, Y" }}</td>        
             <td>{{project_review.project.pi.first_name}} {{project_review.project.pi.last_name}} ({{project_review.project.pi.username}})</td>
             <td >{{ project_review.project.latest_grant.modified|date:"M. d, Y"|default:"No grants" }}</td>
diff --git a/coldfront/core/resource/templates/resource_list.html b/coldfront/core/resource/templates/resource_list.html
index a1ad7eb9e..3aeef0cb0 100644
--- a/coldfront/core/resource/templates/resource_list.html
+++ b/coldfront/core/resource/templates/resource_list.html
@@ -67,7 +67,7 @@ <h2>Resources</h2>
       <tbody>
         {% for resource in resource_list %}
           <tr>
-            <td><a target="_blank" href="/resource/{{resource.id}}/">{{ resource.id }}</a></td>
+            <td><a href="/resource/{{resource.id}}/">{{ resource.id }}</a></td>
             <td>{{ resource }}</td>
             <td>{{ resource.parent_resource }}</td>
             <td>{{ resource.resource_type.name }}</td>
diff --git a/coldfront/core/user/templates/user/user_list_allocations.html b/coldfront/core/user/templates/user/user_list_allocations.html
index c1a7c1410..6856c7858 100644
--- a/coldfront/core/user/templates/user/user_list_allocations.html
+++ b/coldfront/core/user/templates/user/user_list_allocations.html
@@ -26,7 +26,7 @@
                   <td>{{ user.last_name }}</td>
                   <td class="text-nowrap">
                     {% for allocation in allocations %}
-                      <a target="_blank" href="{% url 'allocation-detail' allocation.pk %}">{{ allocation.get_parent_resource.name }} ({{ allocation.get_parent_resource.resource_type.name }})</a>  {% if 'slurm' in allocation.get_information %} -- {{allocation.get_information}} {% else %} <br> {% endif %}
+                      <a href="{% url 'allocation-detail' allocation.pk %}">{{ allocation.get_parent_resource.name }} ({{ allocation.get_parent_resource.resource_type.name }})</a>  {% if 'slurm' in allocation.get_information %} -- {{allocation.get_information}} {% else %} <br> {% endif %}
                     {% endfor %} 
                   </td>
                 </tr>