@@ -, +, @@
---
admin/cities.pl | 5 -
.../prog/en/modules/admin/cities.tt | 98 +++++++++++--------
2 files changed, 57 insertions(+), 46 deletions(-)
--- a/admin/cities.pl
+++ a/admin/cities.pl
@@ -101,11 +101,6 @@ if ( $op eq 'add_form' ) {
$op = 'list';
}
-if ( $op eq 'list' ) {
- my $cities = Koha::Cities->search( { city_name => { -like => "%$searchfield%" } } );
- $template->param( cities => $cities, );
-}
-
$template->param(
cityid => $cityid,
searchfield => $searchfield,
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -133,39 +133,18 @@
Searching: [% searchfield | html %]
[% END %]
- [% IF cities.count %]
-
-
-
- City ID |
- City |
- State |
- ZIP/Postal code |
- Country |
- Actions |
-
-
-
- [% FOREACH city IN cities %]
-
- [% city.cityid | html %] |
- [% city.city_name | html %] |
- [% city.city_state | html %] |
- [% city.city_zipcode | html %] |
- [% city.city_country | html %] |
-
- Edit
- Delete
- |
-
- [% END %]
-
-
- [% ELSE %]
-
- [% END %]
+
+
+
+ City ID |
+ City |
+ State |
+ ZIP/Postal code |
+ Country |
+ Actions |
+
+
+
[% END %]
@@ -183,14 +162,51 @@
[% INCLUDE 'datatables.inc' %]
[% END %]
--