From: Joe Atzberger Date: Fri, 5 Jun 2009 17:18:50 +0000 (-0500) Subject: Cleanup cities.pl and .tmpl - major X-Git-Tag: v3.00.04~428 X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=934afc4f011482c864514a2af126e94bcb4c98cf;p=koha.git Cleanup cities.pl and .tmpl - major 80% of the javascript was junk. Bad check failed on non-existant field borrowers.select_city. Enabled warnings. Reduced "StringSearch" to 3 lines, removed unused args and vars. Fixed row highlighting and removed "toggle" code. Etc. TODO: Stop redirecting to the same page. Instead get the correct data and show it on THIS pass. Signed-off-by: Galen Charlton Signed-off-by: Henri-Damien LAURENT --- diff --git a/admin/cities.pl b/admin/cities.pl index fe26caaa25..1e7e877594 100755 --- a/admin/cities.pl +++ b/admin/cities.pl @@ -18,33 +18,23 @@ # Suite 330, Boston, MA 02111-1307 USA use strict; +use warnings; use CGI; use C4::Context; use C4::Auth; use C4::Output; -sub StringSearch { - my ($searchstring,$type)=@_; - my $dbh = C4::Context->dbh; - $searchstring=~ s/\'/\\\'/g; - my @data=split(' ',$searchstring); - my $count=@data; - my $sth=$dbh->prepare("Select * from cities where (city_name like ?)"); - $sth->execute("$data[0]%"); - my @results; - while (my $data=$sth->fetchrow_hashref){ - push(@results,$data); - } - # $sth->execute; - $sth->finish; - return (scalar(@results),\@results); +sub StringSearch { + my $sth = C4::Context->dbh->prepare("SELECT * FROM cities WHERE (city_name LIKE ?)"); + $sth->execute("%" . (shift || '') . "%"); + return $sth->fetchall_arrayref({}); } my $input = new CGI; -my $searchfield=$input->param('city_name'); -my $script_name="/cgi-bin/koha/admin/cities.pl"; -my $cityid=$input->param('cityid'); -my $op = $input->param('op'); +my $script_name = "/cgi-bin/koha/admin/cities.pl"; +my $searchfield = $input->param('city_name'); +my $cityid = $input->param('cityid'); +my $op = $input->param('op') || ''; my ($template, $loggedinuser, $cookie) = get_template_and_user({template_name => "admin/cities.tmpl", @@ -55,12 +45,11 @@ my ($template, $loggedinuser, $cookie) debug => 1, }); - $template->param( script_name => $script_name, cityid => $cityid , searchfield => $searchfield); - +my $dbh = C4::Context->dbh; ################## ADD_FORM ################################## # called by default. Used to create form to add or modify a record if ($op eq 'add_form') { @@ -69,95 +58,57 @@ if ($op eq 'add_form') { #---- if primkey exists, it's a modify action, so read values to modify... my $data; if ($cityid) { - my $dbh = C4::Context->dbh; my $sth=$dbh->prepare("select cityid,city_name,city_zipcode from cities where cityid=?"); $sth->execute($cityid); $data=$sth->fetchrow_hashref; - $sth->finish; } $template->param( city_name => $data->{'city_name'}, city_zipcode => $data->{'city_zipcode'}); -##############ICI##################### # END $OP eq ADD_FORM ################## ADD_VALIDATE ################################## # called by add_form, used to insert/modify data in DB } elsif ($op eq 'add_validate') { - my $dbh = C4::Context->dbh; my $sth; if ($input->param('cityid') ){ $sth=$dbh->prepare("UPDATE cities SET city_name=?,city_zipcode=? WHERE cityid=?"); $sth->execute($input->param('city_name'),$input->param('city_zipcode'),$input->param('cityid')); - } else{ $sth=$dbh->prepare("INSERT INTO cities (city_name,city_zipcode) values (?,?)"); $sth->execute($input->param('city_name'),$input->param('city_zipcode')); } - $sth->finish; - print $input->redirect("/cgi-bin/koha/admin/cities.pl"); + print $input->redirect($script_name); exit; -# END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB } elsif ($op eq 'delete_confirm') { $template->param(delete_confirm => 1); - - my $dbh = C4::Context->dbh; - my $sth=$dbh->prepare("select count(*) as total from borrowers,cities where borrowers.select_city=cities.cityid and cityid=?"); + my $sth=$dbh->prepare("select count(*) as total from borrowers,cities where borrowers.city=cities.city_name and cityid=?"); + # FIXME: this check used to pretend there was a FK "select_city" in borrowers. $sth->execute($cityid); my $total = $sth->fetchrow_hashref; - $sth->finish; - $template->param(total => $total->{'total'}); my $sth2=$dbh->prepare("select cityid,city_name,city_zipcode from cities where cityid=?"); $sth2->execute($cityid); my $data=$sth2->fetchrow_hashref; - $sth2->finish; - if ($total->{'total'} >0) { - $template->param(totalgtzero => 1); - } - - $template->param( - city_name => ( $data->{'city_name'}), - city_zipcode => $data->{'city_zipcode'}); - - - # END $OP eq DELETE_CONFIRM + $template->param( + total => $total->{'total'}, + city_name => $data->{'city_name'}, + city_zipcode => $data->{'city_zipcode'}, + ); ################## DELETE_CONFIRMED ################################## # called by delete_confirm, used to effectively confirm deletion of data in DB } elsif ($op eq 'delete_confirmed') { - my $dbh = C4::Context->dbh; - my $categorycode=uc($input->param('cityid')); my $sth=$dbh->prepare("delete from cities where cityid=?"); $sth->execute($cityid); - $sth->finish; - print "Content-Type: text/html\n\n"; - exit; + print $input->redirect($script_name); + exit; # FIXME: what's the point of redirecting to this same page? # END $OP eq DELETE_CONFIRMED } else { # DEFAULT $template->param(else => 1); - my @loop; - my ($count,$results)=StringSearch($searchfield,'web'); - my $toggle = 0; - for (my $i=0; $i < $count; $i++){ - my %row = (cityid => $results->[$i]{'cityid'}, - city_name => $results->[$i]{'city_name'}, - city_zipcode => $results->[$i]{'city_zipcode'}, - toggle => $toggle ); - push @loop, \%row; - if ( $toggle eq 0 ) - { - $toggle = 1; - } - else - { - $toggle = 0; - } - } - $template->param(loop => \@loop); - + $template->param(loop => StringSearch($searchfield)); } #---- END $OP eq DEFAULT output_html_with_http_headers $input, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl index 6d8b0df990..6a96abf1f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tmpl @@ -3,50 +3,16 @@ @@ -54,7 +20,16 @@ - +
@@ -80,7 +55,7 @@
  • - " /> + " />
  • @@ -94,67 +69,45 @@ - -
    -

    Cannot Delete City ""

    -

    This record is used times. Impossible to delete it

    - -
    -

    Delete City "?"

    - - - - - - - - - - - - - - - -
    City id - - -
    City name
    City zipcode
    - -
    " method="post"> - -
    - -
    " method="post"> - - " />
    " method="post"> -
    - + +
    +

    Cannot Delete City ""

    +

    This record is used times. Impossible to delete it

    + +
    +

    Delete City "?"

    + + + + + + + + + + + +
    City id
    City name
    City zipcode
    +
    " method="post"> + + + + + " /> + +
    +
    " method="get"> + + +
    -

    Cities

    @@ -169,14 +122,13 @@ City zipcode     - - - + + - +