Bugzilla – Attachment 13993 Details for
Bug 7674
Separate tabs for my holdings and others holdings
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 7674 - Followup - Add missing right-hand curly bracket
SIGNED-OFF-Bug-7674---Followup---Add-missing-right.patch (text/plain), 3.34 KB, created by
Katrin Fischer
on 2012-12-11 07:36:33 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 7674 - Followup - Add missing right-hand curly bracket
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2012-12-11 07:36:33 UTC
Size:
3.34 KB
patch
obsolete
>From ef95381f57b592fd677fbffa83fad5e107a1a201 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 2 Nov 2012 08:11:00 -0400 >Subject: [PATCH] [SIGNED-OFF] Bug 7674 - Followup - Add missing right-hand > curly bracket > >Signed-off-by: Julian Maurice <julian.maurice@biblibre.com> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> > >All tests and perlcritic pass. > >Tests: > >Database update >- OK, system preferences were added correctly >- Version number of updatedatabase was only XXX, changed to 3.11.00.XX > >OPAC >1) Detail page >- OK, no visible change when OpacSeparateHoldings is turned off >- OK, switching OpacSeparateHoldingsBranch works correctly >- OK, shelf browser opens in correct tab >- OK, only one tab shows when logged out > >INTRANET >2) Detail page >- OK, no visible change when SeparateHoldings is turned off >- Number of items is missing on top of the tabs > >Notes: >- database update doesn't include bug number >- other holdings tab does show when there are 0 items at other branches, > it could be hidden in those cases >- if there are over 50 items in the holdings or Other holdings tab, the > warning and link 'This record has many physical items. Click here > to view them all.' is only shown for the first tab. >- closing the shelf browser on the second tab goes back to first tab >- number ofitems is missing on top of the tabs >- there are lots of indentation changes in the second patch, > this makes it very hard to see the changes, please provide separate > patches in the future >--- > catalogue/detail.pl | 14 ++++++++------ > installer/data/mysql/updatedatabase.pl | 1 - > 2 files changed, 8 insertions(+), 7 deletions(-) > >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index b20e4c5..50d966f 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -264,14 +264,16 @@ foreach my $item (@items) { > $item->{hosttitle} = GetBiblioData($item->{biblionumber})->{title}; > } > >- #count if item is used in analytical bibliorecords >- my $countanalytics= GetAnalyticsCount($item->{itemnumber}); >- if ($countanalytics > 0){ >- $analytics_flag=1; >- $item->{countanalytics} = $countanalytics; >- } >+ #count if item is used in analytical bibliorecords >+ my $countanalytics= GetAnalyticsCount($item->{itemnumber}); >+ if ($countanalytics > 0){ >+ $analytics_flag=1; >+ $item->{countanalytics} = $countanalytics; >+ } >+ > if (defined($item->{'materials'}) && $item->{'materials'} =~ /\S/){ > $materials_flag = 1; >+ } > > if ($currentbranch and $currentbranch ne "NO_LIBRARY_SET" > and C4::Context->preference('SeparateHoldings')) { >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 57e815a..42d2fd3 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -6112,7 +6112,6 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > SetVersion($DBversion); > } > >-<<<<<<< HEAD > $DBversion = "3.11.00.005"; > if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { > $dbh->do(qq{CREATE TABLE borrower_attribute_types_branches(bat_code VARCHAR(10), b_branchcode VARCHAR(10),FOREIGN KEY (bat_code) REFERENCES borrower_attribute_types(code) ON DELETE CASCADE,FOREIGN KEY (b_branchcode) REFERENCES branches(branchcode) ON DELETE CASCADE ) ENGINE=INNODB DEFAULT CHARSET=utf8;}); >-- >1.7.9.5
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 7674
:
12416
|
12417
|
12418
|
12433
|
12749
|
12750
|
13002
|
13003
|
13189
|
13190
|
13191
|
13204
|
13205
|
13206
|
13207
|
13215
|
13832
|
13833
|
13834
|
13835
|
13990
|
13991
|
13992
|
13993
|
14082
|
14111
|
14528
|
16493
|
16502