[Koha-cvs] koha/C4 Auth.pm Search.pm [dev_week]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/07/23 22:25:38

Modified files:
	C4             : Auth.pm Search.pm 

Log message:
	makes default_facets available through a syspref and on every 
	page.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.36.2.18.2.2&r2=1.36.2.18.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.99.2.11.2.10&r2=1.99.2.11.2.11

Patches:
Index: Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.36.2.18.2.2
retrieving revision 1.36.2.18.2.3
diff -u -b -r1.36.2.18.2.2 -r1.36.2.18.2.3
--- Auth.pm	13 Jul 2006 19:05:31 -0000	1.36.2.18.2.2
+++ Auth.pm	23 Jul 2006 22:25:38 -0000	1.36.2.18.2.3
@@ -219,6 +219,7 @@
 				TemplateEncoding => C4::Context->preference("TemplateEncoding"),
 				opacuserlogin => C4::Context->preference("opacuserlogin"),
 				opacbookbag => C4::Context->preference("opacbookbag"),
+				facets => C4::Context->preference("default_facets"),
 		);
 	}
 	$template->param(

Index: Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.10
retrieving revision 1.99.2.11.2.11
diff -u -b -r1.99.2.11.2.10 -r1.99.2.11.2.11
--- Search.pm	23 Jul 2006 22:08:18 -0000	1.99.2.11.2.10
+++ Search.pm	23 Jul 2006 22:25:38 -0000	1.99.2.11.2.11
@@ -35,7 +35,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.99.2.11.2.10 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.11 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -4380,11 +4380,13 @@
 
 	# POPULATE DEFAULT FACETS
 	my $default_facets = C4::Context->preference("default_facets");
+	# if we've got facets of our own, ignore the default ones
 	if (($subject_facets) or ($series_facets) or ($author_facets)) {
 	$facets.="var DEFAULT_TREE = '';\n";
 	}
+	# otherwise, load the defaults up
 	else {
-	$facets.="var DEFAULT_TREE = '$default_facets';\n";
+		$facets.="$default_facets\n";
 	}
 	# POPULATE SUBJECT FACETS
     if ($subject_facets) {
@@ -4412,7 +4414,7 @@
         ]];\n";
     }
 	else { $facets.="var AUTHOR_TREE = '';\n"; } 
-	#$facets.="];";
+    
     return(undef,$numresults,$facets, at results);
 }