From 2be50eba0fe16a7243722f3edac56447c2b6fa75 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Fri, 21 Feb 2014 16:08:01 +0000
Subject: [PATCH] Bug 7372: (follow-up) remove last traces of roadtype table
 and admin pages

This patch removes the DBIC schema class for the 'roadtype' table
and staff interface templates that are no longer reachable with
the removal of the road type administration page.  It also removes
the creation of the table during installation.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 Koha/Schema/Result/Roadtype.pm                | 66 -------------------
 installer/data/mysql/kohastructure.sql        | 11 ----
 .../en/includes/roadtype-admin-search.inc     | 31 ---------
 .../prog/en/modules/help/admin/roadtype.tt    | 15 -----
 4 files changed, 123 deletions(-)
 delete mode 100644 Koha/Schema/Result/Roadtype.pm
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt

diff --git a/Koha/Schema/Result/Roadtype.pm b/Koha/Schema/Result/Roadtype.pm
deleted file mode 100644
index f4b20f8331..0000000000
--- a/Koha/Schema/Result/Roadtype.pm
+++ /dev/null
@@ -1,66 +0,0 @@
-use utf8;
-package Koha::Schema::Result::Roadtype;
-
-# Created by DBIx::Class::Schema::Loader
-# DO NOT MODIFY THE FIRST PART OF THIS FILE
-
-=head1 NAME
-
-Koha::Schema::Result::Roadtype
-
-=cut
-
-use strict;
-use warnings;
-
-use base 'DBIx::Class::Core';
-
-=head1 TABLE: C<roadtype>
-
-=cut
-
-__PACKAGE__->table("roadtype");
-
-=head1 ACCESSORS
-
-=head2 roadtypeid
-
-  data_type: 'integer'
-  is_auto_increment: 1
-  is_nullable: 0
-
-=head2 road_type
-
-  data_type: 'varchar'
-  default_value: (empty string)
-  is_nullable: 0
-  size: 100
-
-=cut
-
-__PACKAGE__->add_columns(
-  "roadtypeid",
-  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
-  "road_type",
-  { data_type => "varchar", default_value => "", is_nullable => 0, size => 100 },
-);
-
-=head1 PRIMARY KEY
-
-=over 4
-
-=item * L</roadtypeid>
-
-=back
-
-=cut
-
-__PACKAGE__->set_primary_key("roadtypeid");
-
-
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:5kGeIy5frUgC5wj646dC3g
-
-
-# You can replace this text with custom content, and it will be preserved on regeneration
-1;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 363217b2b7..dddd2c0071 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1850,17 +1850,6 @@ CREATE TABLE `reviews` ( -- patron opac comments
   CONSTRAINT `reviews_ibfk_2` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
---
--- Table structure for table `roadtype`
---
-
-DROP TABLE IF EXISTS `roadtype`;
-CREATE TABLE `roadtype` ( -- road types defined in administration and used in patron management
-  `roadtypeid` int(11) NOT NULL auto_increment, -- unique identifier assigned by Koha for each road type
-  `road_type` varchar(100) NOT NULL default '', -- text for road type
-  PRIMARY KEY  (`roadtypeid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 --
 -- Table structure for table `saved_sql`
 --
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
deleted file mode 100644
index f7bb425ec6..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-<div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Roads Resident Search Box -->
-<div id="header_search">
-     <div id="roadtype_search" class="residentsearch ui-tabs-panel">
-        <p class="tip">Road type search:</p>
-		<form action="[% script_name %]" method="post">
-		<input type="text" name="road_type" value="[% searchfield %]" size="40" />
-		<input type="submit" name="submit" value="OK" class="submit" />
-	</form>
-	</div>
-
-    [% INCLUDE 'patron-search-box.inc' %]
-
-	[% IF ( CAN_user_catalogue ) %]
-    <div id="catalog_search" class="residentsearch">
-	<p class="tip">Enter search keywords:</p>
-		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
-				<input type="submit" value="Submit"  class="submit" />
-		</form>
-	</div>
-
-	[% END %]
-			<ul>
-            <li><a href="#roadtype_search">Search road types</a></li>
-            [% IF ( CAN_user_circulate ) %]<li><a href="#circ_search">Check out</a></li>[% END %]
-            [% IF ( CAN_user_catalogue ) %]<li><a href="#catalog_search">Search the catalog</a></li>[% END %]
-			</ul>	
-</div>
-</div>
-<!-- End Roads Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
deleted file mode 100644
index 4d0a654c5b..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/roadtype.tt
+++ /dev/null
@@ -1,15 +0,0 @@
-[% INCLUDE 'help-top.inc' %]
-
-<h1>Adding Road Types</h1>
-
-<p>To add a road type, click 'New Road Type' and then enter the road type the way you'd like it displayed.</p>
-
-<p>Once you submit the form, your new road type will be listed on the Road Types page</p>
-
-<h2>Viewing Road Types on Patron Add form</h2>
-
-<p>When adding or editing a patron, if you have road types defined, there will be a pull down to choose the road type from.</p>
-
-<p><strong>See the full documentation for Road Types in the <a href="http://manual.koha-community.org/[% helpVersion %]/en/patscirc.html#roadtypes">manual</a> (online).</strong></p>
-
-[% INCLUDE 'help-bottom.inc' %]
\ No newline at end of file
-- 
2.20.1