# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA 02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
use strict;
use warnings;
use C4::ClassSource;
use C4::Log;
use C4::Output;
-use C4::Bookfund qw(GetLocalCurrency);
+use C4::Templates;
+use C4::Budgets qw(GetCurrency);
use File::Spec;
use IO::File;
use YAML::Syck qw();
sub GetTab {
my ( $input, $tab ) = @_;
- my $tab_template = C4::Output::gettemplate( 'admin/preferences/' . $tab . '.pref', 'intranet', $input );
+ my $tab_template = C4::Templates::gettemplate( 'admin/preferences/' . $tab . '.pref', 'intranet', $input );
+ my $active_currency = GetCurrency();
+ my $local_currency;
+ if ($active_currency) {
+ $local_currency = $active_currency->{currency};
+ }
$tab_template->param(
- local_currency => GetLocalCurrency()->{'currency'}, # currency code is used, because we do not know how a given currency is formatted.
+ local_currency => $local_currency, # currency code is used, because we do not know how a given currency is formatted.
);
return YAML::Syck::Load( $tab_template->output() );
if ( $options{'class'} && $options{'class'} eq 'password' ) {
$chunk->{'input_type'} = 'password';
+ } elsif ( $options{'class'} && $options{'class'} eq 'date' ) {
+ $chunk->{'dateinput'} = 1;
} elsif ( $options{'type'} && ( $options{'type'} eq 'opac-languages' || $options{'type'} eq 'staff-languages' ) ) {
my $current_languages = { map { +$_, 1 } split( /\s*,\s*/, $value ) };
}
sub TransformPrefsToHTML {
- my ( $data, $highlighted_pref ) = @_;
+ my ( $data, $searchfield ) = @_;
my @lines;
my $dbh = C4::Context->dbh;
my $name = $piece->{'pref'};
if ( $name ) {
- my $row = $dbh->selectrow_hashref( "SELECT value FROM systempreferences WHERE variable = ?", {}, $name );
+ my $row = $dbh->selectrow_hashref( "SELECT value, type FROM systempreferences WHERE variable = ?", {}, $name );
my $value;
- if ( !defined( $row ) && defined( $piece->{'default'} ) ) {
+ if ( ( !defined( $row ) || ( !defined( $row->{'value'} ) && $row->{'type'} ne 'YesNo' ) ) && defined( $piece->{'default'} ) ) {
$value = $piece->{'default'};
} else {
$value = $row->{'value'};
}
my $chunk = _get_chunk( $value, %$piece );
- $chunk->{'highlighted'} = 1 if ( $highlighted_pref && $name =~ /$highlighted_pref/ );
+ # No highlighting of inputs yet, but would be useful
+ $chunk->{'highlighted'} = 1 if ( $searchfield && $name =~ /^$searchfield$/i );
push @chunks, $chunk;
- push @names, { name => $name, highlighted => ( $highlighted_pref && ( $name =~ /$highlighted_pref/i ? 1 : 0 ) ) };
+
+ my $name_entry = { name => $name };
+ if ( $searchfield ) {
+ if ( $name =~ /^$searchfield$/i ) {
+ $name_entry->{'jumped'} = 1;
+ } elsif ( $name =~ /$searchfield/i ) {
+ $name_entry->{'highlighted'} = 1;
+ }
+ }
+ push @names, $name_entry;
} else {
push @chunks, $piece;
}
}
}
- push @lines, { CHUNKS => \@chunks, NAMES => \@names };
+ push @lines, { CHUNKS => \@chunks, NAMES => \@names, is_group_title => 0 };
}
}
sub _get_pref_files {
my ( $input, $open_files ) = @_;
- my ( $htdocs, $theme, $lang, undef ) = C4::Output::_get_template_file( 'admin/preferences/admin.pref', 'intranet', $input );
+ my ( $htdocs, $theme, $lang, undef ) = C4::Templates::_get_template_file( 'admin/preferences/admin.pref', 'intranet', $input );
my %results;
return %results;
}
-sub JumpPref {
- my ( $input, $tab, $jumpfield ) = @_;
-
- return ( $tab ) if ( $jumpfield !~ /^[a-zA-Z_0-9-]+$/ );
-
- my %tab_files = _get_pref_files( $input, 1 );
-
- while ( my ( $tab, $tabfile ) = each %tab_files ) {
- while ( <$tabfile> ) {
- return ( $tab, $1 ) if ( /pref: ($jumpfield)/i );
- }
-
- close $tabfile;
- }
-
- return ( "", "" );
-}
-
sub SearchPrefs {
my ( $input, $searchfield ) = @_;
my @tabs;
my %tab_files = _get_pref_files( $input );
our @terms = split( /\s+/, $searchfield );
- sub matches {
- my ( $text ) = @_;
-
- return !grep( { $text !~ /$_/i } @terms );
- }
-
foreach my $tab_name ( keys %tab_files ) {
my $data = GetTab( $input, $tab_name );
my $title = ( keys( %$data ) )[0];
my $matched_groups;
while ( my ( $group_title, $contents ) = each %$tab ) {
- if ( matches( $group_title ) ) {
+ if ( matches( $group_title, \@terms ) ) {
$matched_groups->{$group_title} = $contents;
next;
}
foreach my $piece ( @$line ) {
if ( ref( $piece ) eq 'HASH' ) {
- if ( ref( $piece->{'choices'} ) eq 'HASH' && grep( { $_ && matches( $_ ) } values( %{ $piece->{'choices'} } ) ) ) {
+ if ( !$piece->{'pref'} ){ next; }
+ if ( $piece->{'pref'} =~ /^$searchfield$/i ) {
+ my ( undef, $LINES ) = TransformPrefsToHTML( $data, $searchfield );
+
+ return { search_jumped => 1, tab => $tab_name, tab_title => $title, LINES => $LINES };
+ } elsif ( matches( $piece->{'pref'}, \@terms) ) {
$matched = 1;
- } elsif ( matches( $piece->{'pref'} ) ) {
+ } elsif ( ref( $piece->{'choices'} ) eq 'HASH' && grep( { $_ && matches( $_, \@terms ) } values( %{ $piece->{'choices'} } ) ) ) {
$matched = 1;
}
- } elsif ( matches( $piece ) ) {
+ } elsif ( matches( $piece, \@terms ) ) {
$matched = 1;
}
last if ( $matched );
return @tabs;
}
+sub matches {
+ my ( $text, $terms ) = @_;
+ if ( $text ) { return !grep( { $text !~ /$_/i } @$terms ); }
+}
+
my $dbh = C4::Context->dbh;
our $input = new CGI;
$lang = $template->param( 'lang' );
my $op = $input->param( 'op' ) || '';
my $tab = $input->param( 'tab' );
-$tab ||= 'local-use';
+$tab ||= 'acquisitions'; # Ideally this should be "local-use" but preferences.pl
+ # does not presently support local use preferences
my $highlighted;
print $input->redirect( '/cgi-bin/koha/admin/preferences.pl?tab=' . $tab );
exit;
-} elsif ( $op eq 'jump' ) {
- my $jumpfield = $input->param( 'jumpfield' );
- $template->param( jumpfield => $jumpfield );
-
- my $new_tab;
- ( $new_tab, $highlighted ) = JumpPref( $input, $tab, $jumpfield );
-
- if ( $highlighted ) {
- $tab = $new_tab;
- } else {
- $template->param( jump_not_found => 1 );
- }
}
my @TABS;
if ( @TABS ) {
$tab = ''; # No need to load a particular tab, as we found results
+ $template->param( search_jumped => 1 ) if ( $TABS[0]->{'search_jumped'} );
} else {
$template->param(
search_not_found => 1,
}
if ( $tab ) {
- my ( $tab_title, $LINES ) = TransformPrefsToHTML( GetTab( $input, $tab ), $highlighted, ( $op eq 'jump' ) );
+ my ( $tab_title, $LINES ) = TransformPrefsToHTML( GetTab( $input, $tab ), $highlighted );
push @TABS, { tab_title => $tab_title, LINES => $LINES };
$template->param(
projects / koha.git / blobdiff