Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Bug 14042: Get rid of the home made pagination in the auth type admin 

This patch removes the home made pagination and introduces datatables on
this page.

Test plan:
Go to the authority type admin page and confirm there is a beautiful
table.

Confirmed...
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
3.20.x
Jonathan Druart 9 years ago
committed by Tomas Cohen Arazi
parent
e6d9882a14
commit
e9d30862c1
2 changed files with 27 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      admin/authtypes.pl
  2. 24
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt

32
admin/authtypes.pl
View File

@ -28,18 +28,20 @@ use C4::Auth;
use C4::Output;
sub StringSearch {
my $sth = C4::Context->dbh->prepare("SELECT * FROM auth_types WHERE (authtypecode like ?) ORDER BY authtypecode");
$sth->execute((shift || '') . "%");
return $sth->fetchall_arrayref({});
my $string = shift || '';
my $dbh = C4::Context->dbh;
return $dbh->selectall_arrayref(q|
SELECT authtypecode, authtypetext, auth_tag_to_report, summary
FROM auth_types
WHERE (authtypecode like ?) ORDER BY authtypecode
|, { Slice => {} }, $string . "%" );
}
my $input = new CGI;
my $script_name = "/cgi-bin/koha/admin/authtypes.pl";
my $searchfield = $input->param('authtypecode'); # FIXME: Auth Type search not really implemented
my $authtypecode = $input->param('authtypecode');
my $offset = $input->param('offset') || 0;
my $op = $input->param('op') || '';
my $pagesize = 20;
my ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => "admin/authtypes.tt",
query => $input,
@ -110,24 +112,6 @@ if ($op eq 'add_form') {
################## DEFAULT ##################################
} else { # DEFAULT
my $results = StringSearch($searchfield);
my $count = scalar @$results;
my @loop_data;
for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
push @loop_data, {
authtypecode => $results->[$i]{'authtypecode'},
authtypetext => $results->[$i]{'authtypetext'},
auth_tag_to_report => $results->[$i]{'auth_tag_to_report'},
summary => $results->[$i]{'summary'},
};
}
$template->param(loop => \@loop_data);
if ($offset>0) {
my $prevpage = $offset-$pagesize;
$template->param(previous => "$script_name?offset=".$prevpage);
}
if ($offset+$pagesize<$count) {
my $nextpage = $offset+$pagesize;
$template->param(next => "$script_name?offset=".$nextpage);
}
$template->param( loop => $results );
} #---- END $OP eq DEFAULT
output_html_with_http_headers $input, $cookie, $template->output;

24
koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
View File

@ -7,6 +7,20 @@
[% END %]
</title>
[% INCLUDE 'doc-head-close.inc' %]
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'datatables.inc' %]
<script type="text/javascript">
//<![CDATA[
$(document).ready(function() {
$("#authtypes").dataTable($.extend(true, {}, dataTablesDefaults, {
"aoColumnDefs": [
{ "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
],
"sPaginationType": "four_button"
}));
});
//]]>
</script>
</head>
<body id="admin_authtypes" class="admin">
@ -96,7 +110,8 @@
<h1>Authority types</h1>
<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
<table>
<table id="authtypes">
<thead>
<tr>
<th>Code</th>
<th>Description</th>
@ -106,7 +121,8 @@
<th>Edit</th>
<th>Delete</th>
</tr>
</thead>
<tbody>
[% FOREACH loo IN loop %]
<tr>
<td>[% loo.authtypecode %]</td>
@ -118,11 +134,9 @@
<td><a href="[% loo.script_name %]?op=delete_confirm&amp;authtypecode=[% loo.authtypecode |html %]">Delete</a></td>
</tr>
[% END %]
<tbody>
</table>
[% IF ( previous ) %]<p><a href="[% previous %]">&lt;&lt; Previous</a></p>[% END %]
[% IF ( next ) %]<p><a href="[% next %]">Next &gt;&gt;</a></p>[% END %]
[% END %]
</div>
</div>

Write Preview
Loading…
Cancel
Save