Bugzilla – Attachment 41476 Details for
Bug 11559
Professional cataloger's interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11559: (followup) Fix error when all servers are deselected
Bug-11559-followup-Fix-error-when-all-servers-are-.patch (text/plain), 3.39 KB, created by
Jesse Weaver
on 2015-08-13 17:08:23 UTC
(
hide
)
Description:
Bug 11559: (followup) Fix error when all servers are deselected
Filename:
MIME Type:
Creator:
Jesse Weaver
Created:
2015-08-13 17:08:23 UTC
Size:
3.39 KB
patch
obsolete
>From 2874c025b0a3d7b9e3eff6dbf7dd2aaf433039f9 Mon Sep 17 00:00:00 2001 >From: Jesse Weaver <pianohacker@gmail.com> >Date: Thu, 6 Aug 2015 15:56:36 -0600 >Subject: [PATCH] Bug 11559: (followup) Fix error when all servers are > deselected > >--- > koha-tmpl/intranet-tmpl/lib/koha/cateditor/search.js | 4 +++- > .../intranet-tmpl/prog/en/includes/cateditor-ui.inc | 17 ++++++++++------- > 2 files changed, 13 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/search.js b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/search.js >index 341da39..bbddc23 100644 >--- a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/search.js >+++ b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/search.js >@@ -75,6 +75,8 @@ define( [ 'marc-record' ], function( MARC ) { > if ( info.checked ) Search.includedServers.push( id ); > } ); > >+ if ( Search.includedServers.length == 0 ) return false; >+ > $.get( > '/cgi-bin/koha/svc/cataloguing/metasearch', > { >@@ -106,7 +108,7 @@ define( [ 'marc-record' ], function( MARC ) { > Fetch: function( options ) { > if ( !_last ) return; > $.extend( _last.options, options ); >- Search.Run( _last.servers, _last.q, _last.options ); >+ return Search.Run( _last.servers, _last.q, _last.options ); > } > }; > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >index 3b71d6a..0616536 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc >@@ -962,13 +962,14 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > } ); > > $( document ).on( 'click', 'a.search-nav', function() { >- $("#search-overlay").show(); >- Search.Fetch( { offset: $( this ).data( 'offset' ) } ); >+ if ( Search.Fetch( { offset: $( this ).data( 'offset' ) } ) ) { >+ $("#search-overlay").show(); >+ } >+ > return false; > }); > > $( document ).on( 'click', 'th[data-sort-label]', function() { >- $("#search-overlay").show(); > var direction; > > if ( $( this ).hasClass( 'sorting_asc' ) ) { >@@ -977,9 +978,12 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > direction = 'asc'; > } > >- showSearchSorting( $( this ).data( 'sort-label' ), direction ); >+ if ( Search.Fetch( { sort_key: $( this ).data( 'sort-label' ), sort_direction: direction } ) ) { >+ showSearchSorting( $( this ).data( 'sort-label' ), direction ); >+ >+ $("#search-overlay").show(); >+ } > >- Search.Fetch( { sort_key: $( this ).data( 'sort-label' ), sort_direction: direction } ); > return false; > }); > >@@ -987,9 +991,8 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr > var server = z3950Servers[ $( this ).closest('li').data('server-id') ]; > server.checked = this.checked; > >- if ( $('#search-results-ui').is( ':visible' ) ) { >+ if ( $('#search-results-ui').is( ':visible' ) && Search.Fetch() ) { > $("#search-overlay").show(); >- Search.Fetch(); > } > } ); > >-- >2.4.6
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11559
:
26069
|
26070
|
26071
|
26104
|
26653
|
26654
|
27140
|
27141
|
27142
|
27757
|
27758
|
27759
|
27760
|
27761
|
27900
|
27901
|
27902
|
27993
|
27995
|
34458
|
34459
|
34460
|
34461
|
34462
|
34463
|
36243
|
36244
|
36245
|
36246
|
36247
|
36248
|
36455
|
38533
|
38534
|
38535
|
38536
|
38537
|
38538
|
38539
|
40153
|
40154
|
40155
|
40543
|
40555
|
40556
|
40557
|
40558
|
40811
|
40812
|
40813
|
40814
|
40815
|
41425
|
41453
|
41476
|
42373
|
43261
|
43547
|
43614
|
43615
|
43616
|
43617
|
43618
|
43619
|
43620
|
43621
|
43622
|
43623
|
43703
|
43704
|
43705
|
43706
|
43707
|
43708
|
43709
|
43710
|
43711
|
43712
|
43713
|
43772
|
43790
|
43883
|
43969
|
44016
|
44018
|
44022
|
44023
|
44024
|
44025
|
44026
|
44027
|
44028
|
44029
|
44030
|
44031
|
44032
|
44033
|
44034
|
44035
|
44036