From a5a9dc4c8e4c7c4b3bfbc283b3e8c8f812363160 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 17 Mar 2014 12:36:55 +0100 Subject: [PATCH] Bug 766: Use a tt include instead of a method in the AV plugin --- Koha/Template/Plugin/AuthorisedValues.pm | 25 ++--------------- .../prog/en/includes/av-build-dropbox.inc | 29 ++++++++++++++++++++ .../prog/en/modules/members/memberentrygen.tt | 5 ++-- 3 files changed, 34 insertions(+), 25 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc diff --git a/Koha/Template/Plugin/AuthorisedValues.pm b/Koha/Template/Plugin/AuthorisedValues.pm index 3cfdd55..d899f60 100644 --- a/Koha/Template/Plugin/AuthorisedValues.pm +++ b/Koha/Template/Plugin/AuthorisedValues.pm @@ -44,28 +44,9 @@ sub GetByCode { return encode( 'UTF-8', GetAuthorisedValueByCode( $category, $code, $opac ) ); } -sub BuildDropbox { - my ( $self, $name, $category, $default, $params ) = @_; - my $class = $params->{class}; - my $avs = C4::Koha::GetAuthvalueDropbox($category, $default); - my $size = $params->{size} || 20; - my $html; - if ( @$avs ) { - $html = qq||; - } else { - $html .= qq||; - - } - - return encode( 'UTF-8', $html ); +sub GetAuthValueDropbox { + my ( $self, $category, $default ) = @_; + return C4::Koha::GetAuthvalueDropbox($category, $default); } 1; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc new file mode 100644 index 0000000..5002842 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/av-build-dropbox.inc @@ -0,0 +1,29 @@ +[% USE AuthorisedValues %] +[%# + Parameters: + name: tthe name of the select element + category: the authorised value category + default: the default authorised value to select + class: the css class of the select element + size: the size to use for the input (generated if not authorised value category exist). +%] + +[% SET avs = AuthorisedValues.GetAuthValueDropbox( category, default ) %] +[% DEFAULT + class = '' + size = 20 +%] + +[% IF avs %] + +[% ELSE %] + +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 8cf58a2..174b791 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1,4 +1,3 @@ -[% USE AuthorisedValues %] [% IF ( opduplicate ) %][% SET focusAction = "clearDupe" %][% END %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] @@ -959,7 +958,7 @@ - [% AuthorisedValues.BuildDropbox("sort1", "Bsort1", sort1, { class => focusAction, size => 20 } ) %] + [% PROCESS 'av-build-dropbox.inc' name="sort1", category="Bsort1", default=sort1, class=focusAction, size = 20 %] [% IF ( mandatorysort1 ) %]Required[% END %] [% END %] @@ -971,7 +970,7 @@ - [% AuthorisedValues.BuildDropbox("sort2", "Bsort2", sort2, { class => focusAction, size => 20 } ) %] + [% PROCESS 'av-build-dropbox.inc' name="sort2", category="Bsort2", default=sort2, class=focusAction, size = 20 %] [% IF ( mandatorysort2 ) %]Required[% END %] [% END %] -- 1.7.10.4