Bugzilla – Attachment 11834 Details for
Bug 8415
Link Serial with Acquisition
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8415: Follow up - Fixing some smaller issues
Bug-8415-Follow-up---Fixing-some-smaller-issues.patch (text/plain), 4.32 KB, created by
Katrin Fischer
on 2012-08-25 22:32:25 UTC
(
hide
)
Description:
Bug 8415: Follow up - Fixing some smaller issues
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2012-08-25 22:32:25 UTC
Size:
4.32 KB
patch
obsolete
>From 00f68f1dbf594d26d960e4115c9813af1268104a Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Sun, 26 Aug 2012 00:29:53 +0200 >Subject: [PATCH] Bug 8415: Follow up - Fixing some smaller issues > >1) Changes the updatedatabase to be a bit more precise and always add > the new field after claimed_date, like it is in kohastructure.sql. > >2) Fixes capitalization rules for the new link to create a serial order. > >3) Hides EAN search field when marcflavour is not UNIMARC. >--- > acqui/newordersubscription.pl | 1 + > installer/data/mysql/updatedatabase.pl | 4 ++-- > .../en/includes/acquisitions-add-to-basket.inc | 2 +- > .../prog/en/includes/subscriptions-search.inc | 2 ++ > 4 files changed, 6 insertions(+), 3 deletions(-) > >diff --git a/acqui/newordersubscription.pl b/acqui/newordersubscription.pl >index 86db2e2..948fea3 100755 >--- a/acqui/newordersubscription.pl >+++ b/acqui/newordersubscription.pl >@@ -104,5 +104,6 @@ $template->param( > basketname => $basket->{'basketname'}, > booksellername => $bookseller->{'name'}, > unfolded_search => 1, >+ marcflavour => uc(C4::Context->preference("marcflavour")), > ); > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 6f50be3..f429a4b 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -5637,8 +5637,8 @@ if(C4::Context->preference("Version") < TransformToNum($DBversion) ) { > > $DBversion = "3.09.00.XXX"; > if (C4::Context->preference("Version") < TransformToNum($DBversion)) { >- $dbh->do("ALTER TABLE `aqorders` ADD `subscriptionid` int(11) default NULL"); >- print "Upgrade to $DBversion done (Alter table aqorders done)\n"; >+ $dbh->do("ALTER TABLE `aqorders` ADD `subscriptionid` int(11) default NULL AFTER `claimed_date`"); >+ print "Upgrade to $DBversion done (Add subscriptionid to table aqorders)\n"; > SetVersion ($DBversion); > } > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >index 0391df7..a7a64b1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-add-to-basket.inc >@@ -6,7 +6,7 @@ > <input type="hidden" name="basketno" value="[% basketno %]" /> > <ul><li><label for="q">From an existing record: </label><input id="q" type="text" size="25" name="q" /> > <input type="submit" class="submit" value="Search" /></li> >- <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">From a Subscription</a></li> >+ <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">From a subscription</a></li> > <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">From a suggestion</a></li> > <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">From a new (empty) record</a></li> > <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% booksellerid %]&basketno=[% basketno %]">From an external source</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc >index 17fcd44..ae67c9a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc >@@ -17,10 +17,12 @@ > <label for="title">Title:</label> > <input type="text" id="title" name="title_filter" value="[% title_filter %]" /> > </li> >+ [% IF ( marcflavour == "UNIMARC" ) %] > <li> > <label for="ean">EAN:</label> > <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter %]" /> > </li> >+ [% END %] > <li> > <label for="publisher">Publisher:</label> > <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter %]" /> >-- >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 8415
:
10780
|
10782
|
10927
|
11833
|
11834
|
12326
|
12327
|
12366
|
12368