Bugzilla – Attachment 2902 Details for
Bug 5523
Display list of items which are to be cataloged in the cataloguing home page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Display list of items which are to be cataloged in the cataloguing home page.
0001-Bug-5523-Display-list-of-items-which-are-to-be-catal.patch (text/plain), 10.80 KB, created by
Amit Gupta
on 2010-12-22 08:02:56 UTC
(
hide
)
Description:
Display list of items which are to be cataloged in the cataloguing home page.
Filename:
MIME Type:
Creator:
Amit Gupta
Created:
2010-12-22 08:02:56 UTC
Size:
10.80 KB
patch
obsolete
>From 770dc54a419bb3e9db145c59e529b53123a03445 Mon Sep 17 00:00:00 2001 >From: Amit Gupta <amit.gupta@osslabs.biz> >Date: Wed, 22 Dec 2010 13:28:45 +0530 >Subject: [PATCH] Bug 5523 - Display list of items which are to be cataloged in the cataloguing home page. > >--- > C4/Auth.pm | 1 + > C4/Biblio.pm | 24 ++++++++++++++++++++ > cataloguing/addbooks.pl | 5 ++++ > installer/data/mysql/en/mandatory/sysprefs.sql | 3 +- > installer/data/mysql/updatedatabase.pl | 7 +++++- > .../prog/en/includes/cataloguing-menu.inc | 7 +++++ > .../en/modules/admin/preferences/cataloguing.pref | 6 +++++ > .../prog/en/modules/cataloguing/addbooks.tmpl | 4 ++- > kohaversion.pl | 2 +- > 9 files changed, 55 insertions(+), 4 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/cataloguing-menu.inc > >diff --git a/C4/Auth.pm b/C4/Auth.pm >index 2f13b86..83a05cb 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -438,6 +438,7 @@ sub get_template_and_user { > reviewson => C4::Context->preference("reviewson"), > suggestion => "" . C4::Context->preference("suggestion"), > virtualshelves => "" . C4::Context->preference("virtualshelves"), >+ catalgouinginprocess => C4::Context->preference("catalgouinginprocess"), > OPACSerialIssueDisplayCount => C4::Context->preference("OPACSerialIssueDisplayCount"), > OpacAddMastheadLibraryPulldown => C4::Context->preference("OpacAddMastheadLibraryPulldown"), > OPACXSLTDetailsDisplay => C4::Context->preference("OPACXSLTDetailsDisplay"), >diff --git a/C4/Biblio.pm b/C4/Biblio.pm >index c3a3094..41504b6 100644 >--- a/C4/Biblio.pm >+++ b/C4/Biblio.pm >@@ -84,6 +84,7 @@ BEGIN { > &GetFrameworkCode > &GetPublisherNameFromIsbn > &TransformKohaToMarc >+ &GetInprocCount > > &CountItemsIssued > ); >@@ -366,6 +367,29 @@ sub ModBiblioframework { > return 1; > } > >+=head2 GetInprocCount >+ >+ $count= &GetInprocCount() >+ >+Count of items in PROC shelving location. . >+ >+=cut >+ >+sub GetInprocCount { >+ if (C4::Context->preference('NoZebra')) { >+ # Read the index Koha-Auth-Number for this authid and count the lines >+ my $result = C4::Search::NZanalyse("location=PROC"); >+ my @tab = split /;/,$result; >+ return scalar @tab; >+ } else { >+ ### ZOOM search here >+ my $query; >+ $query= "location=PROC"; >+ my ($err,$res,$result) = C4::Search::SimpleSearch($query,0,10); >+ return ($result); >+ } >+} >+ > =head2 DelBiblio > > my $error = &DelBiblio($dbh,$biblionumber); >diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl >index 4c8a989..e8b086d 100755 >--- a/cataloguing/addbooks.pl >+++ b/cataloguing/addbooks.pl >@@ -135,5 +135,10 @@ $template->param( > z3950_search_params => C4::Search::z3950_search_args($query), > ); > >+if (C4::Context->preference('catalgouinginprocess')) { >+#Count of items in PROC shelving location. >+$template->param('inproccount' =>GetInprocCount()); >+} >+ > output_html_with_http_headers $input, $cookie, $template->output; > >diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql >index 94d5de1..ae8d9e3 100644 >--- a/installer/data/mysql/en/mandatory/sysprefs.sql >+++ b/installer/data/mysql/en/mandatory/sysprefs.sql >@@ -163,7 +163,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('language','en','Set the default language in the staff client.',NULL,'Languages'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QueryAutoTruncate',1,'If ON, query truncation is enabled by default',NULL,'YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('QueryRemoveStopwords',0,'If ON, stopwords listed in the Administration area will be removed from queries',NULL,'YesNo'); >-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoZebraIndexes','\'title\' => \'130a,210a,222a,240a,243a,245a,245b,246a,246b,247a,247b,250a,250b,440a,830a\',\r\n\'author\' => \'100a,100b,100c,100d,110a,111a,111b,111c,111d,245c,700a,710a,711a,800a,810a,811a\',\r\n\'isbn\' => \'020a\',\r\n\'issn\' => \'022a\',\r\n\'lccn\' => \'010a\',\r\n\'biblionumber\' => \'999c\',\r\n\'itemtype\' => \'942c\',\r\n\'publisher\' => \'260b\',\r\n\'date\' => \'260c\',\r\n\'note\' => \'500a, 501a,504a,505a,508a,511a,518a,520a,521a,522a,524a,526a,530a,533a,538a,541a,546a,555a,556a,562a,563a,583a,585a,582a\',\r\n\'subject\' => \'600*,610*,611*,630*,650*,651*,653*,654*,655*,662*,690*\',\r\n\'dewey\' => \'082\',\r\n\'bc\' => \'952p\',\r\n\'callnum\' => \'952o\',\r\n\'an\' => \'6009,6109,6119\',\r\n\'homebranch\' => \'952a,952c\'','Enter a specific hash for NoZebra indexes. Enter : \'indexname\' => \'100a,245a,500*\',\'index2\' => \'...\'','70|10','Textarea'); >+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('NoZebraIndexes','\'title\' => \'130a,210a,222a,240a,243a,245a,245b,246a,246b,247a,247b,250a,250b,440a,830a\',\r\n\'author\' => \'100a,100b,100c,100d,110a,111a,111b,111c,111d,245c,700a,710a,711a,800a,810a,811a\',\r\n\'isbn\' => \'020a\',\r\n\'issn\' => \'022a\',\r\n\'lccn\' => \'010a\',\r\n\'biblionumber\' => \'999c\',\r\n\'itemtype\' => \'942c\',\r\n\'publisher\' => \'260b\',\r\n\'date\' => \'260c\',\r\n\'note\' => \'500a, 501a,504a,505a,508a,511a,518a,520a,521a,522a,524a,526a,530a,533a,538a,541a,546a,555a,556a,562a,563a,583a,585a,582a\',\r\n\'subject\' => \'600*,610*,611*,630*,650*,651*,653*,654*,655*,662*,690*\',\r\n\'dewey\' => \'082\',\r\n\'bc\' => \'952p\',\r\n\'callnum\' => \'952o\',\r\n\'an\' => \'6009,6109,6119\',\r\n\'location\' => \'952c\',\r\n\'homebranch\' => \'952a,952b\'','Enter a specific hash for NoZebra indexes. Enter : \'indexname\' => \'100a,245a,500*\',\'index2\' => \'...\'','70|10','Textarea'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacRenewalAllowed',0,'If ON, users can renew their issues directly from their OPAC account',NULL,'YesNo'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('PatronsPerPage','20','Number of Patrons Per Page displayed by default','20','Integer'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('HomeOrHoldingBranch','holdingbranch','Used by Circulation to determine which branch of an item to check with independent branches on, and by search to determine which branch to choose for availability ','holdingbranch|homebranch','Choice'); >@@ -278,3 +278,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('ILS-DI:AuthorizedIPs','','.','Restricts usage of ILS-DI to some IPs','Free'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OverduesBlockCirc','noblock','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','noblock|confirmation|block','Choice'); > INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('DisplayMultiPlaceHold','1','Display the ability to place multiple holds or not','','YesNo'); >+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('catalgouinginprocess','0','Display list of items which are to be cataloged in the cataloguing home page.','','YesNo'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index ac272ce..3899a44 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -3915,7 +3915,12 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { > SetVersion ($DBversion); > } > >- >+$DBversion = '3.03.00.010'; >+if (C4::Context->preference("Version") < TransformToNum($DBversion)) { >+ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('catalgouinginprocess','0','Display list of items which are to be cataloged in the cataloguing home page.','','YesNo')"); >+ print "Upgrade to $DBversion done (Display list of items which are to be cataloged in the cataloguing home page.)\n"; >+ SetVersion ($DBversion); >+} > > =head1 FUNCTIONS > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloguing-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloguing-menu.inc >new file mode 100644 >index 0000000..53a3a15 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloguing-menu.inc >@@ -0,0 +1,7 @@ >+<ul> >+<!-- TMPL_IF name="inproccount" --> >+<li> >+<a href="/cgi-bin/koha/catalogue/search.pl?idx=location&q=PROC&idx=location&idx=location&sort_by=relevance">Cataloguing in Progress[<!-- TMPL_VAR NAME="inproccount" -->]</a></li> >+<!-- /TMPL_IF --> >+</ul> >+ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref >index d809022..eed6448 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref >@@ -100,6 +100,12 @@ Cataloging: > economical: Do > - collapse repeated tags of the same type into one tag entry on the display. > - >+ - pref: catalgouinginprocess >+ choices: >+ yes: Show >+ no: "Don't show" >+ - Display list of items which are to be cataloged in the cataloguing home page. >+ - > - By default, display biblio records in > - pref: IntranetBiblioDefaultView > choices: >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl >index 943d1fb..6d7c008 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl >@@ -13,7 +13,9 @@ > <!-- TMPL_INCLUDE NAME="cataloging-search.inc" --> > > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › Cataloging</div> >- >+<div id="doc3" class="yui-t2"> >+<!-- TMPL_INCLUDE NAME="cataloguing-menu.inc" --> >+</div> > <div id="doc" class="yui-t7"> > > <div id="bd"> >diff --git a/kohaversion.pl b/kohaversion.pl >index a6e56b3..ad61294 100644 >--- a/kohaversion.pl >+++ b/kohaversion.pl >@@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts : > use strict; > > sub kohaversion { >- our $VERSION = '3.03.00.009'; >+ our $VERSION = '3.03.00.010'; > # version needs to be set this way > # so that it can be picked up by Makefile.PL > # during install >-- >1.6.4.2 >
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 5523
:
2902
|
14352