From d8403b8b118578839a1f8feaf0b3732412ae88da Mon Sep 17 00:00:00 2001
From: Finn <toyou1995@gmail.com>
Date: Mon, 4 Dec 2017 12:27:53 +0000
Subject: [PATCH] Revert "added new tab linking and corrected redirect"

This reverts commit 4eb5a4fd3f14ecc6870bf8fc9f3e1da0d73eff8f.
---
 lib/Pear/LocalLoop/Controller/Admin/Organisations.pm | 2 +-
 templates/admin/organisations/list.html.ep           | 4 ++--
 templates/admin/organisations/valid_read.html.ep     | 2 +-
 templates/admin/transactions/index.html.ep           | 2 +-
 templates/admin/users/index.html.ep                  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Pear/LocalLoop/Controller/Admin/Organisations.pm b/lib/Pear/LocalLoop/Controller/Admin/Organisations.pm
index 23f4577..4ce41b6 100644
--- a/lib/Pear/LocalLoop/Controller/Admin/Organisations.pm
+++ b/lib/Pear/LocalLoop/Controller/Admin/Organisations.pm
@@ -139,7 +139,7 @@ sub valid_edit {
       $c->flash( success => 'Updated Organisation' );
     }
   };
-  $c->redirect_to( '/admin/organisations/' . $c->param('id') );
+  $c->redirect_to( '/admin/organisations/');
 }
 
 sub merge_list {
diff --git a/templates/admin/organisations/list.html.ep b/templates/admin/organisations/list.html.ep
index eca8aed..6885797 100644
--- a/templates/admin/organisations/list.html.ep
+++ b/templates/admin/organisations/list.html.ep
@@ -16,11 +16,11 @@
     <div class="card">
       <h3 class="card-header">
         Organisations
-        <a href="<%= url_for . '/add' %>" class="btn btn-success" style="float: right" target="_blank">Add Organisation</a>
+        <a href="<%= url_for . '/add' %>" class="btn btn-success" style="float: right">Add Organisation</a>
       </h3>
       <div class="list-group list-group-flush">
         % for my $org_result ($orgs_rs->all) {
-        <a href="<%= url_for . '/' . $org_result->id %>" class="list-group-item list-group-item-action d-flex justify-content-between" target="_blank">
+        <a href="<%= url_for . '/' . $org_result->id %>" class="list-group-item list-group-item-action d-flex justify-content-between">
           <div>
             %= $org_result->name
           </div>
diff --git a/templates/admin/organisations/valid_read.html.ep b/templates/admin/organisations/valid_read.html.ep
index 5b6d934..9f590e8 100644
--- a/templates/admin/organisations/valid_read.html.ep
+++ b/templates/admin/organisations/valid_read.html.ep
@@ -148,7 +148,7 @@ function initMap() {
       </h3>
       <div class="list-group list-group-flush">
         % for my $transaction ( $transactions->all ) {
-          <a href="<%= url_for '/admin/transactions/' . $transaction->id %>" class="list-group-item list-group-item-action" target="_blank">
+          <a href="<%= url_for '/admin/transactions/' . $transaction->id %>" class="list-group-item list-group-item-action">
             <div class="row text-center">
               <div class="col">From: <%= $transaction->buyer->name %></div>
               <div class="col">To: <%= $transaction->seller->name %></div>
diff --git a/templates/admin/transactions/index.html.ep b/templates/admin/transactions/index.html.ep
index 3ebb83a..b20ad2b 100644
--- a/templates/admin/transactions/index.html.ep
+++ b/templates/admin/transactions/index.html.ep
@@ -19,7 +19,7 @@
       </h3>
       <div class="list-group list-group-flush">
       % for my $transaction ( $transactions->all ) {
-          <a href="<%= url_for . '/' . $transaction->id %>" class="list-group-item list-group-item-action" target="_blank">
+          <a href="<%= url_for . '/' . $transaction->id %>" class="list-group-item list-group-item-action">
             <div class="row">
               <div class="col-md-4 row">
                 <div class="col my-auto">
diff --git a/templates/admin/users/index.html.ep b/templates/admin/users/index.html.ep
index 35db20e..0728042 100644
--- a/templates/admin/users/index.html.ep
+++ b/templates/admin/users/index.html.ep
@@ -13,7 +13,7 @@
 % }
 <div class="list-group">
   % for my $user ($user_rs->all) {
-  <a href="<%= url_for . '/' . $user->id %>" class="list-group-item list-group-item-action" target="_blank">
+  <a href="<%= url_for . '/' . $user->id %>" class="list-group-item list-group-item-action">
     <div class="row">
       <div class="col-4">
         %= $user->name