From da31437d1a7e2ac3f4a71b78ac652ed6c3d57731 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 4 May 2022 17:40:27 +0000 Subject: [PATCH] Bug 30937: Add a detail view for libraries This patch adds a view page for libraries, so that the user isn't required to edit the library to see information about it. To test, apply the patch and log into Koha as a user with permission to manage libraries. - In the list of libraries you should see that the library name in the first column is now a link. - When you click the link you should be taken to a view of all the information about the library. Signed-off-by: Lucas Gass Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- admin/branches.pl | 5 + .../prog/en/modules/admin/branches.tt | 155 +++++++++++++++++- 2 files changed, 158 insertions(+), 2 deletions(-) diff --git a/admin/branches.pl b/admin/branches.pl index 08a73f6571..134321a2bd 100755 --- a/admin/branches.pl +++ b/admin/branches.pl @@ -53,6 +53,11 @@ if ( $op eq 'add_form' ) { library => Koha::Libraries->find($branchcode), smtp_servers => Koha::SMTP::Servers->search, ); +} elsif ( $branchcode && $op eq 'view' ) { + my $library = Koha::Libraries->find($branchcode); + $template->param( + library => $library, + ); } elsif ( $op eq 'add_validate' ) { my @fields = qw( branchname diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt index eb3b8f92a3..5fdda101dd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt @@ -58,6 +58,16 @@ Libraries › Administration › Koha + [% ELSIF op == 'view' %] +
  • + Libraries +
    • +
  • + + [% library.branchname | html %] + +
    • + [% ELSE %]
  • @@ -117,9 +127,12 @@ Libraries › Administration › Koha [% END %] -[% IF op == 'list' %] +[% IF op == 'list' || op == 'view' %]
    New library + [% IF op == 'view' %] + Edit library + [% END %]
    [% END %] @@ -324,6 +337,141 @@ Libraries › Administration › Koha [% END %] [% END %] +[% IF op == 'view' %] +

    [% library.branchname | html %]

    +
    +
    +
    +
      +
    1. + Library code: + [% library.branchcode | html %] +
      2. +
    2. + Name: + [% library.branchname | html %] +
      3. +
    3. + Category: + [% category.categoryname | html %] +
      4. +
    4. + Address line 1: + [% library.branchaddress1 | html %] +
      5. +
    5. + Address line 2: + [% library.branchaddress2 | html %] +
      6. +
    6. + Address line 3: + [% library.branchaddress3 | html %] +
      7. +
    7. + City: + [% library.branchcity | html %] +
      8. +
    8. + State: + [% library.branchstate | html %] +
      9. +
    9. + ZIP/Postal code: + [% library.branchzip | html %] +
      10. +
    10. + Country: + [% library.branchcountry | html %] +
      11. +
    11. + Phone: + [% library.branchphone | html %] +
      12. +
    12. + Fax: + [% library.branchfax | html %] +
      13. +
    +
    +
    +
    +
    +
      +
    1. + Email: + [% IF ( library.branchemail ) %] + [% library.branchemail | html %] + [% END %] +
      2. +
    2. + ILL staff email: + [% IF ( library.branchillemail ) %] + [% library.branchillemail | html %] + [% END %] +
      3. +
    3. + Reply-To: + [% IF ( library.branchreplyto ) %] + [% library.branchreplyto | html %] + [% END %] +
      4. +
    4. + Return-Path: + [% library.branchreturnpath | html %] +
      5. +
    5. + SMTP server: + [% smtp_server.name | html %] +
      6. +
    6. + URL: + [% IF ( library.branchurl ) %] + [% library.branchurl | html %] + [% END %] +
      7. +
    7. + IP: + [% library.branchip | html %] +
      8. +
    8. + MARC organization code + [% library.marcorgcode | html %] +
      9. +
    9. + Notes: + [% library.branchnotes | html %] +
      10. +
    10. + Pickup location: + [% IF ( library.pickup_location ) %] + Yes + [% ELSE %] + No + [% END %] +
      11. +
    11. + Public: + [% IF ( library.public ) %] + Yes + [% ELSE %] + No + [% END %] +
      12. +
    +
    +
    +
    + [% IF ( library.opac_info ) %] +
    +
    +
    +

    OPAC information

    + [% library.opac_info | $raw %] +
    +
    + [% END %] +[% END %] + @@ -369,7 +517,10 @@ Libraries › Administration › Koha { "data": "name", "searchable": true, - "orderable": true + "orderable": true, + "render": function( data, type, row, meta ) { + return "" + row.name.escapeHtml() + ""; + } }, { "data": "library_id", -- 2.39.5