From 7fcc478326626e68137caa0991af6b3602228baf Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 13 Aug 2010 15:44:10 -0400 Subject: [PATCH] Fix for Bug 1883, authorised list of reasons why patron requesting book - Adding form controls to opac submission form and staf client edit form. - Adding display of patron reason for suggestion on opac list - Adding function for pulling an authorized value description using the category and value TODO: Add some default authorised values --- C4/Koha.pm | 22 ++++++++++++++++++++ .../prog/en/modules/suggestion/suggestion.tmpl | 3 ++ .../prog/en/modules/opac-suggestions.tmpl | 3 ++ opac/opac-suggestions.pl | 7 +++++- suggestion/suggestion.pl | 3 ++ 5 files changed, 37 insertions(+), 1 deletions(-) diff --git a/C4/Koha.pm b/C4/Koha.pm index a63a3a5..d10c52e 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -57,6 +57,7 @@ BEGIN { &GetAuthorisedValueCategories &GetKohaAuthorisedValues &GetKohaAuthorisedValuesFromField + &GetKohaAuthorisedValueLib &GetAuthValCode &GetNormalizedUPC &GetNormalizedISBN @@ -1214,6 +1215,27 @@ sub xml_escape { return $str; } +=head2 GetKohaAuthorisedValueLib + +Takes $category, $authorised_value as parameters. + +If $opac parameter is set to a true value, displays OPAC descriptions rather than normal ones when they exist. + +Returns authorised value description + +=cut + +sub GetKohaAuthorisedValueLib { + my ($category,$authorised_value,$opac) = @_; + my $value; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare("select lib, lib_opac from authorised_values where category=? and authorised_value=?"); + $sth->execute($category,$authorised_value); + my $data = $sth->fetchrow_hashref; + $value = ($opac && $$data{'lib_opac'}) ? $$data{'lib_opac'} : $$data{'lib'}; + return $value; +} + =head2 display_marc_indicators my $display_form = C4::Koha::display_marc_indicators($field); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl index 7489cb6..4cd86ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl @@ -116,6 +116,9 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di +
  • diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl index ab5b753..483551b 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl @@ -91,6 +91,9 @@ $.tablesorter.addParser({ +
  • " /> Cancel
    diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl index fc9ce51..75d0791 100755 --- a/opac/opac-suggestions.pl +++ b/opac/opac-suggestions.pl @@ -115,17 +115,22 @@ foreach my $suggestion(@$suggestions_loop) { } else { $suggestion->{'showcheckbox'} = 0; } + if($suggestion->{'patronreason'}){ + $suggestion->{'patronreason'} = GetKohaAuthorisedValueLib("OPAC_SUG",$suggestion->{'patronreason'},1); + } } +my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG"); + $template->param( %$suggestion, itemtypeloop=> $supportlist, suggestions_loop => $suggestions_loop, + patron_reason_loop => $patron_reason_loop, showall => $allsuggestions, "op_$op" => 1, suggestionsview => 1, ); - output_html_with_http_headers $input, $cookie, $template->output; diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl index 57a1ba7..73f5ff5 100755 --- a/suggestion/suggestion.pl +++ b/suggestion/suggestion.pl @@ -259,6 +259,9 @@ foreach my $support(@$supportlist){ } $template->param(itemtypeloop=>$supportlist); +my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG",$$suggestion_ref{'patronreason'}); +$template->param(patron_reason_loop=>$patron_reason_loop); + #Budgets management my $searchbudgets={ budget_branchcode=>$branchfilter} if $branchfilter; my $budgets = GetBudgets($searchbudgets); -- 1.7.1