[Koha-patches] [PATCH] Extend syspref SearchMyLibraryFirst to staff client

Michael Hafen mdhafen at washk12.org
Tue May 27 20:24:33 CEST 2008 

---
 C4/Auth.pm                                         |    1 +
 catalogue/search.pl                                |    4 +++-
 .../prog/en/includes/bookfund-admin-search.inc     |    3 +++
 .../intranet-tmpl/prog/en/includes/cat-search.inc  |    3 +++
 .../prog/en/includes/checkin-search.inc            |    3 +++
 .../intranet-tmpl/prog/en/includes/circ-search.inc |    3 +++
 .../prog/en/includes/cities-admin-search.inc       |    3 +++
 .../prog/en/includes/currencies-admin-search.inc   |    3 +++
 .../prog/en/includes/letters-search.inc            |    3 +++
 .../intranet-tmpl/prog/en/includes/mainmenu.inc    |    3 +++
 .../prog/en/includes/patron-search.inc             |    5 ++++-
 .../prog/en/includes/patrons-admin-search.inc      |    3 +++
 .../prog/en/includes/printers-admin-search.inc     |    3 +++
 .../prog/en/includes/roadtype-admin-search.inc     |    3 +++
 .../prog/en/includes/serials-search.inc            |    3 +++
 .../prog/en/includes/stopwords-admin-search.inc    |    3 +++
 .../prog/en/includes/suggestions-add-search.inc    |    3 +++
 .../prog/en/includes/sysprefs-admin-search.inc     |    3 +++
 .../prog/en/includes/z3950-admin-search.inc        |    3 +++
 .../prog/en/modules/catalogue/advsearch.tmpl       |    2 +-
 .../prog/en/modules/intranet-main.tmpl             |    3 +++
 opac/opac-search.pl                                |    4 +++-
 22 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index a60a05a..7d330ac 100755
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -246,6 +246,7 @@ sub get_template_and_user {
             KohaAdminEmailAddress   => "" . C4::Context->preference("KohaAdminEmailAddress"),
             IntranetmainUserblock   => C4::Context->preference("IntranetmainUserblock"),
             IndependantBranches     => C4::Context->preference("IndependantBranches"),
+            mylibraryfirst   => C4::Context->preference("SearchMyLibraryFirst"),
 			CircAutocompl => C4::Context->preference("CircAutocompl"),
 			FRBRizeEditions => C4::Context->preference("FRBRizeEditions"),
 			AmazonSimilarItems => C4::Context->preference("AmazonSimilarItems"),
diff --git a/catalogue/search.pl b/catalogue/search.pl
index 6c37db7..e12b78e 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -205,11 +205,13 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) {
 #}
 
 # load the branches
+my $mybranch = ( C4::Context->preference( 'SearchMyLibraryFirst' ) ) ? C4::Context->userenv->{branch} : '';
 my $branches = GetBranches( C4::Context->preference('IndependantBranches') );
 my @branch_loop;
 
 for my $branch_hash (sort keys %$branches) {
-    push @branch_loop, {value => "$branch_hash" , branchname => $branches->{$branch_hash}->{'branchname'}, };
+    my $selected = ( $mybranch eq $branch_hash );
+    push @branch_loop, {value => "$branch_hash" , branchname => $branches->{$branch_hash}->{'branchname'}, selected => $selected };
 }
 
 my $categories = GetBranchCategories(undef,'searchdomain');
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
index 97790c9..c12cec2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
@@ -103,6 +103,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index d6626ae..e1b8644 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -84,6 +84,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
 				<input type="submit" class="submit" value="Submit" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 		</form>
 	</div>
 	<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index 0c04e8f..4ba00ee 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -83,6 +83,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     <p class="tip">Enter search keywords:</p>
     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
         <input type="text" name="q" id="search-form" size="40" />
+	<!-- TMPL_IF name="mylibraryfirst" -->
+	<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+	<!-- /TMPL_IF -->
         <input type="submit" class="submit" value="Submit"/>
     </form>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 7f80ce2..6a475c5 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -81,6 +81,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
     <p class="tip">Enter search keywords:</p>
     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
         <input type="text" name="q" id="search-form" size="40" accesskey="q" />
+	<!-- TMPL_IF name="mylibraryfirst" -->
+	<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+	<!-- /TMPL_IF -->
         <input type="submit" class="submit" value="Submit"/>
     </form>
 </div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index fb184e8..6c8d55b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -79,6 +79,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index ca5446c..ca1b031 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -79,6 +79,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index d17be51..749f6d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -79,6 +79,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" name="op" value="Submit"  class="submit" />
 		</form>
 	</div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
index cb20d6c..0585555 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mainmenu.inc
@@ -36,6 +36,9 @@
                         <label for="navkeyword">
                             Search:&nbsp;
                         </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
+			<!-- TMPL_IF name="mylibraryfirst" -->
+			<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+			<!-- /TMPL_IF -->
                         <input type="submit" value=" OK " class="submit" />
                         </form>
                      </li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 4f79b40..9439e22 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -84,6 +84,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" name="op" id="opac-submit" value="Submit" class="submit" />
 		</form>
 	</div><!-- /TMPL_IF -->
@@ -93,4 +96,4 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 			<!-- TMPL_IF NAME="CAN_user_catalogue" --><li><a href="/cgi-bin/koha/catalogue/advsearch.pl#catalog_search">Search the Catalog</a></li><!-- /TMPL_IF -->
 			</ul>	
 </div>
-<!-- End Patrons Resident Search Box -->
\ No newline at end of file
+<!-- End Patrons Resident Search Box -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index 78cade1..73a6af6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -79,6 +79,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div><!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
index cb00c56..c5399e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/printers-admin-search.inc
@@ -80,6 +80,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
index 307aee0..1ba9a32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/roadtype-admin-search.inc
@@ -80,6 +80,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index 12504a7..443e6fb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -78,6 +78,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
index 3b56167..9bf2623 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stopwords-admin-search.inc
@@ -79,6 +79,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index a027dba..714a500 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -82,6 +82,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
index 13f8e2c..efe2228 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-admin-search.inc
@@ -80,6 +80,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit" class="submit" />
 		</form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index 5be6d9d..38dda3e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -80,6 +80,9 @@ YAHOO.util.Event.onContentReady("header_search", function() {
 	<p class="tip">Enter search keywords:</p>
 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
 			 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="form-text" />
+		<!-- TMPL_IF name="mylibraryfirst" -->
+				<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+		<!-- /TMPL_IF -->
 				<input type="submit" value="Submit"  class="submit" />
 		</form>
 	</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index 4511761..4f6a6ad 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -253,7 +253,7 @@
         <label for="branchloop">Individual Libraries:</label><select name="limit" id="branchloop" onchange='if(this.value != ""){document.getElementById("categoryloop").disabled=true;} else {document.getElementById("categoryloop").disabled=false;}'>
         <option value="">All Libraries</option>
         <!-- TMPL_LOOP NAME="branchloop" -->
-        <option value="branch:<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
+        <option value="branch:<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option>
         <!-- /TMPL_LOOP -->
         </select>
     <!-- <input type="hidden" name="limit" value="branch: MAIN" /> -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index da92b6e..8640117 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -45,6 +45,9 @@
                         <label for="navkeyword">
                             Search catalogue:&nbsp;
                         </label><input type="text" id="navkeyword" name="q" size="10" accesskey="q" />
+			<!-- TMPL_IF name="mylibraryfirst" -->
+			<input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+			<!-- /TMPL_IF -->
                         <input type="submit" value=" OK " class="submit" />
                         </form>
                      </li>
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 265261b..cfa6201 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -111,11 +111,13 @@ if (C4::Context->preference('TagsEnabled')) {
 #}
 
 # load the branches
+my $mybranch = ( C4::Context->preference( 'SearchMyLibraryFirst' ) && C4::Context->userenv ) ? C4::Context->userenv->{branch} : '';
 my $branches = GetBranches();
 my @branch_loop;
 
 for my $branch_hash (sort keys %$branches) {
-    push @branch_loop, {value => "$branch_hash" , branchname => $branches->{$branch_hash}->{'branchname'}, };
+    my $selected = ( $mybranch eq $branch_hash );
+    push @branch_loop, {value => "$branch_hash" , branchname => $branches->{$branch_hash}->{'branchname'}, selected => $selected};
 }
 
 my $categories = GetBranchCategories(undef,'searchdomain');
-- 
1.5.4.3

More information about the Koha-patches mailing list