View | Details | Raw Unified | Return to bug 25279
Collapse All | Expand All

(-)a/admin/cities.pl (-7 / +3 lines)
Lines 27-33 use C4::Output; Link Here
27
use Koha::Cities;
27
use Koha::Cities;
28
28
29
my $input       = new CGI;
29
my $input       = new CGI;
30
my $city_name   = $input->param('city_name') // q||;
30
my $city_name_filter = $input->param('city_name_filter') // q||;
31
my $cityid      = $input->param('cityid');
31
my $cityid      = $input->param('cityid');
32
my $op          = $input->param('op') || 'list';
32
my $op          = $input->param('op') || 'list';
33
my @messages;
33
my @messages;
Lines 51-57 if ( $op eq 'add_form' ) { Link Here
51
51
52
    $template->param( city => $city, );
52
    $template->param( city => $city, );
53
} elsif ( $op eq 'add_validate' ) {
53
} elsif ( $op eq 'add_validate' ) {
54
    my $cityid       = $input->param('cityid');
55
    my $city_name    = $input->param('city_name');
54
    my $city_name    = $input->param('city_name');
56
    my $city_state   = $input->param('city_state');
55
    my $city_state   = $input->param('city_state');
57
    my $city_zipcode = $input->param('city_zipcode');
56
    my $city_zipcode = $input->param('city_zipcode');
Lines 102-116 if ( $op eq 'add_form' ) { Link Here
102
}
101
}
103
102
104
if ( $op eq 'list' ) {
103
if ( $op eq 'list' ) {
105
    my $filter = {};
104
    $template->param( cities_count => Koha::Cities->search->count );
106
    $filter->{city_name} = { -like => '%'.$city_name.'%' }
107
        if $city_name;
108
    $template->param( cities_count => Koha::Cities->search($filter)->count );
109
}
105
}
110
106
111
$template->param(
107
$template->param(
112
    cityid      => $cityid,
108
    cityid      => $cityid,
113
    city_name_filter => $city_name,
109
    city_name_filter => $city_name_filter,
114
    messages    => \@messages,
110
    messages    => \@messages,
115
    op          => $op,
111
    op          => $op,
116
);
112
);
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc (-2 / +1 lines)
Lines 5-11 Link Here
5
	<div id="city_search" class="residentsearch">
5
	<div id="city_search" class="residentsearch">
6
    <p class="tip">City search:</p>
6
    <p class="tip">City search:</p>
7
	<form action="[% script_name | html %]" method="post">
7
	<form action="[% script_name | html %]" method="post">
8
        <input class="head-searchbox" type="text" name="city_name" value="[% searchfield | html %]" size="40" />
8
        <input class="head-searchbox" type="text" name="city_name_filter" value="[% city_name_filter | html %]" size="40" />
9
		<input type="submit" name="submit" value="OK" class="submit" />
9
		<input type="submit" name="submit" value="OK" class="submit" />
10
	</form>
10
	</form>
11
	</div>
11
	</div>
12
- 

Return to bug 25279